From: Jacek Caban jacek@codeweavers.com
Signed-off-by: Jacek Caban jacek@codeweavers.com --- dlls/user32/defwnd.c | 10 ---------- dlls/user32/hook.c | 15 --------------- dlls/user32/win.h | 2 -- dlls/win32u/defwnd.c | 10 ++++++++++ dlls/win32u/sysparams.c | 7 ------- include/ntuser.h | 1 - 6 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 2cfc0b14ff5..3eebc952ee1 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -283,16 +283,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } break;
- case WM_APPCOMMAND: - { - HWND parent = GetParent(hwnd); - if(!parent) - HOOK_CallHooks(WH_SHELL, HSHELL_APPCOMMAND, wParam, lParam, TRUE); - else - SendMessageW( parent, msg, wParam, lParam ); - break; - } - case WM_INPUTLANGCHANGEREQUEST: NtUserActivateKeyboardLayout( (HKL)lParam, 0 ); break; diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 7dddfb02638..4ef1e029609 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -334,21 +334,6 @@ void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) }
-/*********************************************************************** - * HOOK_CallHooks - */ -LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) -{ - struct win_hook_params params; - params.id = id; - params.code = code; - params.wparam = wparam; - params.lparam = lparam; - params.next_unicode = unicode; - return NtUserCallOneParam( (UINT_PTR)¶ms, NtUserCallHooks ); -} - - /*********************************************************************** * SetWindowsHookA (USER32.@) */ diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 1dfc8eb0ad1..5e4ac056c60 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -54,8 +54,6 @@ static inline void WIN_ReleasePtr( WND *ptr ) release_user_handle_ptr( ptr ); }
-extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN; - extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN;
extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 71429884b2f..b3726bf8e88 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2549,6 +2549,16 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, send_message( hwnd, WM_HELP, 0, (LPARAM)&hi ); break; } + + case WM_APPCOMMAND: + { + HWND parent = get_parent( hwnd ); + if (!parent) + call_hooks( WH_SHELL, HSHELL_APPCOMMAND, wparam, lparam, TRUE ); + else + send_message( parent, msg, wparam, lparam ); + break; + } }
return result; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 01469c345c2..a8c1d977c7d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4814,13 +4814,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return TRUE;
/* temporary exports */ - case NtUserCallHooks: - { - const struct win_hook_params *params = (struct win_hook_params *)arg; - return call_hooks( params->id, params->code, params->wparam, params->lparam, - params->next_unicode ); - } - case NtUserGetDeskPattern: return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg );
diff --git a/include/ntuser.h b/include/ntuser.h index 679179851a9..6e6819038ac 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -797,7 +797,6 @@ enum NtUserCallOneParam_SetCaretBlinkTime, NtUserCallOneParam_SetProcessDefaultLayout, /* temporary exports */ - NtUserCallHooks, NtUserGetDeskPattern, NtUserGetWinProcPtr, NtUserLock,