--- Merging r21243 into '.':

U    rtl/linux/ptypes.inc
--- Merging r21249 into '.':
U    packages/winunits-base/src/activex.pp
--- Merging r21320 into '.':
U    rtl/wince/wininc/messages.inc
U    rtl/wince/wininc/defines.inc
U    rtl/win/wininc/messages.inc
U    rtl/win/wininc/defines.inc

# revisions: 21243,21249,21320
r21243 | marco | 2012-05-06 00:04:08 +0200 (Sun, 06 May 2012) | 2 lines
Changed paths:
   M /trunk/rtl/linux/ptypes.inc

 * fix size of pthread_rwlock_t. Mantis #21552 Fields are now opaque.
r21249 | marco | 2012-05-07 08:52:28 +0200 (Mon, 07 May 2012) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/activex.pp

 * Patch to correct parameter types in IDropSource by Cobines,  mantis #21971
r21320 | paul | 2012-05-18 10:59:23 +0200 (Fri, 18 May 2012) | 1 line
Changed paths:
   M /trunk/rtl/win/wininc/defines.inc
   M /trunk/rtl/win/wininc/messages.inc
   M /trunk/rtl/wince/wininc/defines.inc
   M /trunk/rtl/wince/wininc/messages.inc

rtl: move WM_APP to messages.inc instead of defines.inc. In other case it is not visible if only Message.pas is included into uses.

git-svn-id: branches/fixes_2_6@21634 -

packages/winunits-base/src/activex.pp

@@ -3252,8 +3252,8 @@ type
   IDropSource = interface(IUnknown)
     ['{00000121-0000-0000-C000-000000000046}']
     function QueryContinueDrag(fEscapePressed: BOOL;
-      grfKeyState: Longint):HResult;StdCall;
-    function GiveFeedback(dwEffect: Longint): HResult;StdCall;
+      grfKeyState: DWORD):HResult;StdCall;
+    function GiveFeedback(dwEffect: DWORD): HResult;StdCall;
   end;
 
   IOleObject = interface(IUnknown)

rtl/linux/ptypes.inc

@@ -232,15 +232,16 @@ Type
 
   pthread_key_t = cuint;
 
-  pthread_rwlock_t = record
-    __rw_readers: cint;
-    __rw_writer: pointer;
-    __rw_read_waiting: pointer;
-    __rw_write_waiting: pointer;
-    __rw_kind: cint;
-    __rw_pshared: cint;
-  end;
+const
+  pthreadrwlocksize =  {$ifdef CPU64} 56{$else}32{$endif};
+
+type 
 
+  pthread_rwlock_t = record // should be 56 for 64-bit, 32 bytes for 32-bit mantis #21552
+			case boolean of
+			 false : (_data : array[0..pthreadrwlocksize-1] of char);
+		         true  : (align : clong);
+  end;
   pthread_rwlockattr_t = record
     __lockkind: cint;
     __pshared: cint;

rtl/win/wininc/defines.inc

@@ -5754,8 +5754,6 @@ const
   COLOR_MENUHILIGHT             = 29;
   COLOR_MENUBAR                 = 30;
 
-  WM_APP                        = $8000;
-
   SYSRGN                  	= 4;
 
   UIS_SET        = 1;

rtl/win/wininc/messages.inc

@@ -1170,6 +1170,7 @@
      WM_UNICHAR = $109;
      WM_UNINITMENUPOPUP = $0125;
      WM_USER = 1024;
+     WM_APP = $8000;
      WM_USERCHANGED = 84;
      WM_VKEYTOITEM = 46;
      WM_VSCROLL = 277;

rtl/wince/wininc/defines.inc

@@ -5787,8 +5787,6 @@ const
   COLOR_MENUHILIGHT             = 29;
   COLOR_MENUBAR                 = 30;
 
-  WM_APP                        = $8000;
-
   // ShellExecuteEx mask
   SEE_MASK_NOCLOSEPROCESS =  $00000040;
   SEE_MASK_FLAG_NO_UI     =  $00000400;

rtl/wince/wininc/messages.inc

@@ -66,6 +66,7 @@
     const
     
        WM_USER = 1024;  //keep it first
+       WM_APP  = $8000;
 
        ACM_PLAY = 1125;
        ACM_STOP = 1126;