--- Merging r15522 into '.':

U    packages/chm/src/chmreader.pas
 U   .
--- Merging r15523 into '.':
U    rtl/win/sysutils.pp
 G   .
--- Merging r15524 into '.':
U    ide/fpvars.pas
 G   .
--- Merging r15525 into '.':
U    rtl/objpas/classes/classesh.inc
 G   .

git-svn-id: tags/release_2_4_2_rc1@15526 -

ide/fpvars.pas

@@ -51,8 +51,8 @@ const ClipboardWindow  : PClipboardWindow = nil;
       CalcWindow       : PCalculator = nil;
       RecentFileCount  : integer = 0;
       LastCompileTime  : cardinal = 0;
-      OpenExts         : string = '*.pas;*.pp;*.inc';
-      HighlightExts    : string = '*.pas;*.pp;*.inc';
+      OpenExts         : string = '*.pas;*.pp;*.inc;*.dpr;*.lpr';
+      HighlightExts    : string = '*.pas;*.pp;*.inc;*.dpr;*.lpr';
       TabsPattern      : string = 'make*;make*.*;fpcmake.loc';
       SourceDirs       : string = '';
       StandardUnits    : string = '';

packages/chm/src/chmreader.pas

@@ -472,7 +472,7 @@ begin
   fURLSTRStream.ReadDWord;
   fURLSTRStream.ReadDWord;
   if fURLSTRStream.Position < fURLSTRStream.Size-1 then
-    Result := '/'+PChar(fURLSTRStream.Memory+fURLSTRStream.Position);
+    Result := PChar(fURLSTRStream.Memory+fURLSTRStream.Position);
 end;
 
 function TChmReader.CheckCommonStreams: Boolean;

rtl/objpas/classes/classesh.inc

@@ -36,7 +36,7 @@ type
    TSmallPoint = record
       x,y : smallint;
    end;
-   HMODULE = longint;
+   HMODULE = ptrint; // hmodule is handle on windows. Pointer eq.
 {$else}
    TSmallPoint = Windows.TSmallPoint;
    HModule = System.HModule;

rtl/win/sysutils.pp

@@ -630,9 +630,9 @@ end;
 
 function GetLocaleChar(LID, LT: Longint; Def: Char): Char;
 var
-  Buf: array[0..1] of Char;
+  Buf: array[0..3] of Char; // sdate allows 4 chars.
 begin
-  if GetLocaleInfo(LID, LT, Buf, 2) > 0 then
+  if GetLocaleInfo(LID, LT, Buf, sizeof(buf)) > 0 then
     Result := Buf[0]
   else
     Result := Def;