February 2022 - Wine-commits

Jacek Caban : win32u: Move NtUserUnhookWinEvent implementation from user32.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 0e37c674881cf43c0a87bbfe3d3cf5925aed730d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e37c674881cf43c0a87bbfe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 12:29:43 2022 +0100 win32u: Move NtUserUnhookWinEvent implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 28 ---------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/hook.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 9 files changed, 63 insertions(+), 31 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 94a31239c24..26bde944175 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -766,34 +766,6 @@ HWINEVENTHOOK WINAPI SetWinEventHook(DWORD event_min, DWORD event_max, return handle; } - -/*********************************************************************** - * UnhookWinEvent [USER32.@] - * - * Remove an event hook for a set of events. - * - * PARAMS - * hEventHook [I] Event hook to remove - * - * RETURNS - * Success: TRUE. The event hook has been removed. - * Failure: FALSE, if hEventHook is invalid. - */ -BOOL WINAPI UnhookWinEvent(HWINEVENTHOOK hEventHook) -{ - BOOL ret; - - SERVER_START_REQ( remove_hook ) - { - req->handle = wine_server_user_handle( hEventHook ); - req->id = WH_WINEVENT; - ret = !wine_server_call_err( req ); - if (ret) get_user_thread_info()->active_hooks = reply->active_hooks; - } - SERVER_END_REQ; - return ret; -} - static inline BOOL find_first_hook(DWORD id, DWORD event, HWND hwnd, LONG object_id, LONG child_id, struct hook_info *info) { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index aec29dfa4cf..112b79049ce 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -770,7 +770,7 @@ @ stdcall TranslateMDISysAccel(long ptr) @ stdcall TranslateMessage(ptr) # @ stub TranslateMessageEx -@ stdcall UnhookWinEvent(long) +@ stdcall UnhookWinEvent(long) NtUserUnhookWinEvent @ stdcall UnhookWindowsHook(long ptr) @ stdcall UnhookWindowsHookEx(long) @ stdcall UnionRect(ptr ptr ptr) diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 76fd4396c7d..68849a802ec 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -28,6 +28,7 @@ C_SRCS = \ font.c \ freetype.c \ gdiobj.c \ + hook.c \ input.c \ main.c \ mapping.c \ diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c new file mode 100644 index 00000000000..02520a025f8 --- /dev/null +++ b/dlls/win32u/hook.c @@ -0,0 +1,49 @@ +/* + * Windows hook functions + * + * Copyright 2002 Alexandre Julliard + * Copyright 2005 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "win32u_private.h" +#include "ntuser_private.h" +#include "wine/server.h" + +#define WH_WINEVENT (WH_MAXHOOK+1) + + +/*********************************************************************** + * NtUserUnhookWinEvent (win32u.@) + */ +BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK handle ) +{ + BOOL ret; + + SERVER_START_REQ( remove_hook ) + { + req->handle = wine_server_user_handle( handle ); + req->id = WH_WINEVENT; + ret = !wine_server_call_err( req ); + if (ret) get_user_thread_info()->active_hooks = reply->active_hooks; + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 69d0e1ff66f..d698dc31743 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -139,6 +139,7 @@ static void * const syscalls[] = NtUserSetProcessWindowStation, NtUserSetProp, NtUserSetThreadDesktop, + NtUserUnhookWinEvent, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index abdb11cc266..42bfc1bb4c4 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1284,7 +1284,7 @@ @ stub NtUserTranslateAccelerator @ stub NtUserTranslateMessage @ stub NtUserUndelegateInput -@ stub NtUserUnhookWinEvent +@ stdcall -syscall NtUserUnhookWinEvent(long) @ stub NtUserUnhookWindowsHookEx @ stub NtUserUnloadKeyboardLayout @ stub NtUserUnlockWindowStation diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 54919f7b3fd..3b852147dc1 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -125,6 +125,7 @@ SYSCALL_ENTRY( NtUserSetProcessDpiAwarenessContext ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetProp ) \ - SYSCALL_ENTRY( NtUserSetThreadDesktop ) + SYSCALL_ENTRY( NtUserSetThreadDesktop ) \ + SYSCALL_ENTRY( NtUserUnhookWinEvent ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 02623d089a4..c55af5233a8 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -355,3 +355,10 @@ NTSTATUS WINAPI wow64_NtUserGetDoubleClickTime( UINT *args ) { return NtUserGetDoubleClickTime(); } + +NTSTATUS WINAPI wow64_NtUserUnhookWinEvent( UINT *args ) +{ + HWINEVENTHOOK handle = get_handle( &args ); + + return NtUserUnhookWinEvent( handle ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 9ed3385e17e..499c9bf809e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -184,6 +184,7 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UIN BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID ptr, UINT winini, UINT dpi ); INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); +BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK hEventHook ); BOOL WINAPI NtUserUnregisterHotKey( HWND hwnd, INT id ); WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout );

1 0

Jacek Caban : win32u: Move NtUserSetWinEventHook implementation from user32.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: d76b38ffb640885c6d798d8f3a2558907694dcf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d76b38ffb640885c6d798d8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 12:29:56 2022 +0100 win32u: Move NtUserSetWinEventHook implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 54 +++++++----------------------------------------- dlls/win32u/hook.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 19 +++++++++++++++++ include/ntuser.h | 3 +++ 7 files changed, 87 insertions(+), 48 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 26bde944175..edcc3143ab4 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -709,61 +709,21 @@ HWINEVENTHOOK WINAPI SetWinEventHook(DWORD event_min, DWORD event_max, HMODULE inst, WINEVENTPROC proc, DWORD pid, DWORD tid, DWORD flags) { - HWINEVENTHOOK handle = 0; WCHAR module[MAX_PATH]; - DWORD len; + UNICODE_STRING str; + DWORD len = 0; TRACE("%d,%d,%p,%p,%08x,%04x,%08x\n", event_min, event_max, inst, proc, pid, tid, flags); - if (inst) - { - if (!(len = GetModuleFileNameW(inst, module, MAX_PATH)) || len >= MAX_PATH) - inst = 0; - } - - if ((flags & WINEVENT_INCONTEXT) && !inst) - { - SetLastError(ERROR_HOOK_NEEDS_HMOD); - return 0; - } - - if (event_min > event_max) + if (inst && (!(len = GetModuleFileNameW( inst, module, MAX_PATH )) || len >= MAX_PATH)) { - SetLastError(ERROR_INVALID_HOOK_FILTER); - return 0; - } - - /* FIXME: what if the tid or pid belongs to another process? */ - if (tid) /* thread-local hook */ inst = 0; - - SERVER_START_REQ( set_hook ) - { - req->id = WH_WINEVENT; - req->pid = pid; - req->tid = tid; - req->event_min = event_min; - req->event_max = event_max; - req->flags = flags; - req->unicode = 1; - if (inst) /* make proc relative to the module base */ - { - req->proc = wine_server_client_ptr( (void *)((char *)proc - (char *)inst) ); - wine_server_add_data( req, module, lstrlenW(module) * sizeof(WCHAR) ); - } - else req->proc = wine_server_client_ptr( proc ); - - if (!wine_server_call_err( req )) - { - handle = wine_server_ptr_handle( reply->handle ); - get_user_thread_info()->active_hooks = reply->active_hooks; - } + len = 0; } - SERVER_END_REQ; - - TRACE("-> %p\n", handle); - return handle; + str.Buffer = module; + str.Length = str.MaximumLength = len * sizeof(WCHAR); + return NtUserSetWinEventHook( event_min, event_max, inst, &str, proc, pid, tid, flags ); } static inline BOOL find_first_hook(DWORD id, DWORD event, HWND hwnd, LONG object_id, diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index 02520a025f8..46f6efe1b1b 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -26,10 +26,65 @@ #include "win32u_private.h" #include "ntuser_private.h" #include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hook); #define WH_WINEVENT (WH_MAXHOOK+1) +/*********************************************************************** + * NtUserSetWinEventHook (win32u.@) + */ +HWINEVENTHOOK WINAPI NtUserSetWinEventHook( DWORD event_min, DWORD event_max, HMODULE inst, + UNICODE_STRING *module, WINEVENTPROC proc, + DWORD pid, DWORD tid, DWORD flags ) +{ + HWINEVENTHOOK handle = 0; + + if ((flags & WINEVENT_INCONTEXT) && !inst) + { + SetLastError(ERROR_HOOK_NEEDS_HMOD); + return 0; + } + + if (event_min > event_max) + { + SetLastError(ERROR_INVALID_HOOK_FILTER); + return 0; + } + + /* FIXME: what if the tid or pid belongs to another process? */ + if (tid) inst = 0; /* thread-local hook */ + + SERVER_START_REQ( set_hook ) + { + req->id = WH_WINEVENT; + req->pid = pid; + req->tid = tid; + req->event_min = event_min; + req->event_max = event_max; + req->flags = flags; + req->unicode = 1; + if (inst) /* make proc relative to the module base */ + { + req->proc = wine_server_client_ptr( (void *)((char *)proc - (char *)inst) ); + wine_server_add_data( req, module->Buffer, module->Length ); + } + else req->proc = wine_server_client_ptr( proc ); + + if (!wine_server_call_err( req )) + { + handle = wine_server_ptr_handle( reply->handle ); + get_user_thread_info()->active_hooks = reply->active_hooks; + } + } + SERVER_END_REQ; + + TRACE("-> %p\n", handle); + return handle; +} + /*********************************************************************** * NtUserUnhookWinEvent (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index d698dc31743..e2b88dcc62e 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -139,6 +139,7 @@ static void * const syscalls[] = NtUserSetProcessWindowStation, NtUserSetProp, NtUserSetThreadDesktop, + NtUserSetWinEventHook, NtUserUnhookWinEvent, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 42bfc1bb4c4..7de0af5d959 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1237,7 +1237,7 @@ @ stub NtUserSetThreadLayoutHandles @ stub NtUserSetThreadState @ stub NtUserSetTimer -@ stub NtUserSetWinEventHook +@ stdcall -syscall NtUserSetWinEventHook(long long long ptr ptr long long long) @ stub NtUserSetWindowArrangement @ stub NtUserSetWindowBand @ stub NtUserSetWindowCompositionAttribute diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 3b852147dc1..a0292bb881f 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -126,6 +126,7 @@ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetProp ) \ SYSCALL_ENTRY( NtUserSetThreadDesktop ) \ + SYSCALL_ENTRY( NtUserSetWinEventHook ) \ SYSCALL_ENTRY( NtUserUnhookWinEvent ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index c55af5233a8..b610b510ebc 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -356,6 +356,25 @@ NTSTATUS WINAPI wow64_NtUserGetDoubleClickTime( UINT *args ) return NtUserGetDoubleClickTime(); } +NTSTATUS WINAPI wow64_NtUserSetWinEventHook( UINT *args ) +{ + DWORD event_min = get_ulong( &args ); + DWORD event_max = get_ulong( &args ); + HMODULE inst = get_handle( &args ); + UNICODE_STRING32 *module32 = get_ptr( &args ); + WINEVENTPROC proc = get_ptr(&args ); + DWORD pid = get_ulong( &args ); + DWORD tid = get_ulong( &args ); + DWORD flags = get_ulong( &args ); + UNICODE_STRING module; + HWINEVENTHOOK ret; + + ret = NtUserSetWinEventHook( event_min, event_max, inst, + unicode_str_32to64( &module, module32 ), + proc, pid, tid, flags ); + return HandleToUlong( ret ); +} + NTSTATUS WINAPI wow64_NtUserUnhookWinEvent( UINT *args ) { HWINEVENTHOOK handle = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 499c9bf809e..65e9d20d90a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -179,6 +179,9 @@ BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle ); BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *values ); BOOL WINAPI NtUserSetThreadDesktop( HDESK handle ); +HWINEVENTHOOK WINAPI NtUserSetWinEventHook( DWORD event_min, DWORD event_max, HMODULE inst, + UNICODE_STRING *module, WINEVENTPROC proc, + DWORD pid, DWORD tid, DWORD flags ); INT WINAPI NtUserShowCursor( BOOL show ); BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT winini ); BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID ptr, UINT winini, UINT dpi );

1 0

Jacek Caban : win32u: Move NtUserNotifyWinEvent implementation from user32.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 01b3674247b1956fb8d1d46cc725d687a63ed425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01b3674247b1956fb8d1d46c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 12:30:12 2022 +0100 win32u: Move NtUserNotifyWinEvent implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 2 +- dlls/user32/hook.c | 161 +++++---------------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 1 + dlls/user32/win.c | 2 +- dlls/win32u/hook.c | 96 +++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 ++++ include/ntuser.h | 14 ++++ 12 files changed, 144 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01b3674247b1956fb8d1…

1 0

Jacek Caban : win32u: Move NtUserSetWindowsHookEx implementation from user32.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: fcf7d2a140c2d4f41bdb3aa5f967ccfe1c728646 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcf7d2a140c2d4f41bdb3aa5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 12:30:44 2022 +0100 win32u: Move NtUserSetWindowsHookEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 69 +++++++-------------------------------- dlls/win32u/hook.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 16 ++++++++++ include/ntuser.h | 2 ++ 7 files changed, 118 insertions(+), 58 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 3adfba43691..71ddb6860dc 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -140,73 +140,28 @@ static UINT get_ll_hook_timeout(void) * * Implementation of SetWindowsHookExA and SetWindowsHookExW. */ -static HHOOK set_windows_hook( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid, BOOL unicode ) +static HHOOK set_windows_hook( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid, BOOL ansi ) { - HHOOK handle = 0; WCHAR module[MAX_PATH]; - DWORD len; + UNICODE_STRING str; - if (!proc) + if (!inst) { - SetLastError( ERROR_INVALID_FILTER_PROC ); - return 0; + RtlInitUnicodeString( &str, NULL ); } - - if (tid) /* thread-local hook */ + else { - if (id == WH_JOURNALRECORD || - id == WH_JOURNALPLAYBACK || - id == WH_KEYBOARD_LL || - id == WH_MOUSE_LL || - id == WH_SYSMSGFILTER) + size_t len = GetModuleFileNameW( inst, module, ARRAYSIZE(module) ); + if (!len || len >= ARRAYSIZE(module)) { - /* these can only be global */ SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + str.Buffer = module; + str.MaximumLength = str.Length = len * sizeof(WCHAR); } - else /* system-global hook */ - { - if (id == WH_KEYBOARD_LL || id == WH_MOUSE_LL) inst = 0; - else if (!inst) - { - SetLastError( ERROR_HOOK_NEEDS_HMOD ); - return 0; - } - } - - if (inst && (!(len = GetModuleFileNameW( inst, module, MAX_PATH )) || len >= MAX_PATH)) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - - SERVER_START_REQ( set_hook ) - { - req->id = id; - req->pid = 0; - req->tid = tid; - req->event_min = EVENT_MIN; - req->event_max = EVENT_MAX; - req->flags = WINEVENT_INCONTEXT; - req->unicode = unicode; - if (inst) /* make proc relative to the module base */ - { - req->proc = wine_server_client_ptr( (void *)((char *)proc - (char *)inst) ); - wine_server_add_data( req, module, lstrlenW(module) * sizeof(WCHAR) ); - } - else req->proc = wine_server_client_ptr( proc ); - - if (!wine_server_call_err( req )) - { - handle = wine_server_ptr_handle( reply->handle ); - get_user_thread_info()->active_hooks = reply->active_hooks; - } - } - SERVER_END_REQ; - TRACE( "%s %p %x -> %p\n", hook_names[id-WH_MINHOOK], proc, tid, handle ); - return handle; + return NtUserSetWindowsHookEx( inst, &str, tid, id, proc, ansi ); } #ifdef __i386__ @@ -548,7 +503,7 @@ HHOOK WINAPI SetWindowsHookW( INT id, HOOKPROC proc ) */ HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid ) { - return set_windows_hook( id, proc, inst, tid, FALSE ); + return set_windows_hook( id, proc, inst, tid, TRUE ); } /*********************************************************************** @@ -556,7 +511,7 @@ HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid */ HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid ) { - return set_windows_hook( id, proc, inst, tid, TRUE ); + return set_windows_hook( id, proc, inst, tid, FALSE ); } diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index 748ff3e9031..c91ccf41f6f 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -32,6 +32,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(hook); #define WH_WINEVENT (WH_MAXHOOK+1) +static const char * const hook_names[WH_WINEVENT - WH_MINHOOK + 1] = +{ + "WH_MSGFILTER", + "WH_JOURNALRECORD", + "WH_JOURNALPLAYBACK", + "WH_KEYBOARD", + "WH_GETMESSAGE", + "WH_CALLWNDPROC", + "WH_CBT", + "WH_SYSMSGFILTER", + "WH_MOUSE", + "WH_HARDWARE", + "WH_DEBUG", + "WH_SHELL", + "WH_FOREGROUNDIDLE", + "WH_CALLWNDPROCRET", + "WH_KEYBOARD_LL", + "WH_MOUSE_LL", + "WH_WINEVENT" +}; static BOOL is_hooked( INT id ) { @@ -41,6 +61,71 @@ static BOOL is_hooked( INT id ) return (thread_info->active_hooks & (1 << (id - WH_MINHOOK))) != 0; } +/*********************************************************************** + * NtUserSetWindowsHookEx (win32u.@) + */ +HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWORD tid, INT id, + HOOKPROC proc, BOOL ansi ) +{ + HHOOK handle = 0; + + if (!proc) + { + SetLastError( ERROR_INVALID_FILTER_PROC ); + return 0; + } + + if (tid) /* thread-local hook */ + { + if (id == WH_JOURNALRECORD || + id == WH_JOURNALPLAYBACK || + id == WH_KEYBOARD_LL || + id == WH_MOUSE_LL || + id == WH_SYSMSGFILTER) + { + /* these can only be global */ + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + } + else /* system-global hook */ + { + if (id == WH_KEYBOARD_LL || id == WH_MOUSE_LL) inst = 0; + else if (!inst) + { + SetLastError( ERROR_HOOK_NEEDS_HMOD ); + return 0; + } + } + + SERVER_START_REQ( set_hook ) + { + req->id = id; + req->pid = 0; + req->tid = tid; + req->event_min = EVENT_MIN; + req->event_max = EVENT_MAX; + req->flags = WINEVENT_INCONTEXT; + req->unicode = !ansi; + if (inst) /* make proc relative to the module base */ + { + req->proc = wine_server_client_ptr( (void *)((char *)proc - (char *)inst) ); + wine_server_add_data( req, module->Buffer, module->Length ); + } + else req->proc = wine_server_client_ptr( proc ); + + if (!wine_server_call_err( req )) + { + handle = wine_server_ptr_handle( reply->handle ); + get_user_thread_info()->active_hooks = reply->active_hooks; + } + } + SERVER_END_REQ; + + TRACE( "%s %p %x -> %p\n", hook_names[id - WH_MINHOOK], proc, tid, handle ); + return handle; +} + /*********************************************************************** * NtUserSetWinEventHook (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 3034a0377ff..9258b6b6377 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -141,6 +141,7 @@ static void * const syscalls[] = NtUserSetProp, NtUserSetThreadDesktop, NtUserSetWinEventHook, + NtUserSetWindowsHookEx, NtUserUnhookWinEvent, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 5ddbf53af77..0088d21eda5 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1256,7 +1256,7 @@ @ stub NtUserSetWindowStationUser @ stub NtUserSetWindowWord @ stub NtUserSetWindowsHookAW -@ stub NtUserSetWindowsHookEx +@ stdcall -syscall NtUserSetWindowsHookEx(ptr ptr long long ptr long) @ stub NtUserShowCaret @ stdcall NtUserShowCursor(long) @ stub NtUserShowScrollBar diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 50b442ecaea..6c70d95f263 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -128,6 +128,7 @@ SYSCALL_ENTRY( NtUserSetProp ) \ SYSCALL_ENTRY( NtUserSetThreadDesktop ) \ SYSCALL_ENTRY( NtUserSetWinEventHook ) \ + SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \ SYSCALL_ENTRY( NtUserUnhookWinEvent ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 7a97cbed7f2..b78ae290049 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -392,3 +392,19 @@ NTSTATUS WINAPI wow64_NtUserUnhookWinEvent( UINT *args ) return NtUserUnhookWinEvent( handle ); } + +NTSTATUS WINAPI wow64_NtUserSetWindowsHookEx( UINT *args ) +{ + HINSTANCE inst = get_handle( &args ); + UNICODE_STRING32 *module32 = get_ptr( &args ); + DWORD tid = get_ulong( &args ); + INT id = get_ulong( &args ); + HOOKPROC proc = get_ptr( &args ); + BOOL ansi = get_ulong( &args ); + UNICODE_STRING module; + HHOOK ret; + + ret = NtUserSetWindowsHookEx( inst, unicode_str_32to64( &module, module32 ), + tid, id, proc, ansi ); + return HandleToUlong( ret ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 6f166f70d05..a591363f77e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -193,6 +193,8 @@ BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle ); BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *values ); BOOL WINAPI NtUserSetThreadDesktop( HDESK handle ); +HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWORD tid, INT id, + HOOKPROC proc, BOOL ansi ); HWINEVENTHOOK WINAPI NtUserSetWinEventHook( DWORD event_min, DWORD event_max, HMODULE inst, UNICODE_STRING *module, WINEVENTPROC proc, DWORD pid, DWORD tid, DWORD flags );

1 0

Jacek Caban : win32u: Move NtUserUnhookWindowsHookEx implementation from user32.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 6490088e7442b7d26041bfb7e9ac97ce83b691f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6490088e7442b7d26041bfb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 12:31:04 2022 +0100 win32u: Move NtUserUnhookWindowsHookEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 21 --------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/hook.c | 19 +++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 8 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 71ddb6860dc..7a9cff63298 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -538,27 +538,6 @@ BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc ) } - -/*********************************************************************** - * UnhookWindowsHookEx (USER32.@) - */ -BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook ) -{ - BOOL ret; - - SERVER_START_REQ( remove_hook ) - { - req->handle = wine_server_user_handle( hhook ); - req->id = 0; - ret = !wine_server_call_err( req ); - if (ret) get_user_thread_info()->active_hooks = reply->active_hooks; - } - SERVER_END_REQ; - if (!ret && GetLastError() == ERROR_INVALID_HANDLE) SetLastError( ERROR_INVALID_HOOK_HANDLE ); - return ret; -} - - /*********************************************************************** * CallNextHookEx (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 16342d15ee7..d60b424321b 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -772,7 +772,7 @@ # @ stub TranslateMessageEx @ stdcall UnhookWinEvent(long) NtUserUnhookWinEvent @ stdcall UnhookWindowsHook(long ptr) -@ stdcall UnhookWindowsHookEx(long) +@ stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx @ stdcall UnionRect(ptr ptr ptr) @ stdcall UnloadKeyboardLayout(long) @ stub UnlockWindowStation diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index c91ccf41f6f..b7630a14f16 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -126,6 +126,25 @@ HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWO return handle; } +/*********************************************************************** + * NtUserUnhookWindowsHookEx (win32u.@) + */ +BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ) +{ + NTSTATUS status; + + SERVER_START_REQ( remove_hook ) + { + req->handle = wine_server_user_handle( handle ); + req->id = 0; + status = wine_server_call_err( req ); + if (!status) get_user_thread_info()->active_hooks = reply->active_hooks; + } + SERVER_END_REQ; + if (status == STATUS_INVALID_HANDLE) SetLastError( ERROR_INVALID_HOOK_HANDLE ); + return !status; +} + /*********************************************************************** * NtUserSetWinEventHook (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 9258b6b6377..d97688d7c8c 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -143,6 +143,7 @@ static void * const syscalls[] = NtUserSetWinEventHook, NtUserSetWindowsHookEx, NtUserUnhookWinEvent, + NtUserUnhookWindowsHookEx, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 0088d21eda5..20faca70c5e 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1285,7 +1285,7 @@ @ stub NtUserTranslateMessage @ stub NtUserUndelegateInput @ stdcall -syscall NtUserUnhookWinEvent(long) -@ stub NtUserUnhookWindowsHookEx +@ stdcall -syscall NtUserUnhookWindowsHookEx(long) @ stub NtUserUnloadKeyboardLayout @ stub NtUserUnlockWindowStation @ stub NtUserUnregisterClass diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 6c70d95f263..47e95a98a4b 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -129,6 +129,7 @@ SYSCALL_ENTRY( NtUserSetThreadDesktop ) \ SYSCALL_ENTRY( NtUserSetWinEventHook ) \ SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \ - SYSCALL_ENTRY( NtUserUnhookWinEvent ) + SYSCALL_ENTRY( NtUserUnhookWinEvent ) \ + SYSCALL_ENTRY( NtUserUnhookWindowsHookEx ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index b78ae290049..cd4dc32d407 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -408,3 +408,10 @@ NTSTATUS WINAPI wow64_NtUserSetWindowsHookEx( UINT *args ) tid, id, proc, ansi ); return HandleToUlong( ret ); } + +NTSTATUS WINAPI wow64_NtUserUnhookWindowsHookEx( UINT *args ) +{ + HHOOK handle = get_handle( &args ); + + return NtUserUnhookWindowsHookEx( handle ); +} diff --git a/include/ntuser.h b/include/ntuser.h index a591363f77e..14ff5d861d0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -204,6 +204,7 @@ BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID pt INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK hEventHook ); +BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ); BOOL WINAPI NtUserUnregisterHotKey( HWND hwnd, INT id ); WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout );

1 0

Jacek Caban : win32u: Move UnhookWindowsHook implementation from user32.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 8714eb2fef7182a9c73b9963493935decca89fdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8714eb2fef7182a9c73b9963… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 12:31:17 2022 +0100 win32u: Move UnhookWindowsHook implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 16 +--------------- dlls/win32u/hook.c | 28 +++++++++++++++++++++++++++- dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 7a9cff63298..1ccd69f5a98 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -520,21 +520,7 @@ HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid */ BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc ) { - BOOL ret; - - TRACE( "%s %p\n", hook_names[id-WH_MINHOOK], proc ); - - SERVER_START_REQ( remove_hook ) - { - req->handle = 0; - req->id = id; - req->proc = wine_server_client_ptr( proc ); - ret = !wine_server_call_err( req ); - if (ret) get_user_thread_info()->active_hooks = reply->active_hooks; - } - SERVER_END_REQ; - if (!ret && GetLastError() == ERROR_INVALID_HANDLE) SetLastError( ERROR_INVALID_HOOK_HANDLE ); - return ret; + return NtUserCallTwoParam( id, (UINT_PTR)proc, NtUserUnhookWindowsHook ); } diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index b7630a14f16..b390676fc60 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -53,6 +53,12 @@ static const char * const hook_names[WH_WINEVENT - WH_MINHOOK + 1] = "WH_WINEVENT" }; +static const char *debugstr_hook_id( unsigned int id ) +{ + if (id - WH_MINHOOK >= ARRAYSIZE(hook_names)) return wine_dbg_sprintf( "%u", id ); + return hook_names[id - WH_MINHOOK]; +} + static BOOL is_hooked( INT id ) { struct user_thread_info *thread_info = get_user_thread_info(); @@ -122,7 +128,7 @@ HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWO } SERVER_END_REQ; - TRACE( "%s %p %x -> %p\n", hook_names[id - WH_MINHOOK], proc, tid, handle ); + TRACE( "%s %p %x -> %p\n", debugstr_hook_id(id), proc, tid, handle ); return handle; } @@ -145,6 +151,26 @@ BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ) return !status; } +/* see UnhookWindowsHook */ +BOOL unhook_windows_hook( INT id, HOOKPROC proc ) +{ + NTSTATUS status; + + TRACE( "%s %p\n", debugstr_hook_id(id), proc ); + + SERVER_START_REQ( remove_hook ) + { + req->handle = 0; + req->id = id; + req->proc = wine_server_client_ptr( proc ); + status = wine_server_call_err( req ); + if (!status) get_user_thread_info()->active_hooks = reply->active_hooks; + } + SERVER_END_REQ; + if (status == STATUS_INVALID_HANDLE) SetLastError( ERROR_INVALID_HOOK_HANDLE ); + return !status; +} + /*********************************************************************** * NtUserSetWinEventHook (win32u.@) */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 93fda23a31e..c9885f89d87 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4565,6 +4565,8 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return mirror_window_region( UlongToHandle(arg1), UlongToHandle(arg2) ); case NtUserMonitorFromRect: return HandleToUlong( monitor_from_rect( (const RECT *)arg1, arg2, get_thread_dpi() )); + case NtUserUnhookWindowsHook: + return unhook_windows_hook( arg1, (HOOKPROC)arg2 ); /* temporary exports */ case NtUserRegisterWindowSurface: register_window_surface( (struct window_surface *)arg1, (struct window_surface *)arg2 ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c099a8c8c4d..c3419d83858 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -248,6 +248,9 @@ struct unix_funcs /* cursoricon.c */ extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; +/* hook.c */ +extern BOOL unhook_windows_hook( INT id, HOOKPROC proc ) DECLSPEC_HIDDEN; + /* input.c */ extern LONG global_key_state_counter DECLSPEC_HIDDEN; extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 14ff5d861d0..6e4183b1e14 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -94,6 +94,7 @@ enum NtUserGetSystemMetricsForDpi, NtUserMirrorRgn, NtUserMonitorFromRect, + NtUserUnhookWindowsHook, /* temporary exports */ NtUserRegisterWindowSurface, };

1 0

Francois Gouget : iphlpapi: Fix ULONG comparisons, most notably for IPv4 addresses.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 3aa18cc5d01028bda126624ba5f5bfb11ebc4f77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa18cc5d01028bda126624b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 13:05:29 2022 +0100 iphlpapi: Fix ULONG comparisons, most notably for IPv4 addresses. The difference between two ULONGs may not fit in an int, causing sorting errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 45 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 53b5006d771..6fe0cbc58f4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1593,9 +1593,15 @@ DWORD WINAPI GetIfEntry( MIB_IFROW *row ) return err; } +static int DWORD_cmp( DWORD a, DWORD b ) +{ + return a < b ? -1 : a > b ? 1 : 0; /* a subtraction would overflow */ +} + static int ifrow_cmp( const void *a, const void *b ) { - return ((const MIB_IFROW*)a)->dwIndex - ((const MIB_IFROW*)b)->dwIndex; + const MIB_IFROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwIndex, rowB->dwIndex); } /****************************************************************** @@ -1921,7 +1927,8 @@ done: static int ipaddrrow_cmp( const void *a, const void *b ) { - return ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; + const MIB_IPADDRROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); } /****************************************************************** @@ -2026,14 +2033,11 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s static int ipforward_row_cmp( const void *a, const void *b ) { - const MIB_IPFORWARDROW *rowA = a; - const MIB_IPFORWARDROW *rowB = b; - int ret; - - if ((ret = rowA->dwForwardDest - rowB->dwForwardDest) != 0) return ret; - if ((ret = rowA->dwForwardProto - rowB->dwForwardProto) != 0) return ret; - if ((ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy) != 0) return ret; - return rowA->dwForwardNextHop - rowB->dwForwardNextHop; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest) || + DWORD_cmp(rowA->dwForwardProto, rowB->dwForwardProto) || + DWORD_cmp(rowA->dwForwardPolicy, rowB->dwForwardPolicy) || + DWORD_cmp(rowA->dwForwardNextHop, rowB->dwForwardNextHop); } /****************************************************************** @@ -2277,10 +2281,8 @@ err: static int ipnetrow_cmp( const void *a, const void *b ) { - const MIB_IPNETROW *row_a = a; - const MIB_IPNETROW *row_b = b; - - return RtlUlongByteSwap( row_a->dwAddr ) - RtlUlongByteSwap( row_b->dwAddr ); + const MIB_IPNETROW *rowA = a, *rowB = b; + return DWORD_cmp(RtlUlongByteSwap( rowA->dwAddr ), RtlUlongByteSwap( rowB->dwAddr )); } /****************************************************************** @@ -3043,13 +3045,12 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas static int tcp_row_cmp( const void *a, const void *b ) { - const MIB_TCPROW *rowA = a; - const MIB_TCPROW *rowB = b; + const MIB_TCPROW *rowA = a, *rowB = b; int ret; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; + if ((ret = DWORD_cmp(RtlUshortByteSwap( rowA->dwLocalAddr ), RtlUshortByteSwap( rowB->dwLocalAddr ))) != 0) return ret; if ((ret = RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort )) != 0) return ret; - if ((ret = RtlUlongByteSwap( rowA->dwRemoteAddr ) - RtlUlongByteSwap( rowB->dwRemoteAddr )) != 0) return ret; + if ((ret = DWORD_cmp(RtlUshortByteSwap( rowA->dwRemoteAddr ), RtlUshortByteSwap( rowB->dwRemoteAddr ))) != 0) return ret; return RtlUshortByteSwap( rowA->dwRemotePort ) - RtlUshortByteSwap( rowB->dwRemotePort ); } @@ -3432,12 +3433,10 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas static int udp_row_cmp( const void *a, const void *b ) { - const MIB_UDPROW *rowA = a; - const MIB_UDPROW *rowB = b; - int ret; + const MIB_UDPROW *rowA = a, *rowB = b; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; - return RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); + return DWORD_cmp(RtlUlongByteSwap( rowA->dwLocalAddr), RtlUlongByteSwap( rowB->dwLocalAddr )) || + RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); } static int udp6_row_cmp( const void *a, const void *b )

1 0

Francois Gouget : iphlpapi: Fix the IPv4 address network order for comparisons.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: ed4a566f12c2f97e45310513690e3cdfda24402e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed4a566f12c2f97e45310513… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 13:05:40 2022 +0100 iphlpapi: Fix the IPv4 address network order for comparisons. ipaddrrow_cmp() and ipforward_row_cmp() must perform byte-swapping in order for the rows to be sorted as expected. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6fe0cbc58f4..041e712f44f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1928,7 +1928,7 @@ done: static int ipaddrrow_cmp( const void *a, const void *b ) { const MIB_IPADDRROW *rowA = a, *rowB = b; - return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); + return DWORD_cmp(RtlUlongByteSwap( rowA->dwAddr ), RtlUlongByteSwap( rowB->dwAddr )); } /****************************************************************** @@ -2034,10 +2034,10 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s static int ipforward_row_cmp( const void *a, const void *b ) { const MIB_IPFORWARDROW *rowA = a, *rowB = b; - return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest) || + return DWORD_cmp(RtlUlongByteSwap( rowA->dwForwardDest ), RtlUlongByteSwap( rowB->dwForwardDest )) || DWORD_cmp(rowA->dwForwardProto, rowB->dwForwardProto) || DWORD_cmp(rowA->dwForwardPolicy, rowB->dwForwardPolicy) || - DWORD_cmp(rowA->dwForwardNextHop, rowB->dwForwardNextHop); + DWORD_cmp(RtlUlongByteSwap( rowA->dwForwardNextHop ), RtlUlongByteSwap( rowB->dwForwardNextHop )); } /******************************************************************

1 0

Francois Gouget : inetmib1: Avoid overflows in IPv4 address comparisons.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 85c6caf65b43c289a84b062e761005b8d03d1e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85c6caf65b43c289a84b062e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 13:05:48 2022 +0100 inetmib1: Avoid overflows in IPv4 address comparisons. The difference between two ULONGs may not fit in an int, causing comparison errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/main.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 90da277375e..e66dbe0a811 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -770,11 +770,15 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) row->dwAddr = oidToIpAddr(oid); } -static int __cdecl compareIpAddrRow(const void *a, const void *b) +static int __cdecl DWORD_cmp(DWORD a, DWORD b) { - const MIB_IPADDRROW *key = a, *value = b; + return a < b ? -1 : a > b ? 1 : 0; /* a subtraction would overflow */ +} - return key->dwAddr - value->dwAddr; +static int __cdecl compareIpAddrRow(const void *a, const void *b) +{ + const MIB_IPADDRROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); } static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -865,9 +869,8 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpForwardRow(const void *a, const void *b) { - const MIB_IPFORWARDROW *key = a, *value = b; - - return key->dwForwardDest - value->dwForwardDest; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest); } static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -1223,13 +1226,9 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareUdpRow(const void *a, const void *b) { - const MIB_UDPROW *key = a, *value = b; - int ret; - - ret = ntohl(key->dwLocalAddr) - ntohl(value->dwLocalAddr); - if (ret == 0) - ret = ntohs(key->dwLocalPort) - ntohs(value->dwLocalPort); - return ret; + const MIB_UDPROW *rowA = a, *rowB = b; + return DWORD_cmp(ntohl(rowA->dwLocalAddr), ntohl(rowB->dwLocalAddr)) || + ntohs(rowA->dwLocalPort) - ntohs(rowB->dwLocalPort); } static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind,

1 0

Francois Gouget : inetmib1: Fix the IPv4 address network order for comparisons.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 631fde70b8da49de63eca1e161c9b0059b0ad61c URL: https://source.winehq.org/git/wine.git/?a=commit;h=631fde70b8da49de63eca1e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 13:05:55 2022 +0100 inetmib1: Fix the IPv4 address network order for comparisons. compareUdpRow() was already performing the byte-swaps but compareIpAddrRow() and compareIpForwardRow() need them too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index e66dbe0a811..5d925183505 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -778,7 +778,7 @@ static int __cdecl DWORD_cmp(DWORD a, DWORD b) static int __cdecl compareIpAddrRow(const void *a, const void *b) { const MIB_IPADDRROW *rowA = a, *rowB = b; - return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); + return DWORD_cmp(ntohl(rowA->dwAddr), ntohl(rowB->dwAddr)); } static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -870,7 +870,7 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpForwardRow(const void *a, const void *b) { const MIB_IPFORWARDROW *rowA = a, *rowB = b; - return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest); + return DWORD_cmp(ntohl(rowA->dwForwardDest), ntohl(rowB->dwForwardDest)); } static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind,

1 0