--- Merging r16761 into '.':

U    tests/test/packages/zlib/tzlib1.pp
--- Merging r17210 into '.':
U    packages/zlib/src/zlib.pp
--- Merging r17198 into '.':
U    rtl/win/wininc/messages.inc

# revisions: 16761,17210,17198
------------------------------------------------------------------------
r16761 | pierre | 2011-01-13 15:45:28 +0100 (Thu, 13 Jan 2011) | 1 line
Changed paths:
   M /trunk/tests/test/packages/zlib/tzlib1.pp

 + Use popuperr unit to avoid interactive error window
------------------------------------------------------------------------
------------------------------------------------------------------------
r17210 | michael | 2011-03-31 13:17:49 +0200 (Thu, 31 Mar 2011) | 1 line
Changed paths:
   M /trunk/packages/zlib/src/zlib.pp

* Fixed signature of zliballocmem
------------------------------------------------------------------------
------------------------------------------------------------------------
r17198 | paul | 2011-03-28 08:28:25 +0200 (Mon, 28 Mar 2011) | 1 line
Changed paths:
   M /trunk/rtl/win/wininc/messages.inc

rtl: add missing TWMWindowPosChanged, TWMWindowPosChanging from messages interface
------------------------------------------------------------------------


git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_4@17583 3ad0048d-3df7-0310-abae-a5850022a9f2

3 files changed, 8 insertions, 6 deletions

diff --git a/packages/zlib/src/zlib.pp b/packages/zlib/src/zlib.pp
index 15e5c2dae1..1846dbf008 100644
--- a/packages/zlib/src/zlib.pp
+++ b/packages/zlib/src/zlib.pp
@@ -1212,7 +1212,7 @@ function zError(err: cint): pchar; cdecl; external libz name 'zError';
 function inflateSyncPoint(var z: z_stream): cint; cdecl; external libz name 'inflateSyncPoint';
 function get_crc_table: pointer; cdecl; external libz name 'get_crc_table';
 
-function zlibAllocMem(AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
+function zlibAllocMem(AppData: Pointer; Items, Size: UInt): Pointer; cdecl;
 procedure zlibFreeMem(AppData, Block: Pointer);  cdecl;
 
 implementation
@@ -1242,7 +1242,7 @@ begin
   Result := inflateBackInit_(strm, windowBits, window, ZLIB_VERSION, sizeof(z_stream));
 end;
 
-function zlibAllocMem(AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
+function zlibAllocMem(AppData: Pointer; Items, Size: UInt): Pointer; cdecl;
 
   begin
     Result := AllocMem(Items * Size);
diff --git a/rtl/win/wininc/messages.inc b/rtl/win/wininc/messages.inc
index 42ee3c65b9..6f48a6ac43 100644
--- a/rtl/win/wininc/messages.inc
+++ b/rtl/win/wininc/messages.inc
@@ -1287,11 +1287,12 @@
     TWMQueryDragIcon    = Windows.TWMQueryDragIcon;
     TWMTimeChange       = Windows.TWMTimeChange;
     TWMUndo             = Windows.TWMUndo;
+    TWMWindowPosChanged = TWMWindowPosMsg;
+    TWMWindowPosChanging= TWMWindowPosMsg;
 
     TWMPaste            = Windows.TWMPaste;
-    TWMCut 	        = Windows.TWMCut;	
-    TWMCopy	        = Windows.TWMCopy;
-
+    TWMCut              = Windows.TWMCut;
+    TWMCopy             = Windows.TWMCopy;
 {$else}
 
 {$ifdef cpu64}
@@ -1426,7 +1427,7 @@
        FocusedWnd : HWND;
        UnUsed : WPARAM;
        Result : LRESULT;
-    End;
+    end;
 
     TWMSetCursor = record
       Msg : UINT;
diff --git a/tests/test/packages/zlib/tzlib1.pp b/tests/test/packages/zlib/tzlib1.pp
index faee599fa2..34fdc4c661 100644
--- a/tests/test/packages/zlib/tzlib1.pp
+++ b/tests/test/packages/zlib/tzlib1.pp
@@ -1,6 +1,7 @@
 { %NOTE=This test requires an installed zlib1 shared library }
 { simple compilation test }
 uses
+  popuperr,
   zlib;
 begin
   writeln(zlibVersion);