Zebediah Figura : user32: Do not call the lparam for WM_SYSTIMER messages.
Alexandre Julliard
julliard at winehq.org
Thu Apr 21 15:21:38 CDT 2022
Module: wine
Branch: master
Commit: ea4353858d96235f362c5f94c9c5e0e83ad04edd
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea4353858d96235f362c5f94c9c5e0e83ad04edd
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Wed Apr 20 19:15:33 2022 -0500
user32: Do not call the lparam for WM_SYSTIMER messages.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/message.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index 376ff2193e3..990323dde65 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -861,22 +861,19 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg )
LRESULT retval;
/* Process timer messages */
- if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER))
+ if (msg->lParam && msg->message == WM_TIMER)
{
- if (msg->lParam)
+ __TRY
{
- __TRY
- {
- retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd,
- msg->message, msg->wParam, GetTickCount() );
- }
- __EXCEPT_ALL
- {
- retval = 0;
- }
- __ENDTRY
- return retval;
+ retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd,
+ msg->message, msg->wParam, GetTickCount() );
+ }
+ __EXCEPT_ALL
+ {
+ retval = 0;
}
+ __ENDTRY
+ return retval;
}
return NtUserDispatchMessageA( msg );
}
More information about the wine-cvs
mailing list