[ros-diffs] [tkreuzer] 41480: Fix 64bit issues, add a wine compatibility hack

Author: tkreuzer
Date: Sat Jun 20 16:29:21 2009
New Revision: 41480

URL: http://svn.reactos.org/svn/reactos?rev=41480&view=rev
Log:
Fix 64bit issues, add a wine compatibility hack

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/user32/include/ntwrapper.h
    branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32p.h

Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/include/ntwrapper.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] Sat Jun 20 16:29:21 2009
@@ -85,7 +85,7 @@
 }

EXTINLINE DWORD WINAPI
-DragObject(HWND hwnd1, HWND hwnd2, UINT u1, DWORD dw1, HCURSOR hc1)
+DragObject(HWND hwnd1, HWND hwnd2, UINT u1, ULONG_PTR dw1, HCURSOR hc1)
 {
     return NtUserDragObject(hwnd1, hwnd2, u1, dw1, hc1);
 }
@@ -96,7 +96,7 @@
     return NtUserKillTimer(hWnd, IDEvent);
 }

-EXTINLINE UINT_PTR WINAPI
+EXTINLINE UINT WINAPI // FIXME: wine compatibility definition, should be UINT_PTR
 SetSystemTimer(HWND hWnd, UINT_PTR IDEvent, UINT Period, TIMERPROC TimerFunc)
 {
     return NtUserSetSystemTimer(hWnd, IDEvent, Period, TimerFunc);

Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32p.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sat Jun 20 16:29:21 2009
@@ -118,7 +118,7 @@
   NtUserCallOneParam((DWORD)bShow, ONEPARAM_ROUTINE_SHOWCURSOR)

#define NtUserGetDesktopMapping(Ptr) \
-  (PVOID)NtUserCallOneParam((DWORD)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING)
+  (PVOID)NtUserCallOneParam((DWORD_PTR)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING)

#define ShowCaret(hwnd) \
   NtUserShowCaret(hwnd)
@@ -127,7 +127,7 @@
   NtUserHideCaret(hwnd)

#define NtUserRegisterSystemClasses(Count,SysClasses) \
-    (BOOL)NtUserCallTwoParam((DWORD)Count, (DWORD)SysClasses, TWOPARAM_ROUTINE_ROS_REGSYSCLASSES)
+    (BOOL)NtUserCallTwoParam(Count, (DWORD_PTR)SysClasses, TWOPARAM_ROUTINE_ROS_REGSYSCLASSES)

/* Internal Thread Data */
 extern HINSTANCE User32Instance;