Zhiyi Zhang : include: Avoid a C++ keyword for RegisterUserApiHook().
Alexandre Julliard
julliard at winehq.org
Mon Apr 11 15:54:58 CDT 2022
Module: wine
Branch: master
Commit: be8acff719ef4f0698a1ca845b35c0d430f92fd1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8acff719ef4f0698a1ca845b35c0d430f92fd1
Author: Zhiyi Zhang <zzhang at 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 at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 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
More information about the wine-cvs
mailing list