March 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Support the __os_arm64x_helper functions in the loader.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: 4a026f4230d2888fd57f26bcc5efe5d98c0091e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a026f4230d2888fd57f26bcc5efe5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 09:57:10 2024 +0100 ntdll: Support the __os_arm64x_helper functions in the loader. --- dlls/ntdll/loader.c | 28 +++++++++++++++++++++------- dlls/ntdll/ntdll_misc.h | 9 +++++++++ include/winnt.h | 9 +++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 765fb5b1617..b389a16d2a7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -240,18 +240,23 @@ static void module_push_unload_trace( const WINE_MODREF *wm ) #ifdef __arm64ec__ +static void update_hybrid_pointer( void *module, const IMAGE_SECTION_HEADER *sec, UINT rva, void *ptr ) +{ + if (!rva) return; + + if (rva < sec->VirtualAddress || rva >= sec->VirtualAddress + sec->Misc.VirtualSize) + ERR( "rva %x outside of section %s (%lx-%lx)\n", rva, + sec->Name, sec->VirtualAddress, sec->VirtualAddress + sec->Misc.VirtualSize ); + else + *(void **)get_rva( module, rva ) = ptr; +} + static void update_hybrid_metadata( void *module, IMAGE_NT_HEADERS *nt, const IMAGE_ARM64EC_METADATA *metadata ) { DWORD i, protect_old; const IMAGE_SECTION_HEADER *sec = IMAGE_FIRST_SECTION( nt ); - if (metadata->Version != 1) - { - ERR( "unknown version %lu\n", metadata->Version ); - return; - } - /* assume that all pointers are in the same section */ for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) @@ -264,13 +269,22 @@ static void update_hybrid_metadata( void *module, IMAGE_NT_HEADERS *nt, NtProtectVirtualMemory( NtCurrentProcess(), &base, &size, PAGE_READWRITE, &protect_old ); -#define SET_FUNC(func,val) *(void **)get_rva( module, metadata->func ) = val +#define SET_FUNC(func,val) update_hybrid_pointer( module, sec, metadata->func, val ) SET_FUNC( __os_arm64x_dispatch_call, __os_arm64x_check_call ); SET_FUNC( __os_arm64x_dispatch_call_no_redirect, __os_arm64x_dispatch_call_no_redirect ); SET_FUNC( __os_arm64x_dispatch_fptr, __os_arm64x_dispatch_fptr ); SET_FUNC( __os_arm64x_dispatch_icall, __os_arm64x_check_icall ); SET_FUNC( __os_arm64x_dispatch_icall_cfg, __os_arm64x_check_icall_cfg ); SET_FUNC( __os_arm64x_dispatch_ret, __os_arm64x_dispatch_ret ); + SET_FUNC( __os_arm64x_helper0, __os_arm64x_helper0 ); + SET_FUNC( __os_arm64x_helper1, __os_arm64x_helper1 ); + SET_FUNC( __os_arm64x_helper2, __os_arm64x_helper2 ); + SET_FUNC( __os_arm64x_helper3, __os_arm64x_helper3 ); + SET_FUNC( __os_arm64x_helper4, __os_arm64x_helper4 ); + SET_FUNC( __os_arm64x_helper5, __os_arm64x_helper5 ); + SET_FUNC( __os_arm64x_helper6, __os_arm64x_helper6 ); + SET_FUNC( __os_arm64x_helper7, __os_arm64x_helper7 ); + SET_FUNC( __os_arm64x_helper8, __os_arm64x_helper8 ); SET_FUNC( GetX64InformationFunctionPointer, __os_arm64x_get_x64_information ); SET_FUNC( SetX64InformationFunctionPointer, __os_arm64x_set_x64_information ); #undef SET_FUNC diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 171ded98c67..cc467d44966 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -170,6 +170,15 @@ extern void *__os_arm64x_dispatch_fptr; extern void *__os_arm64x_dispatch_ret; extern void *__os_arm64x_get_x64_information; extern void *__os_arm64x_set_x64_information; +extern void *__os_arm64x_helper0; +extern void *__os_arm64x_helper1; +extern void *__os_arm64x_helper2; +extern void *__os_arm64x_helper3; +extern void *__os_arm64x_helper4; +extern void *__os_arm64x_helper5; +extern void *__os_arm64x_helper6; +extern void *__os_arm64x_helper7; +extern void *__os_arm64x_helper8; #endif diff --git a/include/winnt.h b/include/winnt.h index 7adbc1d3761..e7c322fd127 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4044,6 +4044,15 @@ typedef struct _IMAGE_ARM64EC_METADATA ULONG ExtraRFETableSize; ULONG __os_arm64x_dispatch_fptr; ULONG AuxiliaryIATCopy; + ULONG __os_arm64x_helper0; + ULONG __os_arm64x_helper1; + ULONG __os_arm64x_helper2; + ULONG __os_arm64x_helper3; + ULONG __os_arm64x_helper4; + ULONG __os_arm64x_helper5; + ULONG __os_arm64x_helper6; + ULONG __os_arm64x_helper7; + ULONG __os_arm64x_helper8; } IMAGE_ARM64EC_METADATA; typedef struct _IMAGE_ARM64EC_REDIRECTION_ENTRY

1 0

Alexandre Julliard : winedump: Dump the __os_arm64x_helper functions.
by Alexandre Julliard 08 Mar '24

08 Mar '24

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 : include: Always use _setjmpex on non-i386 platforms.
by Alexandre Julliard 08 Mar '24

08 Mar '24

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 : msvcrt: Import setjmp/setjmpex from ntdll.
by Alexandre Julliard 08 Mar '24

08 Mar '24

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 : msvcrt: Import longjmp from ntdll for PE builds.
by Alexandre Julliard 08 Mar '24

08 Mar '24

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

Zhiyi Zhang : user32/tests: Add some ReleaseCapture() tests.
by Alexandre Julliard 08 Mar '24

08 Mar '24

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

Zhiyi Zhang : win32u: Only send mouse input in ReleaseCapture() when a window is captured.
by Alexandre Julliard 08 Mar '24

08 Mar '24

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

Rémi Bernon : server: Remove desktop from their winstation list before looking for another input desktop.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: 28c52d4ac3678e7074b9b8233d027baeb825cdc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/28c52d4ac3678e7074b9b8233d027b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 8 17:02:53 2024 +0100 server: Remove desktop from their winstation list before looking for another input desktop. --- server/winstation.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/winstation.c b/server/winstation.c index 4672cf65e56..3af4c365ec3 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -349,6 +349,8 @@ static void desktop_destroy( struct object *obj ) struct desktop *desktop = (struct desktop *)obj; struct winstation *winstation = desktop->winstation; + list_remove( &desktop->entry ); + if (desktop == winstation->input_desktop) { struct desktop *other, *found = NULL; @@ -363,7 +365,6 @@ static void desktop_destroy( struct object *obj ) if (desktop->msg_window) free_window_handle( desktop->msg_window ); if (desktop->global_hooks) release_object( desktop->global_hooks ); if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout ); - list_remove( &desktop->entry ); release_object( desktop->winstation ); }

1 0

Alexandre Julliard : Release 9.4.
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: master Commit: 1719aef8cbc99994ec93848ae6e9e29e5c4beb78 URL: https://gitlab.winehq.org/wine/wine/-/commit/1719aef8cbc99994ec93848ae6e9e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 23:35:07 2024 +0100 Release 9.4. --- ANNOUNCE.md | 814 +++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 429 insertions(+), 406 deletions(-)

1 0

Tag wine-9.4 : Alexandre Julliard : Release 9.4
by Alexandre Julliard 08 Mar '24

08 Mar '24

Module: wine Branch: refs/tags/wine-9.4 Tag: 73f1e9479ebc4cfaad0317c4b95cdac924365cb6 URL: https://gitlab.winehq.org/wine/wine/-/tags/73f1e9479ebc4cfaad0317c4b95cdac9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 8 23:35:07 2024 +0100 Release 9.4

1 0