Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
3ec9c299
Commit
3ec9c299
authored
Jun 16, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 20, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Move WM_APPCOMMAND implementation from user32.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
parent
749e1b05
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
35 deletions
+10
-35
defwnd.c
dlls/user32/defwnd.c
+0
-10
hook.c
dlls/user32/hook.c
+0
-15
win.h
dlls/user32/win.h
+0
-2
defwnd.c
dlls/win32u/defwnd.c
+10
-0
sysparams.c
dlls/win32u/sysparams.c
+0
-7
ntuser.h
include/ntuser.h
+0
-1
No files found.
dlls/user32/defwnd.c
View file @
3ec9c299
...
...
@@ -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
;
...
...
dlls/user32/hook.c
View file @
3ec9c299
...
...
@@ -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
)
...
...
dlls/user32/win.h
View file @
3ec9c299
...
...
@@ -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
;
...
...
dlls/win32u/defwnd.c
View file @
3ec9c299
...
...
@@ -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
;
...
...
dlls/win32u/sysparams.c
View file @
3ec9c299
...
...
@@ -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
);
...
...
include/ntuser.h
View file @
3ec9c299
...
...
@@ -797,7 +797,6 @@ enum
NtUserCallOneParam_SetCaretBlinkTime
,
NtUserCallOneParam_SetProcessDefaultLayout
,
/* temporary exports */
NtUserCallHooks
,
NtUserGetDeskPattern
,
NtUserGetWinProcPtr
,
NtUserLock
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment