win32u: Avoid calling WH_CBT HCBT_CLICKSKIPPED hooks recursively.

Previously, accept_hardware_message() is called after WH_CBT HCBT_CLICKSKIPPED hooks. So when these hooks call PeekMessage(), they will be called recursively. Note that WH_MOUSE hooks do get called recursively according to tests.

win32u: Avoid calling WH_CBT HCBT_CLICKSKIPPED hooks recursively.
f110dc58 · Zhiyi Zhang · Alexandre Julliard · a676f094 · f110dc58 · f110dc58
Commit f110dc58 authored Dec 14, 2023 by Zhiyi Zhang Committed by Alexandre Julliard Jan 18, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

msg.c dlls/user32/tests/msg.c +0 -1

message.c dlls/win32u/message.c +1 -1

No files found.
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -12629,7 +12629,6 @@ static void test_recursive_hook(void)
    flush_events();

    /* Expect the WH_CBT HCBT_CLICKSKIPPED hook not gets called recursively */
-    todo_wine
    ok(max_hook_depth <= 10, "Got expected %d.\n", max_hook_depth);

    UnhookWindowsHookEx(cbt_hook);

--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -2570,8 +2570,8 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H
        hook.wHitTestCode = hittest;
        hook.dwExtraInfo  = extra_info;
        hook.mouseData    = msg->wParam;
-        call_hooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, sizeof(hook) );
        accept_hardware_message( hw_id );
+        call_hooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, sizeof(hook) );
        return FALSE;
    }