Author: sserapion Date: Mon May 31 02:19:05 2010 New Revision: 47472
URL: http://svn.reactos.org/svn/reactos?rev=47472&view=rev Log: Remove wine hack and allow user32 to compile again.
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/listbox.c branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/scrollbar.c branches/ros-amd64-bringup/reactos/dll/win32/user32/include/ntwrapper.h branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32.h
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Mon May 31 02:19:05 2010 @@ -44,7 +44,7 @@ #define WS_EX_DRAGDETECT 0x00000002L #define WM_BEGINDRAG 0x022C
-UINT WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); +UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR);
/* End of hack section -------------------------------- */
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Mon May 31 02:19:05 2010 @@ -68,7 +68,7 @@
HBRUSH DefWndControlColor(HDC hDC, UINT ctlType);
-UINT WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); +UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR);
/*********************************************************************
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] Mon May 31 02:19:05 2010 @@ -96,7 +96,7 @@ return NtUserKillTimer(hWnd, IDEvent); }
-EXTINLINE UINT WINAPI // FIXME: wine compatibility definition, should be UINT_PTR +EXTINLINE UINT_PTR WINAPI 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/user32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Mon May 31 02:19:05 2010 @@ -23,7 +23,7 @@ #include <windowsx.h> #include <winnls32.h> #include <ndk/ntndk.h> -#include <ddk/ntstatus.h> +#include <ntstatus.h>
/* CSRSS Headers */ #include <csrss/csrss.h>