[PATCH 1/2] user32: Fix WM_DEVICECHANGE handling.
Arkadiusz Hiler
ahiler at codeweavers.com
Wed Nov 25 09:04:14 CST 2020
WM_DEVICECHANGE's lParam can be either a pointer to a variant of
DEV_BROADCAST_HDR or an immediate value (usually 0) depending on
the wParam's value.
This fixes a crash when broadcasting WM_DEVICECHANGE with
wParam = DBT_DEVNODES_CHANGED, lParam = 0.
Signed-off-by: Arkadiusz Hiler <ahiler at codeweavers.com>
---
dlls/user32/message.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index d8ebbfd32e3..f7ce262f90d 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -1023,7 +1023,7 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara
case WM_DEVICECHANGE:
{
DEV_BROADCAST_HDR *header = (DEV_BROADCAST_HDR *)lparam;
- push_data( data, header, header->dbch_size );
+ if ((wparam & 0x8000) && header) push_data( data, header, header->dbch_size );
return 0;
}
case WM_WINE_KEYBOARD_LL_HOOK:
@@ -1426,6 +1426,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa
if (!get_buffer_space( buffer, sizeof(BOOL) )) return FALSE;
break;
case WM_DEVICECHANGE:
+ if (!(*wparam & 0x8000)) return TRUE;
minsize = sizeof(DEV_BROADCAST_HDR);
break;
case WM_WINE_KEYBOARD_LL_HOOK:
--
2.29.2
More information about the wine-devel
mailing list