include: Avoid a C++ keyword for RegisterUserApiHook().

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52787Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

include: Avoid a C++ keyword for RegisterUserApiHook().
be8acff7 · Zhiyi Zhang · Alexandre Julliard · ce9a42e8 · be8acff7 · be8acff7
Commit be8acff7 authored Apr 09, 2022 by Zhiyi Zhang Committed by Alexandre Julliard Apr 11, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

hook.c dlls/user32/hook.c +5 -5

winuser.h include/winuser.h +1 -1

No files found.
--- 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;
 }

--- 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