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

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 52d8cd0a9c53be2162f5ed2d76f2117869b135ba
URL:    https://gitlab.winehq.org/wine/wine/-/commit/52d8cd0a9c53be2162f5ed2d76f2117...

Author: Zhiyi Zhang <zzhang(a)codeweavers.com>
Date:   Sat Apr  9 12:14:46 2022 +0800

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>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit be8acff719ef4f0698a1ca845b35c0d430f92fd1)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 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 159797020f2..c30c1b37745 100644
--- a/dlls/user32/hook.c
+++ b/dlls/user32/hook.c
@@ -971,16 +971,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 1d37bd44344..129f1368976 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -4441,7 +4441,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