[PATCH] include: Avoid a C++ keyword for RegisterUserApiHook().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52787 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/hook.c | 10 +++++----- include/winuser.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 6dc8c571c0c..e6db8590934 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -502,16 +502,16 @@ BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) } /* Undocumented RegisterUserApiHook() */ -BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old) +BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct user_api_hook *old_hook) { - if (!new) + if (!new_hook) return FALSE; USER_Lock(); - hooked_user_api = *new; + hooked_user_api = *new_hook; user_api = &hooked_user_api; - if (old) - *old = original_user_api; + if (old_hook) + *old_hook = original_user_api; USER_Unlock(); return TRUE; } diff --git a/include/winuser.h b/include/winuser.h index bb585efd16d..4f79face860 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4444,7 +4444,7 @@ struct user_api_hook LRESULT (WINAPI *pScrollBarWndProc)(HWND, UINT, WPARAM, LPARAM, BOOL); }; -WINUSERAPI BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old); +WINUSERAPI BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct user_api_hook *old_hook); WINUSERAPI void WINAPI UnregisterUserApiHook(void); #endif -- 2.32.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=112271 Your paranoid android. === debian11 (32 bit report) === user32: win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11763: Test failed: 007800F8: expected NOT topmost win.c:11787: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11810: Test failed: 006A008E: expected NOT topmost win.c:11811: Test failed: 007800F8: expected next 00070148, got 00000000 win.c:11811: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11834: Test failed: 006A008E: expected NOT topmost win.c:11835: Test failed: 007800F8: expected next 00070148, got 00000000 win.c:11835: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11869: Test failed: 007800F8: expected next 00070148, got 00000000 win.c:11869: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11892: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11903: Test failed: 007800F8: expected next 00070148, got 00000000 win.c:11903: Test failed: 007800F8: expected NOT topmost win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost win.c:11606: Test failed: 1: hwnd 006A008E is still topmost win.c:11606: Test failed: 2: hwnd 001300A2 is still topmost win.c:11606: Test failed: 3: hwnd 00070148 is still topmost win.c:11606: Test failed: 4: hwnd 007800F8 is still topmost === debian11 (32 bit Chinese:China report) === user32: input.c:2793: Test failed: 4: unexpected WM_MOUSEMOVE message input.c:2804: Test failed: 9: Unexpected cursor movement input.c:2521: Test failed: 10: foreground process expected WM_MOUSEMOVE message input.c:2521: Test failed: 11: foreground process expected WM_MOUSEMOVE message input.c:2521: Test failed: 12: foreground process expected WM_MOUSEMOVE message input.c:1733: Test failed: expected to get 64 mouse move points but got -1 input.c:1744: Test failed: expected to get 64 mouse move points but got -1 === debian11 (32 bit WoW report) === user32: input.c:2162: Test failed: Unexpected rawinput data: -6 input.c:2160: Test failed: GetRawInputBuffer returned 1 input.c:2162: Test failed: Unexpected rawinput data: 1 input.c:1628: Test failed: wrong position 9, expected 57x114 got 59x118 input.c:1628: Test failed: wrong position 14, expected 52x104 got 56x112 input.c:1628: Test failed: wrong position 15, expected 51x102 got 59x118 input.c:1628: Test failed: wrong position 16, expected 50x100 got 58x116 input.c:1628: Test failed: wrong position 17, expected 49x98 got 55x110 input.c:1628: Test failed: wrong position 23, expected 43x86 got 55x110 input.c:1628: Test failed: wrong position 27, expected 39x78 got 50x100 input.c:1628: Test failed: wrong position 29, expected 37x74 got 49x98 input.c:1628: Test failed: wrong position 30, expected 36x72 got 51x102 input.c:1628: Test failed: wrong position 34, expected 32x64 got 46x92 input.c:1628: Test failed: wrong position 48, expected 18x36 got 38x76 input.c:1628: Test failed: wrong position 49, expected 17x34 got 43x86 input.c:1628: Test failed: wrong position 50, expected 16x32 got 37x74 input.c:1628: Test failed: wrong position 51, expected 15x30 got 42x84 input.c:1628: Test failed: wrong position 63, expected 3x6 got 35x70 win.c:11344: Test failed: expected 01F70146, got 001F0082 === debian11 (64 bit WoW report) === user32: win.c:11361: Test failed: expected 0000000001E70160, got 00000000004F0084 win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11763: Test failed: 0000000001100102: expected NOT topmost win.c:11787: Test failed: 0000000001100102: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070146 is still topmost win.c:11606: Test failed: 4: hwnd 0000000001100102 is still topmost win.c:11810: Test failed: 00000000002A00D2: expected NOT topmost win.c:11811: Test failed: 0000000001100102: expected next 0000000000070146, got 0000000000000000 win.c:11811: Test failed: 0000000001100102: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070146 is still topmost win.c:11606: Test failed: 4: hwnd 0000000001100102 is still topmost win.c:11834: Test failed: 00000000002A00D2: expected NOT topmost win.c:11835: Test failed: 0000000001100102: expected next 0000000000070146, got 0000000000000000 win.c:11835: Test failed: 0000000001100102: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070146 is still topmost win.c:11606: Test failed: 4: hwnd 0000000001100102 is still topmost win.c:11869: Test failed: 0000000001100102: expected next 0000000000070146, got 0000000000000000 win.c:11869: Test failed: 0000000001100102: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070146 is still topmost win.c:11606: Test failed: 4: hwnd 0000000001100102 is still topmost win.c:11892: Test failed: 0000000001100102: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070146 is still topmost win.c:11606: Test failed: 4: hwnd 0000000001100102 is still topmost win.c:11903: Test failed: 0000000001100102: expected next 0000000000070146, got 0000000000000000 win.c:11903: Test failed: 0000000001100102: expected NOT topmost win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070146 is still topmost win.c:11606: Test failed: 4: hwnd 0000000001100102 is still topmost win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070146 is still topmost win.c:11606: Test failed: 4: hwnd 0000000001100102 is still topmost win.c:11606: Test failed: 1: hwnd 00000000002A00D2 is still topmost win.c:11606: Test failed: 2: hwnd 00000000001000E2 is still topmost win.c:11606: Test failed: 3: hwnd 0000000000070146 is still topmost win.c:11606: Test failed: 4: hwnd 0000000001100102 is still topmost
participants (2)
-
Marvin -
Zhiyi Zhang