- Wine-Commits - list.winehq.org

Zhiyi Zhang : win32u: Only send mouse input in ReleaseCapture() when a window is captured.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: wine Branch: master Commit: 818d9a12100bfa6e574e88cd1567985b5884d002 URL: https://gitlab.winehq.org/wine/wine/-/commit/818d9a12100bfa6e574e88cd156798… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 8 16:38:16 2024 +0800 win32u: Only send mouse input in ReleaseCapture() when a window is captured. Fix a regression from "bb496ea8 - server: Always queue mouse messages delivered to another window." Fix ETHER VAPOR Remaster (214570) launches to black screen when the cursor is in the game window. The game calls ReleaseCapture() when handling WM_MOUSEMOVE. After bb496ea8, WM_MOUSEMOVE is always queued because the message window is NULL. So ReleaseCapture() ends up queuing another WM_MOUSEMOVE. So the game ends up handling infinite WM_MOUSEMOVE messages at startup and is not able to do anything. --- dlls/user32/tests/win.c | 2 -- dlls/win32u/input.c | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c1c2cc52059..775164e3e9f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -13115,7 +13115,6 @@ static void test_ReleaseCapture(void) ok(ret, "ReleaseCapture failed, error %#lx.\n", GetLastError()); flush_events(TRUE); do_release_capture = FALSE; - todo_wine ok(wm_mousemove_count < 10, "Got too many WM_MOUSEMOVE.\n"); /* Test that ReleaseCapture() should send a WM_MOUSEMOVE if a window is captured */ @@ -13131,7 +13130,6 @@ static void test_ReleaseCapture(void) ret = ReleaseCapture(); ok(ret, "ReleaseCapture failed, error %#lx.\n", GetLastError()); flush_events(TRUE); - todo_wine ok(wm_mousemove_count == 0, "Got WM_MOUSEMOVE.\n"); ret = SetCursorPos(pt.x, pt.y); diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 0f6b9482942..4a7c04f66c5 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1770,10 +1770,13 @@ HWND WINAPI NtUserSetCapture( HWND hwnd ) */ BOOL release_capture(void) { - BOOL ret = set_capture_window( 0, 0, NULL ); + HWND previous = NULL; + BOOL ret; + + ret = set_capture_window( 0, 0, &previous ); /* Somebody may have missed some mouse movements */ - if (ret) + if (ret && previous) { INPUT input = { .type = INPUT_MOUSE }; input.mi.dwFlags = MOUSEEVENTF_MOVE;

1 0

Alexandre Julliard : msvcrt: Import longjmp from ntdll for PE builds.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: wine Branch: master Commit: c51c257b065cd12f4e5a3cc5788f00b9270cf1a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c51c257b065cd12f4e5a3cc5788f00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 14:02:42 2024 +0100 msvcrt: Import longjmp from ntdll for PE builds. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/except_arm.c | 21 --------------------- dlls/msvcrt/except_arm64.c | 20 -------------------- dlls/msvcrt/except_arm64ec.c | 21 --------------------- dlls/msvcrt/except_i386.c | 6 ++++-- dlls/msvcrt/except_x86_64.c | 8 ++++++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrtd/msvcrtd.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 16 files changed, 31 insertions(+), 87 deletions(-)

1 0

Alexandre Julliard : ntdll: Don't copy a missing context in get_thread_context().
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: wine Branch: master Commit: 8dc2cc24d713ff9c9b38039e33ae951f90372e69 URL: https://gitlab.winehq.org/wine/wine/-/commit/8dc2cc24d713ff9c9b38039e33ae95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 09:51:56 2024 +0100 ntdll: Don't copy a missing context in get_thread_context(). Fixes a test failure on ARM64EC. --- dlls/ntdll/unix/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 7f2f1b9a50e..60c833b0320 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1790,7 +1790,7 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma } SERVER_END_REQ; } - if (!ret) + if (!ret && count) { ret = context_from_server( context, &server_contexts[0], machine ); if (!ret && count > 1) ret = context_from_server( context, &server_contexts[1], machine );

1 0

Zebediah Figura : server: Create processes using a limited administrator token by default.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: wine Branch: master Commit: e92ba2de43d7afbe0704b11b29f7c30f44dfaeca URL: https://gitlab.winehq.org/wine/wine/-/commit/e92ba2de43d7afbe0704b11b29f7c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 7 22:54:19 2021 -0600 server: Create processes using a limited administrator token by default. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40613 --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index bf5b7cc26d3..abd6edb58a9 100644 --- a/server/process.c +++ b/server/process.c @@ -711,7 +711,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla if (!parent) { process->handles = alloc_handle_table( process, 0 ); - process->token = token_create_admin( TRUE, -1, TokenElevationTypeFull, default_session_id ); + process->token = token_create_admin( TRUE, -1, TokenElevationTypeLimited, default_session_id ); process->affinity = ~0; } else

1 0

Zhiyi Zhang : user32/tests: Add some ReleaseCapture() tests.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: wine Branch: master Commit: d47b13c45aea8809b46ac64e2cdbb300b760549b URL: https://gitlab.winehq.org/wine/wine/-/commit/d47b13c45aea8809b46ac64e2cdbb3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 8 15:21:54 2024 +0800 user32/tests: Add some ReleaseCapture() tests. --- dlls/user32/tests/win.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 1b03e64181a..c1c2cc52059 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -13064,6 +13064,82 @@ static void test_shell_tray(void) DestroyWindow(hwnd); } +static int wm_mousemove_count; +static BOOL do_release_capture; + +static LRESULT WINAPI test_ReleaseCapture_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_MOUSEMOVE) + { + wm_mousemove_count++; + if (wm_mousemove_count >= 100) + return 1; + + if (do_release_capture) + ReleaseCapture(); + return 0; + } + return DefWindowProcA(hwnd, msg, wp, lp); +} + +static void test_ReleaseCapture(void) +{ + WNDCLASSA cls = {0}; + ATOM atom; + HWND hwnd; + POINT pt; + BOOL ret; + + cls.lpfnWndProc = test_ReleaseCapture_proc; + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(BLACK_BRUSH); + cls.lpszClassName = "test_ReleaseCapture_class"; + atom = RegisterClassA(&cls); + ok(!!atom, "RegisterClassA failed, error %#lx.\n", GetLastError()); + + hwnd = CreateWindowExA(WS_EX_TOPMOST, cls.lpszClassName, "", WS_POPUP | WS_VISIBLE, 100, 100, + 100, 100, NULL, NULL, 0, NULL); + ok(!!hwnd, "CreateWindowA failed, error %#lx.\n", GetLastError()); + ret = SetForegroundWindow(hwnd); + ok(ret, "SetForegroundWindow failed, error %#lx.\n", GetLastError()); + GetCursorPos(&pt); + ret = SetCursorPos(150, 150); + ok(ret, "SetCursorPos failed, error %#lx.\n", GetLastError()); + flush_events(TRUE); + + /* Test a Wine bug that WM_MOUSEMOVE is post too many times when calling ReleaseCapture() during + * handling WM_MOUSEMOVE and the cursor is on the window */ + do_release_capture = TRUE; + ret = ReleaseCapture(); + ok(ret, "ReleaseCapture failed, error %#lx.\n", GetLastError()); + flush_events(TRUE); + do_release_capture = FALSE; + todo_wine + ok(wm_mousemove_count < 10, "Got too many WM_MOUSEMOVE.\n"); + + /* Test that ReleaseCapture() should send a WM_MOUSEMOVE if a window is captured */ + SetCapture(hwnd); + wm_mousemove_count = 0; + ret = ReleaseCapture(); + ok(ret, "ReleaseCapture failed, error %#lx.\n", GetLastError()); + flush_events(TRUE); + ok(wm_mousemove_count == 1, "Got no WM_MOUSEMOVE.\n"); + + /* Test that ReleaseCapture() shouldn't send WM_MOUSEMOVE if no window is captured */ + wm_mousemove_count = 0; + ret = ReleaseCapture(); + ok(ret, "ReleaseCapture failed, error %#lx.\n", GetLastError()); + flush_events(TRUE); + todo_wine + ok(wm_mousemove_count == 0, "Got WM_MOUSEMOVE.\n"); + + ret = SetCursorPos(pt.x, pt.y); + ok(ret, "SetCursorPos failed, error %#lx.\n", GetLastError()); + DestroyWindow(hwnd); + UnregisterClassA(cls.lpszClassName, GetModuleHandleA(0)); +} + START_TEST(win) { char **argv; @@ -13246,6 +13322,7 @@ START_TEST(win) test_cancel_mode(); test_DragDetect(); test_WM_NCCALCSIZE(); + test_ReleaseCapture(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Alexandre Julliard : msvcrt: Import setjmp/setjmpex from ntdll.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: wine Branch: master Commit: d538432d79dfe9941934a5478c5c54ba46a3b959 URL: https://gitlab.winehq.org/wine/wine/-/commit/d538432d79dfe9941934a5478c5c54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 13:45:07 2024 +0100 msvcrt: Import setjmp/setjmpex from ntdll. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 8 ++++---- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/except_arm.c | 6 ------ dlls/msvcrt/except_arm64.c | 3 +-- dlls/msvcrt/except_arm64ec.c | 9 --------- dlls/msvcrt/except_i386.c | 9 +++++---- dlls/msvcrt/except_x86_64.c | 6 ------ dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 17 files changed, 41 insertions(+), 62 deletions(-)

1 0

Alexandre Julliard : include: Always use _setjmpex on non-i386 platforms.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: wine Branch: master Commit: 1d168222fd78052f54c8225ba9189eeeaecb3764 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d168222fd78052f54c8225ba9189e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 13:25:15 2024 +0100 include: Always use _setjmpex on non-i386 platforms. --- include/msvcrt/setjmp.h | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 6576605cf1b..38f9ba682ad 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -147,29 +147,35 @@ extern "C" { _ACRTIMP void __cdecl longjmp(jmp_buf,int); -#ifdef _WIN64 -# ifdef _UCRT +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif + +#ifdef _UCRT +# ifdef __i386__ +# define _setjmp __intrinsic_setjmp +# else # define _setjmpex __intrinsic_setjmpex # endif -# if defined(__GNUC__) || defined(__clang__) -_ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); -# define setjmp(buf) _setjmpex(buf,__builtin_frame_address(0)) -# define setjmpex(buf) _setjmpex(buf,__builtin_frame_address(0)) +#endif + +#ifdef __i386__ +# if defined(_setjmp) || !__has_builtin(_setjmp) +_ACRTIMP int __cdecl __attribute__((__nothrow__,__returns_twice__)) _setjmp(jmp_buf); # endif -#else /* _WIN64 */ -# ifdef _UCRT -# define _setjmp __intrinsic_setjmp +# define setjmp(buf) _setjmp((buf)) +#else /* __i386__ */ +# if defined(_setjmpex) || !__has_builtin(_setjmpex) +_ACRTIMP int __cdecl __attribute__((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); # endif -# if defined(__GNUC__) || defined(__clang__) -_ACRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf); +# if __has_builtin(__builtin_sponentry) +# define setjmp(buf) _setjmpex((buf), __builtin_sponentry()) +# elif __has_builtin(__builtin_frame_address) +# define setjmp(buf) _setjmpex((buf), __builtin_frame_address(0)) # else -_ACRTIMP int __cdecl _setjmp(jmp_buf); +# define setjmp(buf) _setjmpex((buf), NULL) # endif -#endif /* _WIN64 */ - -#ifndef setjmp -#define setjmp _setjmp -#endif +#endif /* __i386__ */ #ifdef __cplusplus }

1 0

Alexandre Julliard : winedump: Dump the __os_arm64x_helper functions.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: wine Branch: master Commit: 5c26513278220f9772a9f54caa50a8c3c4d089d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c26513278220f9772a9f54caa50a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 09:57:49 2024 +0100 winedump: Dump the __os_arm64x_helper functions. --- tools/winedump/pe.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index d4bf46c5307..8ff0a955c99 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1911,6 +1911,15 @@ static void dump_hybrid_metadata(void) printf( " ExtraRFETableSize %#x\n", (int)data->ExtraRFETableSize ); printf( " __os_arm64x_dispatch_fptr %#x\n", (int)data->__os_arm64x_dispatch_fptr ); printf( " AuxiliaryIATCopy %#x\n", (int)data->AuxiliaryIATCopy ); + printf( " __os_arm64x_helper0 %#x\n", (int)data->__os_arm64x_helper0 ); + printf( " __os_arm64x_helper1 %#x\n", (int)data->__os_arm64x_helper1 ); + printf( " __os_arm64x_helper2 %#x\n", (int)data->__os_arm64x_helper2 ); + printf( " __os_arm64x_helper3 %#x\n", (int)data->__os_arm64x_helper3 ); + printf( " __os_arm64x_helper4 %#x\n", (int)data->__os_arm64x_helper4 ); + printf( " __os_arm64x_helper5 %#x\n", (int)data->__os_arm64x_helper5 ); + printf( " __os_arm64x_helper6 %#x\n", (int)data->__os_arm64x_helper6 ); + printf( " __os_arm64x_helper7 %#x\n", (int)data->__os_arm64x_helper7 ); + printf( " __os_arm64x_helper8 %#x\n", (int)data->__os_arm64x_helper8 ); if (data->CodeMap) {

1 0

Alexandre Julliard : ntdll: Remove a misleading WARN.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: wine Branch: master Commit: fd5b56b96d43b9314d2ae0096200b109beb32549 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd5b56b96d43b9314d2ae0096200b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 17:13:18 2024 +0100 ntdll: Remove a misleading WARN. --- dlls/ntdll/signal_x86_64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b49ec23860f..8b1de07ccc9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -88,7 +88,6 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } if (status != STATUS_UNSUCCESSFUL) return status; } - else WARN( "exception data not found for pc %p\n", (void *)context->Rip ); return RtlVirtualUnwind2( type, dispatch->ImageBase, context->Rip, dispatch->FunctionEntry, context, NULL, &dispatch->HandlerData, &dispatch->EstablisherFrame,

1 0

Zebediah Figura : ntdll: Elevate processes if requested in the manifest.
by Alexandre Julliard March 8, 2024

March 8, 2024

Module: wine Branch: master Commit: 897bcd5d5c6b12d6e69c2a688cfcfd4d42fd1ea0 URL: https://gitlab.winehq.org/wine/wine/-/commit/897bcd5d5c6b12d6e69c2a688cfcfd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 4 20:14:29 2024 -0600 ntdll: Elevate processes if requested in the manifest. Rufus 3.13 Portable requires administrator privileges, and uses a manifest to elevate itself. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51000 --- dlls/ntdll/loader.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cf9f4ac9a84..765fb5b1617 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -35,6 +35,7 @@ #include "wine/debug.h" #include "wine/list.h" #include "ntdll_misc.h" +#include "ddk/ntddk.h" #include "ddk/wdm.h" WINE_DEFAULT_DEBUG_CHANNEL(module); @@ -4104,7 +4105,40 @@ static void load_global_options(void) } } +static BOOL needs_elevation(void) +{ + ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION run_level; + + if (!RtlQueryInformationActivationContext( 0, NULL, NULL, RunlevelInformationInActivationContext, + &run_level, sizeof(run_level), NULL )) + { + TRACE( "image requested run level %#x\n", run_level.RunLevel ); + if (run_level.RunLevel == ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE + || run_level.RunLevel == ACTCTX_RUN_LEVEL_REQUIRE_ADMIN) + return TRUE; + } + return FALSE; +} +static void elevate_token(void) +{ + PROCESS_ACCESS_TOKEN token; + TOKEN_ELEVATION_TYPE type; + TOKEN_LINKED_TOKEN linked; + + NtQueryInformationToken( GetCurrentThreadEffectiveToken(), + TokenElevationType, &type, sizeof(type), NULL ); + + if (type == TokenElevationTypeFull) return; + + NtQueryInformationToken( GetCurrentThreadEffectiveToken(), + TokenLinkedToken, &linked, sizeof(linked), NULL ); + + token.Thread = NULL; + token.Token = linked.LinkedToken; + NtSetInformationProcess( GetCurrentProcess(), ProcessAccessToken, &token, sizeof(token) ); + NtClose( linked.LinkedToken ); +} #ifdef _WIN64 @@ -4290,6 +4324,8 @@ void loader_init( CONTEXT *context, void **entry ) actctx_init(); locale_init(); + if (needs_elevation()) + elevate_token(); get_env_var( L"WINESYSTEMDLLPATH", 0, &system_dll_path ); if (wm->ldr.Flags & LDR_COR_ILONLY) status = fixup_imports_ilonly( wm, NULL, entry );

1 0