[ros-diffs] [tkreuzer] 41540: Make parameters for NtUserCallOneParam and NtUserCallTwoParam DWORD_PTR instead of DWORD
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Mon Jun 22 15:46:25 CEST 2009
Author: tkreuzer
Date: Mon Jun 22 17:46:22 2009
New Revision: 41540
URL: http://svn.reactos.org/svn/reactos?rev=41540&view=rev
Log:
Make parameters for NtUserCallOneParam and NtUserCallTwoParam DWORD_PTR instead of DWORD
Modified:
branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32p.h
branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/misc.c
branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c
branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/dc.c
branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c
branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c
branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/input.c
branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/paint.c
branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c
branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c
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/win32/user32/include/user32p.h?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- 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] Mon Jun 22 17:46:22 2009
@@ -38,43 +38,43 @@
(BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ANYPOPUP)
#define NtUserValidateRgn(hWnd, hRgn) \
- (BOOL)NtUserCallTwoParam((DWORD)hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_VALIDATERGN)
#define NtUserSetWindowContextHelpId(hWnd, dwContextHelpId) \
- (BOOL)NtUserCallTwoParam((DWORD)hwnd, dwContextHelpId, TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)hwnd, dwContextHelpId, TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID)
#define NtUserSetCaretPos(X, Y) \
- (BOOL)NtUserCallTwoParam((DWORD)X, (DWORD)Y, TWOPARAM_ROUTINE_SETCARETPOS)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)X, (DWORD_PTR)Y, TWOPARAM_ROUTINE_SETCARETPOS)
#define NtUserSetGUIThreadHandle(field, hwnd) \
- (BOOL)NtUserCallTwoParam((DWORD)field, (DWORD)hwnd, TWOPARAM_ROUTINE_SETGUITHRDHANDLE)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)field, (DWORD_PTR)hwnd, TWOPARAM_ROUTINE_SETGUITHRDHANDLE)
#define NtUserSetMenuItemRect(menu, mir) \
- (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)mir, TWOPARAM_ROUTINE_SETMENUITEMRECT)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)menu, (DWORD_PTR)mir, TWOPARAM_ROUTINE_SETMENUITEMRECT)
#define NtUserSetMenuBarHeight(menu, height) \
- (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)height, TWOPARAM_ROUTINE_SETMENUBARHEIGHT)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)menu, (DWORD_PTR)height, TWOPARAM_ROUTINE_SETMENUBARHEIGHT)
#define NtUserGetWindowInfo(hwnd, pwi) \
- (BOOL)NtUserCallTwoParam((DWORD)hwnd, (DWORD)pwi, TWOPARAM_ROUTINE_GETWINDOWINFO)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)hwnd, (DWORD_PTR)pwi, TWOPARAM_ROUTINE_GETWINDOWINFO)
#define NtUserRegisterLogonProcess(hproc, x) \
- (BOOL)NtUserCallTwoParam((DWORD)hproc, (DWORD)x, TWOPARAM_ROUTINE_REGISTERLOGONPROC)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)hproc, (DWORD_PTR)x, TWOPARAM_ROUTINE_REGISTERLOGONPROC)
#define NtUserGetSysColorBrushes(HBrushes, count) \
- (BOOL)NtUserCallTwoParam((DWORD)(HBrushes), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)(HBrushes), (DWORD_PTR)(count), TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES)
#define NtUserGetSysColorPens(HPens, count) \
- (BOOL)NtUserCallTwoParam((DWORD)(HPens), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORPENS)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)(HPens), (DWORD_PTR)(count), TWOPARAM_ROUTINE_GETSYSCOLORPENS)
#define NtUserGetSysColors(ColorRefs, count) \
- (BOOL)NtUserCallTwoParam((DWORD)(ColorRefs), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORS)
+ (BOOL)NtUserCallTwoParam((DWORD_PTR)(ColorRefs), (DWORD_PTR)(count), TWOPARAM_ROUTINE_GETSYSCOLORS)
#define NtUserSetCaretBlinkTime(uMSeconds) \
- (BOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME)
+ (BOOL)NtUserCallOneParam((DWORD_PTR)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME)
#define NtUserRegisterUserModule(hInstance) \
- (BOOL)NtUserCallOneParam((DWORD)hInstance, ONEPARAM_ROUTINE_REGISTERUSERMODULE)
+ (BOOL)NtUserCallOneParam((DWORD_PTR)hInstance, ONEPARAM_ROUTINE_REGISTERUSERMODULE)
/*
#define NtUserEnumClipboardFormats(format) \
@@ -82,40 +82,40 @@
*/
#define NtUserWindowFromDC(hDC) \
- (HWND)NtUserCallOneParam((DWORD)hDC, ONEPARAM_ROUTINE_WINDOWFROMDC)
+ (HWND)NtUserCallOneParam((DWORD_PTR)hDC, ONEPARAM_ROUTINE_WINDOWFROMDC)
#define NtUserSwitchCaretShowing(CaretInfo) \
- (BOOL)NtUserCallOneParam((DWORD)CaretInfo, ONEPARAM_ROUTINE_SWITCHCARETSHOWING)
+ (BOOL)NtUserCallOneParam((DWORD_PTR)CaretInfo, ONEPARAM_ROUTINE_SWITCHCARETSHOWING)
#define NtUserSwapMouseButton(fSwap) \
- (BOOL)NtUserCallOneParam((DWORD)fSwap, ONEPARAM_ROUTINE_SWAPMOUSEBUTTON)
+ (BOOL)NtUserCallOneParam((DWORD_PTR)fSwap, ONEPARAM_ROUTINE_SWAPMOUSEBUTTON)
#define NtUserGetMenu(hWnd) \
- (HMENU)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_GETMENU)
+ (HMENU)NtUserCallOneParam((DWORD_PTR)hWnd, ONEPARAM_ROUTINE_GETMENU)
#define NtUserSetMessageExtraInfo(lParam) \
- (LPARAM)NtUserCallOneParam((DWORD)lParam, ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO)
+ (LPARAM)NtUserCallOneParam((DWORD_PTR)lParam, ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO)
#define NtUserIsWindowUnicode(hWnd) \
- (BOOL)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_ISWINDOWUNICODE)
+ (BOOL)NtUserCallOneParam((DWORD_PTR)hWnd, ONEPARAM_ROUTINE_ISWINDOWUNICODE)
#define NtUserGetWindowContextHelpId(hwnd) \
- NtUserCallOneParam((DWORD)hwnd, ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID)
+ NtUserCallOneParam((DWORD_PTR)hwnd, ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID)
#define NtUserGetWindowInstance(hwnd) \
- (HINSTANCE)NtUserCallOneParam((DWORD)hwnd, ONEPARAM_ROUTINE_GETWINDOWINSTANCE)
+ (HINSTANCE)NtUserCallOneParam((DWORD_PTR)hwnd, ONEPARAM_ROUTINE_GETWINDOWINSTANCE)
#define NtUserGetCursorPos(lpPoint) \
- (BOOL)NtUserCallOneParam((DWORD)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOSITION)
+ (BOOL)NtUserCallOneParam((DWORD_PTR)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOSITION)
#define NtUserIsWindowInDestroy(hWnd) \
- (BOOL)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_ISWINDOWINDESTROY)
+ (BOOL)NtUserCallOneParam((DWORD_PTR)hWnd, ONEPARAM_ROUTINE_ISWINDOWINDESTROY)
#define NtUserEnableProcessWindowGhosting(bEnable) \
- NtUserCallOneParam((DWORD)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING)
+ NtUserCallOneParam((DWORD_PTR)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING)
#define NtUserShowCursor(bShow) \
- NtUserCallOneParam((DWORD)bShow, ONEPARAM_ROUTINE_SHOWCURSOR)
+ NtUserCallOneParam((DWORD_PTR)bShow, ONEPARAM_ROUTINE_SHOWCURSOR)
#define NtUserGetDesktopMapping(Ptr) \
(PVOID)NtUserCallOneParam((DWORD_PTR)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING)
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/misc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/misc.c?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Mon Jun 22 17:46:22 2009
@@ -61,7 +61,7 @@
RegisterLogonProcess(DWORD dwProcessId, BOOL bRegister)
{
return NtUserCallTwoParam(dwProcessId,
- (DWORD)bRegister,
+ (DWORD_PTR)bRegister,
TWOPARAM_ROUTINE_REGISTERLOGONPROC);
}
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Mon Jun 22 17:46:22 2009
@@ -129,7 +129,7 @@
WINAPI
UserRealizePalette ( HDC hDC )
{
- return NtUserCallOneParam((DWORD) hDC, ONEPARAM_ROUTINE_REALIZEPALETTE);
+ return NtUserCallOneParam((DWORD_PTR) hDC, ONEPARAM_ROUTINE_REALIZEPALETTE);
}
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/dc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/dc.c?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/dc.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/dc.c [iso-8859-1] Mon Jun 22 17:46:22 2009
@@ -54,7 +54,7 @@
GdiReleaseDC ( hDC ); // Release locals.
// Win 3.1 throw back, hWnd is ignored and not used.
- return NtUserCallOneParam((DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC);
+ return NtUserCallOneParam((DWORD_PTR) hDC, ONEPARAM_ROUTINE_RELEASEDC);
}
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Mon Jun 22 17:46:22 2009
@@ -1781,7 +1781,7 @@
/* Pack the information and call win32k */
if (Change)
{
- if (!NtUserCallTwoParam((DWORD)hWnd, (DWORD)Flags | ((DWORD)Action << 3), TWOPARAM_ROUTINE_ROS_UPDATEUISTATE))
+ if (!NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)Flags | ((DWORD_PTR)Action << 3), TWOPARAM_ROUTINE_ROS_UPDATEUISTATE))
break;
}
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Mon Jun 22 17:46:22 2009
@@ -298,7 +298,7 @@
WINAPI
UnhookWindowsHook ( int nCode, HOOKPROC pfnFilterProc )
{
- return NtUserCallTwoParam(nCode, (DWORD)pfnFilterProc, TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK);
+ return NtUserCallTwoParam(nCode, (DWORD_PTR)pfnFilterProc, TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK);
}
/*
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/input.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/input.c?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Mon Jun 22 17:46:22 2009
@@ -155,7 +155,7 @@
HKL WINAPI
GetKeyboardLayout(DWORD idThread)
{
- return (HKL)NtUserCallOneParam((DWORD) idThread, ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT);
+ return (HKL)NtUserCallOneParam((DWORD_PTR) idThread, ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT);
}
@@ -249,7 +249,7 @@
int WINAPI
GetKeyboardType(int nTypeFlag)
{
-return (int)NtUserCallOneParam((DWORD) nTypeFlag, ONEPARAM_ROUTINE_GETKEYBOARDTYPE);
+return (int)NtUserCallOneParam((DWORD_PTR) nTypeFlag, ONEPARAM_ROUTINE_GETKEYBOARDTYPE);
}
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/paint.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/paint.c?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Mon Jun 22 17:46:22 2009
@@ -197,7 +197,7 @@
HWND hWnd,
HRGN hRgn)
{
- return (int)NtUserCallTwoParam((DWORD)hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_GETWINDOWRGN);
+ return (int)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_GETWINDOWRGN);
}
@@ -210,7 +210,7 @@
HWND hWnd,
LPRECT lprc)
{
- return (int)NtUserCallTwoParam((DWORD)hWnd, (DWORD)lprc, TWOPARAM_ROUTINE_GETWINDOWRGNBOX);
+ return (int)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)lprc, TWOPARAM_ROUTINE_GETWINDOWRGNBOX);
}
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Mon Jun 22 17:46:22 2009
@@ -1603,7 +1603,7 @@
ShowOwnedPopups(HWND hWnd,
BOOL fShow)
{
- return (BOOL)NtUserCallTwoParam((DWORD)hWnd, fShow, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS);
+ return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, fShow, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS);
}
Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Jun 22 17:46:22 2009
@@ -973,14 +973,14 @@
DWORD_PTR
NTAPI
NtUserCallOneParam(
- DWORD Param,
+ DWORD_PTR Param,
DWORD Routine);
DWORD_PTR
NTAPI
NtUserCallTwoParam(
- DWORD Param1,
- DWORD Param2,
+ DWORD_PTR Param1,
+ DWORD_PTR Param2,
DWORD Routine);
BOOL
Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c?rev=41540&r1=41539&r2=41540&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Mon Jun 22 17:46:22 2009
@@ -141,7 +141,7 @@
DWORD_PTR
APIENTRY
NtUserCallOneParam(
- DWORD Param,
+ DWORD_PTR Param,
DWORD Routine)
{
DECLARE_RETURN(DWORD_PTR);
@@ -450,8 +450,8 @@
DWORD_PTR
APIENTRY
NtUserCallTwoParam(
- DWORD Param1,
- DWORD Param2,
+ DWORD_PTR Param1,
+ DWORD_PTR Param2,
DWORD Routine)
{
NTSTATUS Status;
More information about the Ros-diffs
mailing list