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
2ef6a6ee
Commit
2ef6a6ee
authored
Jul 19, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 21, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Remove no longer needed NtUserDispatchMessageA.
parent
26a4fb74
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
23 deletions
+5
-23
message.c
dlls/user32/message.c
+1
-1
message.c
dlls/win32u/message.c
+4
-12
sysparams.c
dlls/win32u/sysparams.c
+0
-3
win32u_private.h
dlls/win32u/win32u_private.h
+0
-1
ntuser.h
include/ntuser.h
+0
-6
No files found.
dlls/user32/message.c
View file @
2ef6a6ee
...
...
@@ -877,7 +877,7 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg )
if
(
msg
->
message
!=
WM_SYSTIMER
&&
msg
->
message
!=
WM_PAINT
)
return
dispatch_message
(
msg
,
TRUE
);
return
NtUserDispatchMessage
A
(
msg
);
return
NtUserDispatchMessage
(
msg
);
}
...
...
dlls/win32u/message.c
View file @
2ef6a6ee
...
...
@@ -2496,9 +2496,9 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r
}
/**********************************************************************
*
dispatch_message
*
NtUserDispatchMessage (win32u.@)
*/
LRESULT
dispatch_message
(
const
MSG
*
msg
,
BOOL
ansi
)
LRESULT
WINAPI
NtUserDispatchMessage
(
const
MSG
*
msg
)
{
struct
win_proc_params
params
;
LRESULT
retval
=
0
;
...
...
@@ -2509,7 +2509,7 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi )
params
.
func
=
(
WNDPROC
)
msg
->
lParam
;
params
.
result
=
&
retval
;
/* FIXME */
if
(
!
init_win_proc_params
(
&
params
,
msg
->
hwnd
,
msg
->
message
,
msg
->
wParam
,
NtGetTickCount
(),
ansi
))
msg
->
wParam
,
NtGetTickCount
(),
FALSE
))
return
0
;
__TRY
{
...
...
@@ -2541,7 +2541,7 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi )
spy_enter_message
(
SPY_DISPATCHMESSAGE
,
msg
->
hwnd
,
msg
->
message
,
msg
->
wParam
,
msg
->
lParam
);
if
(
init_window_call_params
(
&
params
,
msg
->
hwnd
,
msg
->
message
,
msg
->
wParam
,
msg
->
lParam
,
&
retval
,
ansi
,
WMCHAR_MAP_DISPATCHMESSAGE
))
&
retval
,
FALSE
,
WMCHAR_MAP_DISPATCHMESSAGE
))
dispatch_win_proc_params
(
&
params
,
sizeof
(
params
)
);
else
if
(
!
is_window
(
msg
->
hwnd
))
SetLastError
(
ERROR_INVALID_WINDOW_HANDLE
);
else
SetLastError
(
ERROR_MESSAGE_SYNC_ONLY
);
...
...
@@ -2558,14 +2558,6 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi )
return
retval
;
}
/**********************************************************************
* NtUserDispatchMessage (win32u.@)
*/
LRESULT
WINAPI
NtUserDispatchMessage
(
const
MSG
*
msg
)
{
return
dispatch_message
(
msg
,
FALSE
);
}
static
BOOL
is_message_broadcastable
(
UINT
msg
)
{
return
msg
<
WM_USER
||
msg
>=
0xc000
;
...
...
dlls/win32u/sysparams.c
View file @
2ef6a6ee
...
...
@@ -4880,9 +4880,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code )
case
NtUserCallOneParam_CreateMenu
:
return
HandleToUlong
(
create_menu
(
arg
)
);
case
NtUserCallOneParam_DispatchMessageA
:
return
dispatch_message
(
(
const
MSG
*
)
arg
,
TRUE
);
case
NtUserCallOneParam_EnableDC
:
return
set_dce_flags
(
UlongToHandle
(
arg
),
DCHF_ENABLEDC
);
...
...
dlls/win32u/win32u_private.h
View file @
2ef6a6ee
...
...
@@ -436,7 +436,6 @@ extern void track_keyboard_menu_bar( HWND hwnd, UINT wparam, WCHAR ch ) DECLSPEC
extern
void
track_mouse_menu_bar
(
HWND
hwnd
,
INT
ht
,
int
x
,
int
y
)
DECLSPEC_HIDDEN
;
/* message.c */
extern
LRESULT
dispatch_message
(
const
MSG
*
msg
,
BOOL
ansi
)
DECLSPEC_HIDDEN
;
extern
BOOL
kill_system_timer
(
HWND
hwnd
,
UINT_PTR
id
)
DECLSPEC_HIDDEN
;
extern
BOOL
reply_message_result
(
LRESULT
result
,
MSG
*
msg
)
DECLSPEC_HIDDEN
;
extern
NTSTATUS
send_hardware_message
(
HWND
hwnd
,
const
INPUT
*
input
,
const
RAWINPUT
*
rawinput
,
...
...
include/ntuser.h
View file @
2ef6a6ee
...
...
@@ -902,7 +902,6 @@ enum
NtUserCallOneParam_BeginDeferWindowPos
,
NtUserCallOneParam_CreateCursorIcon
,
NtUserCallOneParam_CreateMenu
,
NtUserCallOneParam_DispatchMessageA
,
NtUserCallOneParam_EnableDC
,
NtUserCallOneParam_EnableThunkLock
,
NtUserCallOneParam_EnumClipboardFormats
,
...
...
@@ -944,11 +943,6 @@ static inline HMENU NtUserCreateMenu( BOOL is_popup )
return
UlongToHandle
(
NtUserCallOneParam
(
is_popup
,
NtUserCallOneParam_CreateMenu
));
}
static
inline
LRESULT
NtUserDispatchMessageA
(
const
MSG
*
msg
)
{
return
NtUserCallOneParam
(
(
UINT_PTR
)
msg
,
NtUserCallOneParam_DispatchMessageA
);
}
static
inline
WORD
NtUserEnableDC
(
HDC
hdc
)
{
return
NtUserCallOneParam
(
HandleToUlong
(
hdc
),
NtUserCallOneParam_EnableDC
);
...
...
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