Commit 3ec9c299 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

win32u: Move WM_APPCOMMAND implementation from user32.

parent 749e1b05
......@@ -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;
......
......@@ -335,21 +335,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)&params, NtUserCallHooks );
}
/***********************************************************************
* SetWindowsHookA (USER32.@)
*/
HHOOK WINAPI SetWindowsHookA( INT id, HOOKPROC proc )
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 );
......
......@@ -797,7 +797,6 @@ enum
NtUserCallOneParam_SetCaretBlinkTime,
NtUserCallOneParam_SetProcessDefaultLayout,
/* temporary exports */
NtUserCallHooks,
NtUserGetDeskPattern,
NtUserGetWinProcPtr,
NtUserLock,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment