--- Merging r49490 into '.':

U    packages/fcl-db/src/base/db.pas
U    packages/paszlib/src/zstream.pp
--- Recording mergeinfo for merge of r49490 into '.':
 U   .
--- Merging r49491 into '.':
G    packages/fcl-db/src/base/db.pas
--- Recording mergeinfo for merge of r49491 into '.':
 G   .
--- Merging r49492 into '.':
U    packages/paszlib/src/infblock.pas
U    packages/paszlib/src/infcodes.pas
U    packages/paszlib/src/inffast.pas
U    packages/paszlib/src/zbase.pas
U    packages/paszlib/src/zconf.inc
U    packages/paszlib/src/zdeflate.pas
--- Recording mergeinfo for merge of r49492 into '.':
 G   .
--- Merging r49565 into '.':
U    rtl/win/wininc/defines.inc
--- Recording mergeinfo for merge of r49565 into '.':
 G   .
--- Merging r49590 into '.':
U    packages/gtk2/src/gtkext/gtkstatusicon.inc
U    packages/gtk2/src/gtkext/gtkstatusiconh.inc
--- Recording mergeinfo for merge of r49590 into '.':
 G   .

# revisions: 49490,49491,49492,49565,49590
r49490 | marco | 2021-06-08 10:52:50 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
   M /trunk/packages/fcl-db/src/base/db.pas
   M /trunk/packages/paszlib/src/zstream.pp

 * use local buffer for seek mantis #38930 patch by Hendi.
r49491 | marco | 2021-06-08 10:53:42 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
   M /trunk/packages/fcl-db/src/base/db.pas

 * revert accidentally modified file.
r49492 | marco | 2021-06-08 10:58:21 +0200 (Tue, 08 Jun 2021) | 2 lines
Changed paths:
   M /trunk/packages/paszlib/src/infblock.pas
   M /trunk/packages/paszlib/src/infcodes.pas
   M /trunk/packages/paszlib/src/inffast.pas
   M /trunk/packages/paszlib/src/zbase.pas
   M /trunk/packages/paszlib/src/zconf.inc
   M /trunk/packages/paszlib/src/zdeflate.pas

 * commit second patch (from Hendi) from mantis #38930, make debug define compiling again
r49565 | marco | 2021-06-26 20:36:37 +0200 (Sat, 26 Jun 2021) | 1 line
Changed paths:
   M /trunk/rtl/win/wininc/defines.inc

 * redo psd constants, mantis #39022
r49590 | marco | 2021-07-10 14:07:55 +0200 (Sat, 10 Jul 2021) | 6 lines
Changed paths:
   M /trunk/packages/gtk2/src/gtkext/gtkstatusicon.inc
   M /trunk/packages/gtk2/src/gtkext/gtkstatusiconh.inc

 * add gtk_status_icon_set_tooltip_text as per Juha's patch, mantis #39199
 --This line, and those below, will be ignored--

M    gtk2/src/gtkext/gtkstatusicon.inc
M    gtk2/src/gtkext/gtkstatusiconh.inc

git-svn-id: branches/fixes_3_2@49607 -

packages/gtk2/src/gtkext/gtkstatusicon.inc

@@ -49,6 +49,7 @@ begin
   pointer(gtk_status_icon_set_screen):=GetProcAddress(gtkhandle,'gtk_status_icon_set_screen');
   pointer(gtk_status_icon_get_screen):=GetProcAddress(gtkhandle,'gtk_status_icon_get_screen');
   pointer(gtk_status_icon_set_tooltip):=GetProcAddress(gtkhandle,'gtk_status_icon_set_tooltip');
+  pointer(gtk_status_icon_set_tooltip_text):=GetProcAddress(gtkhandle,'gtk_status_icon_set_tooltip_text');
   pointer(gtk_status_icon_set_visible):=GetProcAddress(gtkhandle,'gtk_status_icon_set_visible');
   pointer(gtk_status_icon_get_visible):=GetProcAddress(gtkhandle,'gtk_status_icon_get_visible');
   pointer(gtk_status_icon_set_blinking):=GetProcAddress(gtkhandle,'gtk_status_icon_set_blinking');

packages/gtk2/src/gtkext/gtkstatusiconh.inc

@@ -48,6 +48,7 @@ var
   gtk_status_icon_set_screen : procedure(status_icon:PGtkStatusIcon; screen:PGdkScreen); cdecl;
   gtk_status_icon_get_screen : function(status_icon:PGtkStatusIcon):PGdkScreen; cdecl;
   gtk_status_icon_set_tooltip : procedure(status_icon:PGtkStatusIcon; tooltip_text:Pgchar); cdecl;
+  gtk_status_icon_set_tooltip_text : procedure(status_icon:PGtkStatusIcon; text:Pgchar); cdecl;
   gtk_status_icon_set_visible : procedure(status_icon:PGtkStatusIcon; visible:gboolean); cdecl;
   gtk_status_icon_get_visible : function(status_icon:PGtkStatusIcon):gboolean; cdecl;
   gtk_status_icon_set_blinking : procedure(status_icon:PGtkStatusIcon; blinking:gboolean); cdecl;

packages/paszlib/src/infblock.pas

@@ -45,7 +45,7 @@ function inflate_blocks_sync_point(var s : inflate_blocks_state) : integer;
 implementation
 
 uses
-  infcodes, inftrees, infutil;
+  infcodes, inftrees, infutil{$IFDEF ZLIB_DEBUG}, SysUtils{$ENDIF};
 
 { Tables for deflate from PKZIP's appnote.txt. }
 Const

packages/paszlib/src/infcodes.pas

@@ -31,7 +31,7 @@ procedure inflate_codes_free(var c : pInflate_codes_state;
 implementation
 
 uses
-  infutil, inffast;
+  infutil, inffast{$IFDEF ZLIB_DEBUG}, SysUtils{$ENDIF};
 
 
 function inflate_codes_new (bl : cardinal;
@@ -185,7 +185,7 @@ begin
         if (t^.base >= $20) and (t^.base < $7f) then
           Tracevv('inflate:         literal '+char(t^.base))
         else
-          Tracevv('inflate:         literal '+IntToStr(t^.base));
+          Tracevv('inflate:         literal $'+IntToHex(t^.base, 2));
         {$ENDIF}          
         c^.mode := LIT;
         continue;  { break switch statement }

packages/paszlib/src/inffast.pas

@@ -29,7 +29,7 @@ function inflate_fast( bl : cardinal;
 implementation
 
 uses
-  infutil;
+  infutil{$IFDEF ZLIB_DEBUG}, SysUtils{$ENDIF};
 
 
 { Called with number of bytes left to write in window at least 258

packages/paszlib/src/zbase.pas

@@ -380,10 +380,6 @@ const
   PRESET_DICT = $20; { preset dictionary flag in zlib header }
 
 
-  {$IFDEF ZLIB_DEBUG}
-  procedure Assert(cond : boolean; msg : string);
-  {$ENDIF}
-
   procedure Trace(x : string);
   procedure Tracev(x : string);
   procedure Tracevv(x : string);
@@ -461,12 +457,6 @@ begin
   Halt(1);
 end;
 
-procedure Assert(cond : boolean; msg : string);
-begin
-  if not cond then
-    z_error(msg);
-end;
-
 procedure Trace(x : string);
 begin
   WriteLn(x);

packages/paszlib/src/zconf.inc

@@ -36,3 +36,9 @@
  {$UNDEF MAXSEG_64K}
  {$UNDEF Delphi32}
 {$ENDIF}
+
+{- $DEFINE ZLIB_DEBUG}
+
+{$IFDEF ZLIB_DEBUG}
+  {$ASSERTIONS ON}
+{$ENDIF}

packages/paszlib/src/zdeflate.pas

@@ -1502,6 +1502,27 @@ end;
 {$endif} { FASTEST }
 
 {$ifdef ZLIB_DEBUG}
+function zmemcmp(s1p, s2p : PByte; len : Cardinal) : Integer;
+var
+  j : Cardinal;
+  source,
+  dest : PByte;
+begin
+  source := s1p;
+  dest := s2p;
+  for j := 0 to pred(len) do
+  begin
+    if (source^ <> dest^) then
+    begin
+      zmemcmp := 2*Ord(source^ > dest^)-1;
+      exit;
+    end;
+    Inc(source);
+    Inc(dest);
+  end;
+  zmemcmp := 0;
+end;
+
 { ===========================================================================
   Check that the match at match_start is indeed a match. }
 

packages/paszlib/src/zstream.pp

@@ -325,6 +325,7 @@ end;
 function Tdecompressionstream.Seek(const Offset: Int64; Origin: TSeekOrigin): Int64;
 
 var c,off: int64;
+    buf: array[0..8191] of Byte;
 
 begin
   off:=Offset;
@@ -344,9 +345,9 @@ begin
   while off>0 do
     begin
       c:=off;
-      if c>bufsize then
-        c:=bufsize;
-      if read(Fbuffer^,c)<>c then
+      if c>SizeOf(buf) then
+        c:=SizeOf(buf);
+      if read(buf,c)<>c then
         raise Edecompressionerror.create(Sseek_failed);
       dec(off,c);
     end;

rtl/win/wininc/defines.inc

@@ -4821,24 +4821,27 @@ Type
      PD_USEDEVMODECOPIES = 262144;
      PD_USEDEVMODECOPIESANDCOLLATE = 262144;
   { PAGESETUPDLG structure  }
-     PSD_DEFAULTMINMARGINS = 0;
-     PSD_DISABLEMARGINS = 16;
-     PSD_DISABLEORIENTATION = 256;
-     PSD_DISABLEPAGEPAINTING = 524288;
-     PSD_DISABLEPAPER = 512;
-     PSD_DISABLEPRINTER = 32;
-     PSD_ENABLEPAGEPAINTHOOK = 262144;
-     PSD_ENABLEPAGESETUPHOOK = 8192;
-     PSD_ENABLEPAGESETUPTEMPLATE = 32768;
-     PSD_ENABLEPAGESETUPTEMPLATEHANDLE = 131072;
-     PSD_INHUNDREDTHSOFMILLIMETERS = 8;
-     PSD_INTHOUSANDTHSOFINCHES = 4;
-     PSD_INWININIINTLMEASURE = 0;
-     PSD_MARGINS = 2;
-     PSD_MINMARGINS = 1;
-     PSD_NOWARNING = 128;
-     PSD_RETURNDEFAULT = 1024;
-     PSD_SHOWHELP = 2048;
+     PSD_DEFAULTMINMARGINS             = $000000000; // default (printer's)
+     PSD_INWININIINTLMEASURE           = $000000000; // 1st of 4 possible
+
+     PSD_MINMARGINS                    = $000000001; // use caller's
+     PSD_MARGINS                       = $000000002; // use caller's
+     PSD_INTHOUSANDTHSOFINCHES         = $000000004; // 2nd of 4 possible
+     PSD_INHUNDREDTHSOFMILLIMETERS     = $000000008; // 3rd of 4 possible
+     PSD_DISABLEMARGINS                = $000000010;
+     PSD_DISABLEPRINTER                = $000000020;
+     PSD_NOWARNING                     = $000000080; // must be same as PD_*
+     PSD_DISABLEORIENTATION            = $000000100;
+     PSD_RETURNDEFAULT                 = $000000400; // must be same as PD_*
+     PSD_DISABLEPAPER                  = $000000200;
+     PSD_SHOWHELP                      = $000000800; // must be same as PD_*
+     PSD_ENABLEPAGESETUPHOOK           = $000002000; // must be same as PD_*
+     PSD_ENABLEPAGESETUPTEMPLATE       = $000008000; // must be same as PD_*
+     PSD_ENABLEPAGESETUPTEMPLATEHANDLE = $000020000; // must be same as PD_*
+     PSD_ENABLEPAGEPAINTHOOK           = $000040000;
+     PSD_DISABLEPAGEPAINTING           = $000080000;
+     PSD_NONETWORKBUTTON               = $000200000; // must be same as PD_*
+
   { WM_SHOWWINDOW message  }
      SW_OTHERUNZOOM = 4;
      SW_OTHERZOOM = 2;