From ea4e02fba0eed5700b741fb9dd456ad1fde0b381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 25 Dec 2014 15:50:07 +0000 Subject: [PATCH] [USER32] - CreateSystemThreads' parameter is unused, and the parameter of ONEPARAM_ROUTINE_CREATESYSTEMTHREADS win32k system call is set to TRUE when creating system threads in "remote processes", i.e. not CSRSS. - Few code formatting fixes. CORE-8949 svn path=/trunk/; revision=65825 --- reactos/win32ss/user/ntuser/simplecall.c | 2 +- .../win32ss/user/user32/include/ntwrapper.h | 18 +++++++++--------- reactos/win32ss/user/user32/misc/stubs.c | 5 +++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/reactos/win32ss/user/ntuser/simplecall.c b/reactos/win32ss/user/ntuser/simplecall.c index 8dbc00eb7ec..3cbcff5e95a 100644 --- a/reactos/win32ss/user/ntuser/simplecall.c +++ b/reactos/win32ss/user/ntuser/simplecall.c @@ -346,8 +346,8 @@ NtUserCallOneParam( case ONEPARAM_ROUTINE_REPLYMESSAGE: RETURN (co_MsqReplyMessage((LRESULT) Param)); case ONEPARAM_ROUTINE_MESSAGEBEEP: + /* TODO: Implement sound sentry */ RETURN ( UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_MESSAGE_BEEP, Param) ); - /* TODO: Implement sound sentry */ case ONEPARAM_ROUTINE_CREATESYSTEMTHREADS: RETURN(CreateSystemThreads(Param)); case ONEPARAM_ROUTINE_LOCKFOREGNDWINDOW: diff --git a/reactos/win32ss/user/user32/include/ntwrapper.h b/reactos/win32ss/user/user32/include/ntwrapper.h index 55ea3780649..463d403074d 100644 --- a/reactos/win32ss/user/user32/include/ntwrapper.h +++ b/reactos/win32ss/user/user32/include/ntwrapper.h @@ -503,7 +503,7 @@ SetMenuContextHelpId(HMENU hmenu, DWORD dwContextHelpId) EXTINLINE HWND WINAPI SetCapture(HWND hWnd) { - return(NtUserSetCapture(hWnd)); + return NtUserSetCapture(hWnd); } EXTINLINE BOOL WINAPI @@ -541,17 +541,17 @@ EXTINLINE BOOL NtUserxDestroyCaret(VOID) return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_DESTROY_CARET); } -EXTINLINE VOID NtUserxMsqClearWakeMask() +EXTINLINE VOID NtUserxMsqClearWakeMask(VOID) { NtUserCallNoParam(NOPARAM_ROUTINE_MSQCLEARWAKEMASK); } -EXTINLINE HMENU NtUserxCreateMenu() +EXTINLINE HMENU NtUserxCreateMenu(VOID) { return (HMENU)NtUserCallNoParam(NOPARAM_ROUTINE_CREATEMENU); } -EXTINLINE HMENU NtUserxCreatePopupMenu() +EXTINLINE HMENU NtUserxCreatePopupMenu(VOID) { return (HMENU)NtUserCallNoParam(NOPARAM_ROUTINE_CREATEMENUPOPUP); } @@ -566,12 +566,12 @@ EXTINLINE BOOL NtUserxReleaseCapture(VOID) return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_RELEASECAPTURE); } -EXTINLINE BOOL NtUserxInitMessagePump() +EXTINLINE BOOL NtUserxInitMessagePump(VOID) { - return NtUserCallNoParam(NOPARAM_ROUTINE_INIT_MESSAGE_PUMP); + return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_INIT_MESSAGE_PUMP); } -EXTINLINE BOOL NtUserxUnInitMessagePump() +EXTINLINE BOOL NtUserxUnInitMessagePump(VOID) { return NtUserCallNoParam(NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP); } @@ -641,9 +641,9 @@ EXTINLINE UINT NtUserxRealizePalette(HDC hDC) return (UINT)NtUserCallOneParam((DWORD_PTR)hDC, ONEPARAM_ROUTINE_REALIZEPALETTE); } -EXTINLINE VOID NtUserxCreateSystemThreads(DWORD param) +EXTINLINE VOID NtUserxCreateSystemThreads(BOOL bRemoteProcess) { - NtUserCallOneParam(param, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); + NtUserCallOneParam(bRemoteProcess, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); } EXTINLINE HDWP NtUserxBeginDeferWindowPos(INT nNumWindows) diff --git a/reactos/win32ss/user/user32/misc/stubs.c b/reactos/win32ss/user/user32/misc/stubs.c index 0f4617bc330..251b2a72e1d 100644 --- a/reactos/win32ss/user/user32/misc/stubs.c +++ b/reactos/win32ss/user/user32/misc/stubs.c @@ -512,9 +512,10 @@ BuildReasonArray(PVOID Pointer) VOID WINAPI -CreateSystemThreads(DWORD dwUnknown) +CreateSystemThreads(DWORD Unused) { - NtUserxCreateSystemThreads(dwUnknown); + /* Thread call for remote processes (non-CSRSS) only */ + NtUserxCreateSystemThreads(TRUE); ExitThread(0); }