January 2024 - Wine-commits

Jinoh Kang : ntdll/tests: Restore x86-64 #AC exception test in test_exceptions().
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 015434d24c6d6b23d464ff1b3233b39d7a82812c URL: https://gitlab.winehq.org/wine/wine/-/commit/015434d24c6d6b23d464ff1b3233b3… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Jan 6 22:40:45 2024 +0900 ntdll/tests: Restore x86-64 #AC exception test in test_exceptions(). --- dlls/ntdll/tests/exception.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e49fbb5bce1..3c4d6620fe8 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3446,8 +3446,13 @@ static DWORD WINAPI align_check_handler( EXCEPTION_RECORD *rec, ULONG64 frame, #ifdef __GNUC__ __asm__ volatile( "pushfq; andl $~0x40000,(%rsp); popfq" ); #endif - ok (!(context->EFlags & 0x40000), "eflags has AC bit set\n"); + ok (context->EFlags & 0x40000, "eflags has AC bit unset\n"); got_exception++; + if (got_exception != 1) + { + ok(broken(1) /* win7 */, "exception should occur only once"); + context->EFlags &= ~0x40000; + } return ExceptionContinueExecution; } @@ -3588,12 +3593,10 @@ static void test_exceptions(void) ok(got_exception == 3, "expected 3 single step exceptions, got %d\n", got_exception); /* test alignment exceptions */ - if (0) /* broken on Windows */ - { got_exception = 0; run_exception_test(align_check_handler, NULL, align_check_code, sizeof(align_check_code), 0); - ok(got_exception == 0, "got %d alignment faults, expected 0\n", got_exception); - } + todo_wine + ok(got_exception == 1 || broken(got_exception == 2) /* win7 */, "got %d alignment faults, expected 1\n", got_exception); /* test direction flag */ got_exception = 0;

1 0

Alex Henrie : include: Add mgmtapi.h and LPSNMP_MGR_SESSION.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 3fbdd4129717c9292d994fb9d8c76e9728b5c635 URL: https://gitlab.winehq.org/wine/wine/-/commit/3fbdd4129717c9292d994fb9d8c76e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 8 00:11:11 2024 -0700 include: Add mgmtapi.h and LPSNMP_MGR_SESSION. --- include/Makefile.in | 1 + include/mgmtapi.h | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d4a166e265c..bd72fe86975 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -440,6 +440,7 @@ SOURCES = \ mfplay.idl \ mfreadwrite.idl \ mftransform.idl \ + mgmtapi.h \ midles.h \ mimeinfo.idl \ mimeole.idl \ diff --git a/include/mgmtapi.h b/include/mgmtapi.h new file mode 100644 index 00000000000..0d22a7aceac --- /dev/null +++ b/include/mgmtapi.h @@ -0,0 +1,24 @@ +/* + * Copyright 2024 Alex Henrie + * + * 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 + */ + +#ifndef _INC_MGMTAPI +#define _INC_MGMTAPI + +typedef void *LPSNMP_MGR_SESSION; + +#endif /* _INC_MGMTAPI */

1 0

Alex Henrie : mgmtapi: AddSnmpMgrOpen stub.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 98e14329dd47553b5ebdc9afaf070b3dfad9e910 URL: https://gitlab.winehq.org/wine/wine/-/commit/98e14329dd47553b5ebdc9afaf070b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 8 00:11:11 2024 -0700 mgmtapi: AddSnmpMgrOpen stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56062 --- dlls/mgmtapi/mgmtapi.c | 7 +++++++ dlls/mgmtapi/mgmtapi.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mgmtapi/mgmtapi.c b/dlls/mgmtapi/mgmtapi.c index ea4a40832b0..8c92c4fce7b 100644 --- a/dlls/mgmtapi/mgmtapi.c +++ b/dlls/mgmtapi/mgmtapi.c @@ -19,10 +19,17 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "mgmtapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mgmtapi); +LPSNMP_MGR_SESSION WINAPI SnmpMgrOpen(char *hostname, char *community, int timeout, int retries) +{ + FIXME("stub: %s, %s, %d, %d\n", hostname, community, timeout, retries); + return NULL; +} + BOOL WINAPI SnmpMgrTrapListen(HANDLE *available) { FIXME("stub: %p\n", available); diff --git a/dlls/mgmtapi/mgmtapi.spec b/dlls/mgmtapi/mgmtapi.spec index e675e2d5bdf..d531b5cf5e2 100644 --- a/dlls/mgmtapi/mgmtapi.spec +++ b/dlls/mgmtapi/mgmtapi.spec @@ -3,7 +3,7 @@ @ stub SnmpMgrGetTrap @ stub SnmpMgrGetTrapEx @ stub SnmpMgrOidToStr -@ stub SnmpMgrOpen +@ stdcall SnmpMgrOpen(str str long long) @ stub SnmpMgrRequest @ stub SnmpMgrStrToOid @ stdcall SnmpMgrTrapListen(ptr)

1 0

Zhiyi Zhang : user32/tests: Add recursive keyboard and mouse hook tests.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 3c9e57d57f6d8bdb2cadbff6fa31cb41b058454f URL: https://gitlab.winehq.org/wine/wine/-/commit/3c9e57d57f6d8bdb2cadbff6fa31cb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 14 14:58:12 2023 +0800 user32/tests: Add recursive keyboard and mouse hook tests. --- dlls/user32/tests/msg.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 166 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bb7b74558c4..075535141da 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12430,6 +12430,29 @@ todo_wine { static HWND hook_hwnd; static HHOOK recursive_hook; static int hook_depth, max_hook_depth; +static BOOL skip_WH_KEYBOARD_hook, skip_WH_MOUSE_hook; + +static void simulate_click(BOOL left, int x, int y) +{ + POINT old_pt; + INPUT input[2]; + UINT events_no; + + GetCursorPos(&old_pt); + SetCursorPos(x, y); + memset(input, 0, sizeof(input)); + input[0].type = INPUT_MOUSE; + input[0].mi.dx = x; + input[0].mi.dy = y; + input[0].mi.dwFlags = left ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_RIGHTDOWN; + input[1].type = INPUT_MOUSE; + input[1].mi.dx = x; + input[1].mi.dy = y; + input[1].mi.dwFlags = left ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_RIGHTUP; + events_no = SendInput(2, input, sizeof(input[0])); + ok(events_no == 2, "SendInput returned %d\n", events_no); + SetCursorPos(old_pt.x, old_pt.y); +} static LRESULT WINAPI rec_get_message_hook(int code, WPARAM w, LPARAM l) { @@ -12450,12 +12473,85 @@ static LRESULT WINAPI rec_get_message_hook(int code, WPARAM w, LPARAM l) return res; } +static LRESULT CALLBACK keyboard_recursive_hook_proc(int code, WPARAM wp, LPARAM lp) +{ + MSG msg; + + if (code < 0) + return CallNextHookEx(0, code, wp, lp); + + if (skip_WH_KEYBOARD_hook) + return 1; + + hook_depth++; + max_hook_depth = max(max_hook_depth, hook_depth); + PeekMessageW(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE); + hook_depth--; + return CallNextHookEx(0, code, wp, lp); +} + +static LRESULT CALLBACK mouse_recursive_hook_proc(int code, WPARAM wp, LPARAM lp) +{ + MSG msg; + + if (code < 0) + return CallNextHookEx(0, code, wp, lp); + + if (skip_WH_MOUSE_hook) + return 1; + + hook_depth++; + max_hook_depth = max(max_hook_depth, hook_depth); + PeekMessageW(&msg, NULL, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE); + hook_depth--; + return CallNextHookEx(0, code, wp, lp); +} + +static LRESULT CALLBACK keyboard_recursive_cbt_hook_proc(int code, WPARAM wp, LPARAM lp) +{ + MSG msg; + + if (code < 0) + return CallNextHookEx(0, code, wp, lp); + + if (code == HCBT_KEYSKIPPED) + { + hook_depth++; + max_hook_depth = max(max_hook_depth, hook_depth); + PeekMessageW(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE); + hook_depth--; + } + + return CallNextHookEx(0, code, wp, lp); +} + +static LRESULT CALLBACK mouse_recursive_cbt_hook_proc(int code, WPARAM wp, LPARAM lp) +{ + MSG msg; + + if (code < 0) + return CallNextHookEx(0, code, wp, lp); + + if (code == HCBT_CLICKSKIPPED) + { + hook_depth++; + max_hook_depth = max(max_hook_depth, hook_depth); + PeekMessageW(&msg, NULL, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE); + hook_depth--; + } + + return CallNextHookEx(0, code, wp, lp); +} + static void test_recursive_hook(void) { + HHOOK hook, cbt_hook; + INPUT input = {0}; MSG msg; BOOL b; - hook_hwnd = CreateWindowA("Static", NULL, WS_POPUP, 0, 0, 200, 60, NULL, NULL, NULL, NULL); + hook_hwnd = CreateWindowExA(WS_EX_TOPMOST, "Static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 200, 60, + NULL, NULL, NULL, NULL); ok(hook_hwnd != NULL, "CreateWindow failed\n"); recursive_hook = SetWindowsHookExW(WH_GETMESSAGE, rec_get_message_hook, NULL, GetCurrentThreadId()); @@ -12472,6 +12568,75 @@ static void test_recursive_hook(void) b = UnhookWindowsHookEx(recursive_hook); ok(b, "UnhokWindowsHookEx failed\n"); + /* Test possible recursive hook conditions */ + b = SetForegroundWindow(hook_hwnd); + ok(b, "SetForegroundWindow failed, error %ld.\n", GetLastError()); + + /* Test a possible recursive WH_KEYBOARD hook condition */ + max_hook_depth = 0; + hook = SetWindowsHookExA(WH_KEYBOARD, keyboard_recursive_hook_proc, NULL, GetCurrentThreadId()); + ok(!!hook, "SetWindowsHookExA failed, error %ld.\n", GetLastError()); + + flush_events(); + input.type = INPUT_KEYBOARD; + input.ki.wVk = VK_F3; + SendInput(1, &input, sizeof(INPUT)); + flush_events(); + + /* Expect the WH_KEYBOARD hook not gets called recursively */ + todo_wine + ok(max_hook_depth == 1, "Got expected %d.\n", max_hook_depth); + + /* Test a possible recursive WH_CBT HCBT_KEYSKIPPED hook condition */ + max_hook_depth = 0; + skip_WH_KEYBOARD_hook = 1; + cbt_hook = SetWindowsHookExA(WH_CBT, keyboard_recursive_cbt_hook_proc, NULL, GetCurrentThreadId()); + ok(!!cbt_hook, "SetWindowsHookExA failed, error %ld.\n", GetLastError()); + + flush_events(); + input.type = INPUT_KEYBOARD; + input.ki.wVk = VK_F3; + SendInput(1, &input, sizeof(INPUT)); + while (PeekMessageA(&msg, hook_hwnd, WM_KEYFIRST, WM_KEYLAST, 0)) DispatchMessageA(&msg); + + /* Expect the WH_CBT HCBT_KEYSKIPPED hook not gets called recursively */ + todo_wine + ok(max_hook_depth == 1, "Got expected %d.\n", max_hook_depth); + + UnhookWindowsHookEx(cbt_hook); + UnhookWindowsHookEx(hook); + + /* Test a recursive WH_MOUSE hook condition */ + SetCapture(hook_hwnd); + + max_hook_depth = 0; + hook = SetWindowsHookExA(WH_MOUSE, mouse_recursive_hook_proc, NULL, GetCurrentThreadId()); + ok(!!hook, "SetWindowsHookExA failed, error %ld.\n", GetLastError()); + + flush_events(); + simulate_click(FALSE, 50, 50); + flush_events(); + + /* Expect the WH_MOUSE hook gets called recursively */ + ok(max_hook_depth > 10, "Got expected %d.\n", max_hook_depth); + + /* Test a possible recursive WH_CBT HCBT_CLICKSKIPPED hook condition */ + max_hook_depth = 0; + skip_WH_MOUSE_hook = 1; + cbt_hook = SetWindowsHookExA(WH_CBT, mouse_recursive_cbt_hook_proc, NULL, GetCurrentThreadId()); + ok(!!cbt_hook, "SetWindowsHookExA failed, error %ld.\n", GetLastError()); + + flush_events(); + simulate_click(FALSE, 50, 50); + flush_events(); + + /* Expect the WH_CBT HCBT_CLICKSKIPPED hook not gets called recursively */ + todo_wine + ok(max_hook_depth <= 10, "Got expected %d.\n", max_hook_depth); + + UnhookWindowsHookEx(cbt_hook); + UnhookWindowsHookEx(hook); + ReleaseCapture(); DestroyWindow(hook_hwnd); }

1 0

Zhiyi Zhang : win32u: Avoid calling WH_KEYBOARD and WH_CBT HCBT_KEYSKIPPED hooks recursively.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: a676f094f624a4d32e0a0552c462ad9e79ceb876 URL: https://gitlab.winehq.org/wine/wine/-/commit/a676f094f624a4d32e0a0552c462ad… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 14 15:02:37 2023 +0800 win32u: Avoid calling WH_KEYBOARD and WH_CBT HCBT_KEYSKIPPED hooks recursively. Previously, accept_hardware_message() is called after WH_KEYBOARD and WH_CBT HCBT_KEYSKIPPED hooks. So when PeekMessage() gets called in WH_KEYBOARD and WH_CBT HCBT_KEYSKIPPED hooks, the hooks will be called recursively because the message is still in the server message queue. Fix Toad for Oracle F3 find next function not working properly because its WH_KEYBOARD hook gets called too many times. --- dlls/user32/tests/msg.c | 2 -- dlls/win32u/message.c | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 075535141da..b0b2295bb5d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12584,7 +12584,6 @@ static void test_recursive_hook(void) flush_events(); /* Expect the WH_KEYBOARD hook not gets called recursively */ - todo_wine ok(max_hook_depth == 1, "Got expected %d.\n", max_hook_depth); /* Test a possible recursive WH_CBT HCBT_KEYSKIPPED hook condition */ @@ -12600,7 +12599,6 @@ static void test_recursive_hook(void) while (PeekMessageA(&msg, hook_hwnd, WM_KEYFIRST, WM_KEYLAST, 0)) DispatchMessageA(&msg); /* Expect the WH_CBT HCBT_KEYSKIPPED hook not gets called recursively */ - todo_wine ok(max_hook_depth == 1, "Got expected %d.\n", max_hook_depth); UnhookWindowsHookEx(cbt_hook); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 91f836a60bd..376af30554e 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2384,15 +2384,17 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, } } + /* if remove is TRUE, remove message first before calling hooks to avoid recursive hook calls */ + if (remove) accept_hardware_message( hw_id ); if (call_hooks( WH_KEYBOARD, remove ? HC_ACTION : HC_NOREMOVE, LOWORD(msg->wParam), msg->lParam, 0 )) { + /* if the message has not been removed, remove it */ + if (!remove) accept_hardware_message( hw_id ); /* skip this message */ call_hooks( WH_CBT, HCBT_KEYSKIPPED, LOWORD(msg->wParam), msg->lParam, 0 ); - accept_hardware_message( hw_id ); return FALSE; } - if (remove) accept_hardware_message( hw_id ); msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); if (remove && msg->message == WM_KEYDOWN)

1 0

Zhiyi Zhang : win32u: Avoid calling WH_CBT HCBT_CLICKSKIPPED hooks recursively.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: f110dc58ba7dac7819aaa3d73d42107cf4f66e3f URL: https://gitlab.winehq.org/wine/wine/-/commit/f110dc58ba7dac7819aaa3d73d4210… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 14 15:09:07 2023 +0800 win32u: Avoid calling WH_CBT HCBT_CLICKSKIPPED hooks recursively. Previously, accept_hardware_message() is called after WH_CBT HCBT_CLICKSKIPPED hooks. So when these hooks call PeekMessage(), they will be called recursively. Note that WH_MOUSE hooks do get called recursively according to tests. --- dlls/user32/tests/msg.c | 1 - dlls/win32u/message.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b0b2295bb5d..55967286092 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12629,7 +12629,6 @@ static void test_recursive_hook(void) flush_events(); /* Expect the WH_CBT HCBT_CLICKSKIPPED hook not gets called recursively */ - todo_wine ok(max_hook_depth <= 10, "Got expected %d.\n", max_hook_depth); UnhookWindowsHookEx(cbt_hook); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 376af30554e..c567d697a41 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2570,8 +2570,8 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H hook.wHitTestCode = hittest; hook.dwExtraInfo = extra_info; hook.mouseData = msg->wParam; - call_hooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, sizeof(hook) ); accept_hardware_message( hw_id ); + call_hooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, sizeof(hook) ); return FALSE; }

1 0

Zhiyi Zhang : user32/tests: Add recursive WM_SETCURSOR message tests.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 386e9fef2bdba38e5e5b564c1ac5ec14c73a85b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/386e9fef2bdba38e5e5b564c1ac5ec… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 14 16:07:40 2023 +0800 user32/tests: Add recursive WM_SETCURSOR message tests. This test show that WM_SETCURSOR gets handled recursively, so in process_mouse_message(), accept_hardware_message() can be called after sending WM_SETCURSOR and no changes are needed there. --- dlls/user32/tests/msg.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 55967286092..2dba792a2a7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12637,6 +12637,52 @@ static void test_recursive_hook(void) DestroyWindow(hook_hwnd); } +static int max_msg_depth; + +static LRESULT WINAPI recursive_messages_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + static int msg_depth; + MSG msg; + + if (message == WM_SETCURSOR && max_msg_depth < 25) + { + msg_depth++; + max_msg_depth = max(max_msg_depth, msg_depth); + PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE); + msg_depth--; + } + return DefWindowProcA(hwnd, message, wp, lp); +} + +static void test_recursive_messages(void) +{ + WNDCLASSA cls = {0}; + HWND hwnd; + + cls.lpfnWndProc = recursive_messages_proc; + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszClassName = "TestRecursiveMsgClass"; + register_class(&cls); + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "TestRecursiveMsgClass", NULL, WS_POPUP | WS_DISABLED | WS_VISIBLE, 0, 0, + 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed, error %ld.\n", GetLastError()); + SetForegroundWindow(hwnd); + flush_events(); + + max_msg_depth = 0; + simulate_click(FALSE, 50, 50); + flush_events(); + + /* Expect recursive_messages_proc() gets called recursively for WM_SETCURSOR */ + ok(max_msg_depth == 25, "Got expected %d.\n", max_msg_depth); + + DestroyWindow(hwnd); + UnregisterClassA(cls.lpszClassName, cls.hInstance); +} + static const struct message ScrollWindowPaint1[] = { { WM_PAINT, sent }, { WM_ERASEBKGND, sent|beginpaint }, @@ -20464,6 +20510,7 @@ START_TEST(msg) test_set_hook(); test_recursive_hook(); } + test_recursive_messages(); test_DestroyWindow(); test_DispatchMessage(); test_SendMessageTimeout();

1 0

Alexandre Julliard : user32: Return result through NtCallbackReturn for the DDE message callback.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: 85e351abafe565cd0fa11eb19d6e3a34edbfd896 URL: https://gitlab.winehq.org/wine/wine/-/commit/85e351abafe565cd0fa11eb19d6e3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 14:55:48 2024 +0100 user32: Return result through NtCallbackReturn for the DDE message callback. --- dlls/user32/user_main.c | 11 ++++++----- dlls/win32u/message.c | 18 +++++++++--------- dlls/wow64win/user.c | 18 ++++++------------ include/ntuser.h | 12 +++++------- 4 files changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index ef2b94ba698..a371c982721 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "user_private.h" #include "controls.h" #include "imm.h" @@ -179,18 +181,17 @@ static BOOL WINAPI User32LoadDriver( const WCHAR *path, ULONG size ) return LoadLibraryW( path ) != NULL; } -static NTSTATUS WINAPI User32UnpackDDEMessage( const struct unpack_dde_message_params *params, ULONG size ) +static NTSTATUS WINAPI User32UnpackDDEMessage( void *args, ULONG size ) { + const struct unpack_dde_message_params *params = args; struct unpack_dde_message_result result = { .wparam = params->wparam, .lparam = params->lparam }; size -= FIELD_OFFSET( struct unpack_dde_message_params, data ); if (!unpack_dde_message( params->hwnd, params->message, &result.wparam, &result.lparam, params->data, size )) - return FALSE; + return STATUS_NO_MEMORY; - if (params->result) *params->result = result; - else NtCallbackReturn( &result, sizeof(result), TRUE ); - return TRUE; + return NtCallbackReturn( &result, sizeof(result), STATUS_SUCCESS ); } static const void *kernel_callback_table[NtUserCallCount] = diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index c567d697a41..ac0970c5344 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2894,27 +2894,27 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, } if (info.msg.message >= WM_DDE_FIRST && info.msg.message <= WM_DDE_LAST) { - struct unpack_dde_message_result result; + struct unpack_dde_message_result *result; struct unpack_dde_message_params *params; - void *ret_ptr; + NTSTATUS status; ULONG len; - BOOL ret; len = FIELD_OFFSET( struct unpack_dde_message_params, data[size] ); if (!(params = malloc( len ))) continue; - params->result = &result; params->hwnd = info.msg.hwnd; params->message = info.msg.message; params->wparam = info.msg.wParam; params->lparam = info.msg.lParam; if (size) memcpy( params->data, buffer, size ); - ret = KeUserModeCallback( NtUserUnpackDDEMessage, params, len, &ret_ptr, &len ); - if (len == sizeof(result)) result = *(struct unpack_dde_message_result *)ret_ptr; + status = KeUserModeCallback( NtUserUnpackDDEMessage, params, len, (void **)&result, &len ); free( params ); - if (!ret) continue; /* ignore it */ - info.msg.wParam = result.wparam; - info.msg.lParam = result.lparam; + if (status) continue; /* ignore it */ + if (len == sizeof(*result)) + { + info.msg.wParam = result->wparam; + info.msg.lParam = result->lparam; + } } *msg = info.msg; msg->pt = point_phys_to_win_dpi( info.msg.hwnd, info.msg.pt ); diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 824d085c63e..4e63484caf2 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -399,7 +399,6 @@ struct draw_text_params32 struct unpack_dde_message_params32 { - ULONG result; ULONG hwnd; UINT message; LONG wparam; @@ -1395,14 +1394,13 @@ static NTSTATUS WINAPI wow64_NtUserUnpackDDEMessage( void *arg, ULONG size ) LONG wparam; LONG lparam; } *result32; - void *ret_ptr; ULONG ret_len; + NTSTATUS status; size -= FIELD_OFFSET( struct unpack_dde_message_params, data ); if (!(params32 = Wow64AllocateTemp( FIELD_OFFSET( struct unpack_dde_message_params32, data[size] )))) - return 0; + return STATUS_NO_MEMORY; - params32->result = 0; params32->hwnd = HandleToUlong( params->hwnd ); params32->message = params->message; params32->wparam = params->wparam; @@ -1410,18 +1408,14 @@ static NTSTATUS WINAPI wow64_NtUserUnpackDDEMessage( void *arg, ULONG size ) if (size) memcpy( params32->data, params->data, size ); size = FIELD_OFFSET( struct unpack_dde_message_params32, data[size] ); - if (!Wow64KiUserCallbackDispatcher( NtUserUnpackDDEMessage, params32, size, &ret_ptr, &ret_len )) - return FALSE; - if (ret_len == sizeof(*result32)) + status = Wow64KiUserCallbackDispatcher( NtUserUnpackDDEMessage, params32, size, (void **)&result32, &ret_len ); + if (!status && ret_len == sizeof(*result32)) { - result32 = ret_ptr; result.wparam = result32->wparam; result.lparam = result32->lparam; + return NtCallbackReturn( &result, sizeof(result), status ); } - - if (!params->result) NtCallbackReturn( &result, sizeof(result), TRUE ); - *params->result = result; - return TRUE; + return status; } static NTSTATUS WINAPI wow64_NtUserCallFreeIcon( void *arg, ULONG size ) diff --git a/include/ntuser.h b/include/ntuser.h index f8fbe64769c..e78ac3d03c2 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -262,21 +262,19 @@ struct render_synthesized_format_params }; /* NtUserUnpackDDEMessage params */ -struct unpack_dde_message_result -{ - WPARAM wparam; - LPARAM lparam; -}; - struct unpack_dde_message_params { - struct unpack_dde_message_result *result; /* FIXME: Use NtCallbackReturn instead */ HWND hwnd; UINT message; WPARAM wparam; LPARAM lparam; char data[1]; }; +struct unpack_dde_message_result +{ + WPARAM wparam; + LPARAM lparam; +}; /* process DPI awareness contexts */ #define NTUSER_DPI_UNAWARE 0x00006010

1 0

Alexandre Julliard : user32: Return result through NtCallbackReturn for the thunk lock callback.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: cdf7b1bb77a6c3ba91adffe45f4bb81161e5d64e URL: https://gitlab.winehq.org/wine/wine/-/commit/cdf7b1bb77a6c3ba91adffe45f4bb8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 14:56:36 2024 +0100 user32: Return result through NtCallbackReturn for the thunk lock callback. --- dlls/user.exe16/message.c | 9 ++++++--- dlls/win32u/message.c | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 203d543ce90..b2b5ce947b1 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -22,6 +22,8 @@ #include <stdarg.h> #include <string.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/winuser16.h" #include "wownt32.h" #include "winerror.h" @@ -2587,16 +2589,17 @@ static void WINAPI User16CallFreeIcon( ULONG *param, ULONG size ) } -static DWORD WINAPI User16ThunkLock( DWORD *param, ULONG size ) +static NTSTATUS WINAPI User16ThunkLock( void *args, ULONG size ) { + DWORD *param = args; if (size != sizeof(DWORD)) { DWORD lock; ReleaseThunkLock( &lock ); - return lock; + return NtCallbackReturn( &lock, sizeof(lock), STATUS_SUCCESS ); } RestoreThunkLock( *param ); - return 0; + return STATUS_SUCCESS; } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index ac0970c5344..2b6df6cc72c 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3007,12 +3007,15 @@ static inline LARGE_INTEGER *get_nt_timeout( LARGE_INTEGER *time, DWORD timeout static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { LARGE_INTEGER time; - DWORD ret, lock; + DWORD ret, lock = 0; void *ret_ptr; ULONG ret_len; if (enable_thunk_lock) - lock = KeUserModeCallback( NtUserThunkLock, NULL, 0, &ret_ptr, &ret_len ); + { + if (!KeUserModeCallback( NtUserThunkLock, NULL, 0, &ret_ptr, &ret_len ) && ret_len == sizeof(lock)) + lock = *(DWORD *)ret_ptr; + } if (user_driver->pProcessEvents( mask )) ret = count ? count - 1 : 0; else if (count)

1 0

Alexandre Julliard : user32: Return result through NtCallbackReturn for the copy image callback.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: wine Branch: master Commit: a60747c755fbc52dc6292e3c78354d75e524c9f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a60747c755fbc52dc6292e3c78354d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 14:59:39 2024 +0100 user32: Return result through NtCallbackReturn for the copy image callback. --- dlls/user32/user_main.c | 6 ++++-- dlls/win32u/cursoricon.c | 3 ++- dlls/wow64win/user.c | 12 +++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index a371c982721..efa33fb2760 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -100,10 +100,12 @@ static void dpiaware_init(void) } } -static NTSTATUS WINAPI User32CopyImage( const struct copy_image_params *params, ULONG size ) +static NTSTATUS WINAPI User32CopyImage( void *args, ULONG size ) { + const struct copy_image_params *params = args; HANDLE ret = CopyImage( params->hwnd, params->type, params->dx, params->dy, params->flags ); - return HandleToUlong( ret ); + if (!ret) return STATUS_NO_MEMORY; + return NtCallbackReturn( &ret, sizeof(ret), STATUS_SUCCESS ); } static NTSTATUS WINAPI User32DrawNonClientButton( const struct draw_non_client_button_params *params, ULONG size ) diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index 51226ed81a5..5fe52fdb8b3 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -718,7 +718,8 @@ HANDLE WINAPI CopyImage( HANDLE hwnd, UINT type, INT dx, INT dy, UINT flags ) { .hwnd = hwnd, .type = type, .dx = dx, .dy = dy, .flags = flags }; ret = KeUserModeCallback( NtUserCopyImage, &params, sizeof(params), &ret_ptr, &ret_len ); - return UlongToHandle( ret ); + if (!ret && ret_len == sizeof(HANDLE)) return *(HANDLE *)ret_ptr; + return 0; } /****************************************************************************** diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 4e63484caf2..219c48b754f 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1163,6 +1163,9 @@ static NTSTATUS WINAPI wow64_NtUserCallWindowsHook( void *arg, ULONG size ) static NTSTATUS WINAPI wow64_NtUserCopyImage( void *arg, ULONG size ) { struct copy_image_params *params = arg; + void *ret_ptr; + ULONG ret_len; + NTSTATUS status; struct { ULONG hwnd; @@ -1177,7 +1180,14 @@ static NTSTATUS WINAPI wow64_NtUserCopyImage( void *arg, ULONG size ) params32.dx = params->dx; params32.dy = params->dy; params32.flags = params->flags; - return dispatch_callback( NtUserCopyImage, &params32, sizeof(params32) ); + status = Wow64KiUserCallbackDispatcher( NtUserCopyImage, &params32, sizeof(params32), + &ret_ptr, &ret_len ); + if (!status && ret_len == sizeof(ULONG)) + { + HANDLE handle = ULongToHandle( *(ULONG *)ret_ptr ); + return NtCallbackReturn( &handle, sizeof(handle), status ); + } + return status; } static NTSTATUS WINAPI wow64_NtUserDrawNonClientButton( void *arg, ULONG size )

1 0