system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-22 16:54:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

win32u: Move WM_APPCOMMAND implementation from user32.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
Jacek Caban 2022-06-16 22:46:07 +02:00 committed by Alexandre Julliard
parent 749e1b05d7
commit 3ec9c2990b
6 changed files with 10 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/user32/defwnd.c
View file

@ -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;

15
dlls/user32/hook.c
View file

@ -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)&params, NtUserCallHooks );
}
/***********************************************************************
* SetWindowsHookA (USER32.@)
*/

2
dlls/user32/win.h
View file

@ -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;

10
dlls/win32u/defwnd.c
View file

@ -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;

7
dlls/win32u/sysparams.c
View file

@ -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 );

1
include/ntuser.h
View file

@ -797,7 +797,6 @@ enum
NtUserCallOneParam_SetCaretBlinkTime,
NtUserCallOneParam_SetProcessDefaultLayout,
/* temporary exports */
NtUserCallHooks,
NtUserGetDeskPattern,
NtUserGetWinProcPtr,
NtUserLock,