projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync with trunk r43123
[reactos.git]
/
reactos
/
subsystems
/
win32
/
win32k
/
ntuser
/
simplecall.c
diff --git
a/reactos/subsystems/win32/win32k/ntuser/simplecall.c
b/reactos/subsystems/win32/win32k/ntuser/simplecall.c
index
53ee983
..
bab3915
100644
(file)
--- a/
reactos/subsystems/win32/win32k/ntuser/simplecall.c
+++ b/
reactos/subsystems/win32/win32k/ntuser/simplecall.c
@@
-74,12
+74,12
@@
co_IntRegisterLogonProcess(HANDLE ProcessId, BOOL Register)
/*
* @unimplemented
*/
/*
* @unimplemented
*/
-DWORD
+DWORD
_PTR
APIENTRY
NtUserCallNoParam(DWORD Routine)
{
APIENTRY
NtUserCallNoParam(DWORD Routine)
{
- DWORD Result = 0;
- DECLARE_RETURN(DWORD);
+ DWORD
_PTR
Result = 0;
+ DECLARE_RETURN(DWORD
_PTR
);
DPRINT("Enter NtUserCallNoParam\n");
UserEnterExclusive();
DPRINT("Enter NtUserCallNoParam\n");
UserEnterExclusive();
@@
-87,39
+87,39
@@
NtUserCallNoParam(DWORD Routine)
switch(Routine)
{
case NOPARAM_ROUTINE_CREATEMENU:
switch(Routine)
{
case NOPARAM_ROUTINE_CREATEMENU:
- Result = (DWORD)UserCreateMenu(FALSE);
+ Result = (DWORD
_PTR
)UserCreateMenu(FALSE);
break;
case NOPARAM_ROUTINE_CREATEMENUPOPUP:
break;
case NOPARAM_ROUTINE_CREATEMENUPOPUP:
- Result = (DWORD)UserCreateMenu(TRUE);
+ Result = (DWORD
_PTR
)UserCreateMenu(TRUE);
break;
case NOPARAM_ROUTINE_DESTROY_CARET:
break;
case NOPARAM_ROUTINE_DESTROY_CARET:
- Result = (DWORD)co_IntDestroyCaret(PsGetCurrentThread()->Tcb.Win32Thread);
+ Result = (DWORD
_PTR
)co_IntDestroyCaret(PsGetCurrentThread()->Tcb.Win32Thread);
break;
case NOPARAM_ROUTINE_INIT_MESSAGE_PUMP:
break;
case NOPARAM_ROUTINE_INIT_MESSAGE_PUMP:
- Result = (DWORD)IntInitMessagePumpHook();
+ Result = (DWORD
_PTR
)IntInitMessagePumpHook();
break;
case NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP:
break;
case NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP:
- Result = (DWORD)IntUninitMessagePumpHook();
+ Result = (DWORD
_PTR
)IntUninitMessagePumpHook();
break;
case NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO:
break;
case NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO:
- Result = (DWORD)MsqGetMessageExtraInfo();
+ Result = (DWORD
_PTR
)MsqGetMessageExtraInfo();
break;
case NOPARAM_ROUTINE_ANYPOPUP:
break;
case NOPARAM_ROUTINE_ANYPOPUP:
- Result = (DWORD)IntAnyPopup();
+ Result = (DWORD
_PTR
)IntAnyPopup();
break;
case NOPARAM_ROUTINE_CSRSS_INITIALIZED:
break;
case NOPARAM_ROUTINE_CSRSS_INITIALIZED:
- Result = (DWORD)CsrInit();
+ Result = (DWORD
_PTR
)CsrInit();
break;
case NOPARAM_ROUTINE_MSQCLEARWAKEMASK:
break;
case NOPARAM_ROUTINE_MSQCLEARWAKEMASK:
- RETURN( (DWORD)IntMsqClearWakeMask());
+ RETURN( (DWORD
_PTR
)IntMsqClearWakeMask());
default:
DPRINT1("Calling invalid routine number 0x%x in NtUserCallNoParam\n", Routine);
default:
DPRINT1("Calling invalid routine number 0x%x in NtUserCallNoParam\n", Routine);
@@
-138,13
+138,13
@@
CLEANUP:
/*
* @implemented
*/
/*
* @implemented
*/
-DWORD
+DWORD
_PTR
APIENTRY
NtUserCallOneParam(
APIENTRY
NtUserCallOneParam(
- DWORD Param,
+ DWORD
_PTR
Param,
DWORD Routine)
{
DWORD Routine)
{
- DECLARE_RETURN(DWORD);
+ DECLARE_RETURN(DWORD
_PTR
);
DPRINT("Enter NtUserCallOneParam\n");
DPRINT("Enter NtUserCallOneParam\n");
@@
-160,7
+160,7
@@
NtUserCallOneParam(
RETURN(TRUE);
}
case ONEPARAM_ROUTINE_SHOWCURSOR:
RETURN(TRUE);
}
case ONEPARAM_ROUTINE_SHOWCURSOR:
- RETURN( (DWORD)UserShowCursor((BOOL)Param) );
+ RETURN( (DWORD
_PTR
)UserShowCursor((BOOL)Param) );
case ONEPARAM_ROUTINE_GETDESKTOPMAPPING:
{
case ONEPARAM_ROUTINE_GETDESKTOPMAPPING:
{
@@
-170,7
+170,7
@@
NtUserCallOneParam(
{
/* Try convert the pointer to a user mode pointer if the desktop is
mapped into the process */
{
/* Try convert the pointer to a user mode pointer if the desktop is
mapped into the process */
- RETURN((DWORD)DesktopHeapAddressToUser((PVOID)Param));
+ RETURN((DWORD
_PTR
)DesktopHeapAddressToUser((PVOID)Param));
}
else
{
}
else
{
@@
-179,11
+179,11
@@
NtUserCallOneParam(
}
case ONEPARAM_ROUTINE_WINDOWFROMDC:
}
case ONEPARAM_ROUTINE_WINDOWFROMDC:
- RETURN( (DWORD)IntWindowFromDC((HDC)Param));
+ RETURN( (DWORD
_PTR
)IntWindowFromDC((HDC)Param));
case ONEPARAM_ROUTINE_SWAPMOUSEBUTTON:
{
case ONEPARAM_ROUTINE_SWAPMOUSEBUTTON:
{
- DWORD Result;
+ DWORD
_PTR
Result;
Result = gspv.bMouseBtnSwap;
gspv.bMouseBtnSwap = Param ? TRUE : FALSE;
Result = gspv.bMouseBtnSwap;
gspv.bMouseBtnSwap = Param ? TRUE : FALSE;
@@
-192,13
+192,13
@@
NtUserCallOneParam(
}
case ONEPARAM_ROUTINE_SWITCHCARETSHOWING:
}
case ONEPARAM_ROUTINE_SWITCHCARETSHOWING:
- RETURN( (DWORD)IntSwitchCaretShowing((PVOID)Param));
+ RETURN( (DWORD
_PTR
)IntSwitchCaretShowing((PVOID)Param));
case ONEPARAM_ROUTINE_SETCARETBLINKTIME:
case ONEPARAM_ROUTINE_SETCARETBLINKTIME:
- RETURN( (DWORD)IntSetCaretBlinkTime((UINT)Param));
+ RETURN( (DWORD
_PTR
)IntSetCaretBlinkTime((UINT)Param));
case ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO:
case ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO:
- RETURN( (DWORD)MsqSetMessageExtraInfo((LPARAM)Param));
+ RETURN( (DWORD
_PTR
)MsqSetMessageExtraInfo((LPARAM)Param));
case ONEPARAM_ROUTINE_CREATECURICONHANDLE:
{
case ONEPARAM_ROUTINE_CREATECURICONHANDLE:
{
@@
-219,7
+219,7
@@
NtUserCallOneParam(
}
ObDereferenceObject(WinSta);
}
ObDereferenceObject(WinSta);
- RETURN((DWORD)CurIcon->Self);
+ RETURN((DWORD
_PTR
)CurIcon->Self);
}
case ONEPARAM_ROUTINE_GETCURSORPOSITION:
}
case ONEPARAM_ROUTINE_GETCURSORPOSITION:
@@
-229,13
+229,13
@@
NtUserCallOneParam(
POINT Pos;
if(!Param)
POINT Pos;
if(!Param)
- RETURN( (DWORD)FALSE);
+ RETURN( (DWORD
_PTR
)FALSE);
Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation,
KernelMode,
0,
&WinSta);
if (!NT_SUCCESS(Status))
Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation,
KernelMode,
0,
&WinSta);
if (!NT_SUCCESS(Status))
- RETURN( (DWORD)FALSE);
+ RETURN( (DWORD
_PTR
)FALSE);
/* FIXME - check if process has WINSTA_READATTRIBUTES */
IntGetCursorLocation(WinSta, &Pos);
/* FIXME - check if process has WINSTA_READATTRIBUTES */
IntGetCursorLocation(WinSta, &Pos);
@@
-250,20
+250,20
@@
NtUserCallOneParam(
ObDereferenceObject(WinSta);
ObDereferenceObject(WinSta);
- RETURN( (DWORD)TRUE);
+ RETURN( (DWORD
_PTR
)TRUE);
}
case ONEPARAM_ROUTINE_ISWINDOWINDESTROY:
{
PWINDOW_OBJECT Window;
}
case ONEPARAM_ROUTINE_ISWINDOWINDESTROY:
{
PWINDOW_OBJECT Window;
- DWORD Result;
+ DWORD
_PTR
Result;
if(!(Window = UserGetWindowObject((HWND)Param)))
{
RETURN( FALSE);
}
if(!(Window = UserGetWindowObject((HWND)Param)))
{
RETURN( FALSE);
}
- Result = (DWORD)IntIsWindowInDestroy(Window);
+ Result = (DWORD
_PTR
)IntIsWindowInDestroy(Window);
RETURN( Result);
}
RETURN( Result);
}
@@
-293,13
+293,13
@@
NtUserCallOneParam(
}
case ONEPARAM_ROUTINE_MSQSETWAKEMASK:
}
case ONEPARAM_ROUTINE_MSQSETWAKEMASK:
- RETURN( (DWORD)IntMsqSetWakeMask(Param));
+ RETURN( (DWORD
_PTR
)IntMsqSetWakeMask(Param));
case ONEPARAM_ROUTINE_GETKEYBOARDTYPE:
RETURN( UserGetKeyboardType(Param));
case ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT:
case ONEPARAM_ROUTINE_GETKEYBOARDTYPE:
RETURN( UserGetKeyboardType(Param));
case ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT:
- RETURN( (DWORD)UserGetKeyboardLayout(Param));
+ RETURN( (DWORD
_PTR
)UserGetKeyboardLayout(Param));
case ONEPARAM_ROUTINE_RELEASEDC:
RETURN (UserReleaseDC(NULL, (HDC) Param, FALSE));
case ONEPARAM_ROUTINE_RELEASEDC:
RETURN (UserReleaseDC(NULL, (HDC) Param, FALSE));
@@
-358,16
+358,16
@@
CLEANUP:
/*
* @implemented
*/
/*
* @implemented
*/
-DWORD
+DWORD
_PTR
APIENTRY
NtUserCallTwoParam(
APIENTRY
NtUserCallTwoParam(
- DWORD Param1,
- DWORD Param2,
+ DWORD
_PTR
Param1,
+ DWORD
_PTR
Param2,
DWORD Routine)
{
NTSTATUS Status;
PWINDOW_OBJECT Window;
DWORD Routine)
{
NTSTATUS Status;
PWINDOW_OBJECT Window;
- DECLARE_RETURN(DWORD);
+ DECLARE_RETURN(DWORD
_PTR
);
DPRINT("Enter NtUserCallTwoParam\n");
UserEnterExclusive();
DPRINT("Enter NtUserCallTwoParam\n");
UserEnterExclusive();
@@
-376,12
+376,12
@@
NtUserCallTwoParam(
{
case TWOPARAM_ROUTINE_GETWINDOWRGNBOX:
{
{
case TWOPARAM_ROUTINE_GETWINDOWRGNBOX:
{
- DWORD Ret;
+ DWORD
_PTR
Ret;
RECTL rcRect;
Window = UserGetWindowObject((HWND)Param1);
if (!Window) RETURN(ERROR);
RECTL rcRect;
Window = UserGetWindowObject((HWND)Param1);
if (!Window) RETURN(ERROR);
- Ret = (DWORD)IntGetWindowRgnBox(Window, &rcRect);
+ Ret = (DWORD
_PTR
)IntGetWindowRgnBox(Window, &rcRect);
Status = MmCopyToCaller((PVOID)Param2, &rcRect, sizeof(RECT));
if(!NT_SUCCESS(Status))
{
Status = MmCopyToCaller((PVOID)Param2, &rcRect, sizeof(RECT));
if(!NT_SUCCESS(Status))
{
@@
-395,11
+395,11
@@
NtUserCallTwoParam(
Window = UserGetWindowObject((HWND)Param1);
if (!Window) RETURN(ERROR);
Window = UserGetWindowObject((HWND)Param1);
if (!Window) RETURN(ERROR);
- RETURN( (DWORD)IntGetWindowRgn(Window, (HRGN)Param2));
+ RETURN( (DWORD
_PTR
)IntGetWindowRgn(Window, (HRGN)Param2));
}
case TWOPARAM_ROUTINE_SETMENUBARHEIGHT:
{
}
case TWOPARAM_ROUTINE_SETMENUBARHEIGHT:
{
- DWORD Ret;
+ DWORD
_PTR
Ret;
PMENU_OBJECT MenuObject = IntGetMenuObject((HMENU)Param1);
if(!MenuObject)
RETURN( 0);
PMENU_OBJECT MenuObject = IntGetMenuObject((HMENU)Param1);
if(!MenuObject)
RETURN( 0);
@@
-410,7
+410,7
@@
NtUserCallTwoParam(
MenuObject->MenuInfo.Height = (int)Param2;
}
else
MenuObject->MenuInfo.Height = (int)Param2;
}
else
- Ret = (DWORD)MenuObject->MenuInfo.Height;
+ Ret = (DWORD
_PTR
)MenuObject->MenuInfo.Height;
IntReleaseMenuObject(MenuObject);
RETURN( Ret);
}
IntReleaseMenuObject(MenuObject);
RETURN( Ret);
}
@@
-420,7
+420,7
@@
NtUserCallTwoParam(
PUSER_MESSAGE_QUEUE MsgQueue = ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->MessageQueue;
ASSERT(MsgQueue);
PUSER_MESSAGE_QUEUE MsgQueue = ((PTHREADINFO)PsGetCurrentThread()->Tcb.Win32Thread)->MessageQueue;
ASSERT(MsgQueue);
- RETURN( (DWORD)MsqSetStateWindow(MsgQueue, (ULONG)Param1, (HWND)Param2));
+ RETURN( (DWORD
_PTR
)MsqSetStateWindow(MsgQueue, (ULONG)Param1, (HWND)Param2));
}
case TWOPARAM_ROUTINE_ENABLEWINDOW:
}
case TWOPARAM_ROUTINE_ENABLEWINDOW:
@@
-432,7
+432,7
@@
NtUserCallTwoParam(
Window = UserGetWindowObject((HWND)Param1);
if (!Window) RETURN(0);
Window = UserGetWindowObject((HWND)Param1);
if (!Window) RETURN(0);
- RETURN( (DWORD)IntShowOwnedPopups(Window, (BOOL) Param2));
+ RETURN( (DWORD
_PTR
)IntShowOwnedPopups(Window, (BOOL) Param2));
}
case TWOPARAM_ROUTINE_ROS_UPDATEUISTATE:
}
case TWOPARAM_ROUTINE_ROS_UPDATEUISTATE:
@@
-454,10
+454,10
@@
NtUserCallTwoParam(
case TWOPARAM_ROUTINE_SETCARETPOS:
case TWOPARAM_ROUTINE_SETCARETPOS:
- RETURN( (DWORD)co_IntSetCaretPos((int)Param1, (int)Param2));
+ RETURN( (DWORD
_PTR
)co_IntSetCaretPos((int)Param1, (int)Param2));
case TWOPARAM_ROUTINE_REGISTERLOGONPROC:
case TWOPARAM_ROUTINE_REGISTERLOGONPROC:
- RETURN( (DWORD)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2));
+ RETURN( (DWORD
_PTR
)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2));
}
DPRINT1("Calling invalid routine number 0x%x in NtUserCallTwoParam(), Param1=0x%x Parm2=0x%x\n",
Routine, Param1, Param2);
}
DPRINT1("Calling invalid routine number 0x%x in NtUserCallTwoParam(), Param1=0x%x Parm2=0x%x\n",
Routine, Param1, Param2);
@@
-512,7
+512,7
@@
NtUserCallHwndLock(
if (!((Wnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD))
break;
if (!((Wnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD))
break;
- if(!(Menu = UserGetMenuObject((HMENU) Wnd->IDMenu)))
+ if(!(Menu = UserGetMenuObject((HMENU)
(DWORD_PTR)
Wnd->IDMenu)))
break;
Menu->MenuInfo.WndOwner = hWnd;
break;
Menu->MenuInfo.WndOwner = hWnd;