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

Alexandre Julliard : ntdll/tests: Use a proper handler in the RtlRaiseException test on x86-64.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 462b27d87fc045647b04153858147af99c2da61c URL: https://gitlab.winehq.org/wine/wine/-/commit/462b27d87fc045647b04153858147a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 13:32:17 2024 +0100 ntdll/tests: Use a proper handler in the RtlRaiseException test on x86-64. --- dlls/ntdll/tests/exception.c | 144 ++++++++++++++++++++++++++----------------- 1 file changed, 87 insertions(+), 57 deletions(-)

1 0

Alexandre Julliard : ntdll: Implement RtlRaiseException on ARM64EC.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: f35e2d513d5a96887d876bc3a0e171ff381f1ae5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f35e2d513d5a96887d876bc3a0e171… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 13:37:29 2024 +0100 ntdll: Implement RtlRaiseException on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 30 +++++++++++++++++++++++++++--- dlls/ntdll/tests/exception.c | 42 +++++++++++++++++++++++++++++++----------- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 1c4b8d94727..90060e26daf 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1794,9 +1794,33 @@ void __attribute__((naked)) __chkstk_arm64ec(void) /*********************************************************************** * RtlRaiseException (NTDLL.@) */ -void WINAPI RtlRaiseException( struct _EXCEPTION_RECORD * rec) -{ - FIXME( "not implemented\n" ); +void __attribute((naked)) RtlRaiseException( EXCEPTION_RECORD *rec ) +{ + asm( ".seh_proc RtlRaiseException\n\t" + "sub sp, sp, #0x4d0\n\t" /* sizeof(context) */ + ".seh_stackalloc 0x4d0\n\t" + "stp x29, x30, [sp, #-0x20]!\n\t" + ".seh_save_fplr_x 0x20\n\t" + "str x0, [sp, #0x10]\n\t" + ".seh_save_any_reg x0, 0x10\n\t" + ".seh_endprologue\n\t" + "add x0, sp, #0x20\n\t" + "bl RtlCaptureContext\n\t" + "add x1, sp, #0x20\n\t" /* context pointer */ + "ldr x0, [sp, #0x10]\n\t" /* rec */ + "ldr x2, [x1, #0xf8]\n\t" /* context->Rip */ + "str x2, [x0, #0x10]\n\t" /* rec->ExceptionAddress */ + "ldr w2, [x1, #0x30]\n\t" /* context->ContextFlags */ + "orr w2, w2, #0x20000000\n\t" /* CONTEXT_UNWOUND_TO_CALL */ + "str w2, [x1, #0x30]\n\t" + "ldr x3, [x18, #0x60]\n\t" /* peb */ + "ldrb w2, [x3, #2]\n\t" /* peb->BeingDebugged */ + "cbnz w2, 1f\n\t" + "bl dispatch_exception\n" + "1:\tmov w2, #1\n\t" + "bl NtRaiseException\n\t" + "b RtlRaiseStatus\n\t" /* does not return */ + ".seh_endproc" ); } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1e51d207f1c..b0b76f37813 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3218,13 +3218,23 @@ static void rtlraiseexception_handler_( EXCEPTION_RECORD *rec, void *frame, CONT trace( "exception: %08lx flags:%lx addr:%p context: Rip:%p\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, (void *)context->Rip ); - ok( addr == (char *)code_mem + 0x0c || broken( addr == code_mem || !addr ) /* 2008 */, - "ExceptionAddress at %p instead of %p\n", addr, (char *)code_mem + 0x0c ); - - ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE) - || context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS) - || context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS | CONTEXT_XSTATE), - "wrong context flags %lx\n", context->ContextFlags ); + if (is_arm64ec) /* addr points to RtlRaiseException entry thunk */ + { + ok( ((ULONG *)addr)[-1] == 0xd63f0120 /* blr x9 */, + "ExceptionAddress not in entry thunk %p (ntdll+%Ix)\n", + addr, (char *)addr - (char *)hntdll ); + ok( context->ContextFlags == (CONTEXT_FULL | CONTEXT_UNWOUND_TO_CALL), + "wrong context flags %lx\n", context->ContextFlags ); + } + else + { + ok( addr == (char *)code_mem + 0x0c || broken( addr == code_mem || !addr ) /* 2008 */, + "ExceptionAddress at %p instead of %p\n", addr, (char *)code_mem + 0x0c ); + ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE) + || context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS) + || context->ContextFlags == (CONTEXT_FULL | CONTEXT_SEGMENTS | CONTEXT_XSTATE), + "wrong context flags %lx\n", context->ContextFlags ); + } /* check that pc is fixed up only for EXCEPTION_BREAKPOINT * even if raised by RtlRaiseException @@ -3278,8 +3288,13 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; void *addr = rec->ExceptionAddress; - ok( addr == (char *)code_mem + 0xc || broken(addr == code_mem || !addr ) /* 2008 */, - "ExceptionAddress at %p instead of %p\n", addr, (char *)code_mem + 0xc ); + if (is_arm64ec) /* addr points to RtlRaiseException entry thunk */ + ok( ((ULONG *)addr)[-1] == 0xd63f0120 /* blr x9 */, + "ExceptionAddress not in entry thunk %p (ntdll+%Ix)\n", + addr, (char *)addr - (char *)hntdll ); + else + ok( addr == (char *)code_mem + 0xc || broken(addr == code_mem || !addr ) /* 2008 */, + "ExceptionAddress at %p instead of %p\n", addr, (char *)code_mem + 0xc ); /* check that Rip is fixed up only for EXCEPTION_BREAKPOINT * even if raised by RtlRaiseException @@ -3355,8 +3370,13 @@ static void run_rtlraiseexception_test(DWORD exceptioncode) rtlraiseexception_teb_handler_called = 0; rtlraiseexception_unhandled_handler_called = 0; func(pRtlRaiseException, &record); - ok( record.ExceptionAddress == (char *)code_mem + 0x0c, - "address set to %p instead of %p\n", record.ExceptionAddress, (char *)code_mem + 0x0c ); + if (is_arm64ec) /* addr points to RtlRaiseException entry thunk */ + ok( ((ULONG *)record.ExceptionAddress)[-1] == 0xd63f0120 /* blr x9 */, + "ExceptionAddress not in entry thunk %p (ntdll+%Ix)\n", + record.ExceptionAddress, (char *)record.ExceptionAddress - (char *)hntdll ); + else + ok( record.ExceptionAddress == (char *)code_mem + 0x0c, + "address set to %p instead of %p\n", record.ExceptionAddress, (char *)code_mem + 0x0c ); todo_wine ok( !rtlraiseexception_teb_handler_called, "Frame TEB handler called\n" );

1 0

Alexandre Julliard : kernelbase: Implement RaiseException on ARM64EC.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 577c327a44025fb05fa9dbb12990e2c0e2be06d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/577c327a44025fb05fa9dbb12990e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 14:27:32 2024 +0100 kernelbase: Implement RaiseException on ARM64EC. --- dlls/kernelbase/debug.c | 33 ++++++++++++++++++++++++++++++--- dlls/ntdll/tests/exception.c | 3 ++- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 8eb5094dbef..b7df4a7c766 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -313,7 +313,34 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringW( LPCWSTR str ) /******************************************************************* * RaiseException (kernelbase.@) */ -#if defined(__x86_64__) +#ifdef __x86_64__ +#ifdef __arm64ec__ +void __attribute__((naked)) RaiseException( DWORD code, DWORD flags, DWORD count, const ULONG_PTR *args ) +{ + asm( ".seh_proc RaiseException\n\t" + "stp x29, x30, [sp, #-0xb0]!\n\t" + ".seh_save_fplr_x 0xb0\n\t" + ".seh_endprologue\n\t" + "and w1, w1, #0x01\n\t" /* EXCEPTION_NONCONTINUABLE */ + "stp w0, w1, [sp, #0x10]\n\t" /* ExceptionCode, ExceptionFlags */ + "adr x4, RaiseException\n\t" + "stp xzr, x4, [sp, #0x18]\n\t" /* ExceptionRecord, ExceptionAddress */ + "mov w5, #0x0f\n\t" /* EXCEPTION_MAXIMUM_PARAMETERS */ + "cmp w2, w5\n\t" + "csel w2, w2, w5, lo\n\t" + "str x2, [sp, #0x28]\n\t" /* NumberParameters */ + "cbz x3, 1f\n\t" + "lsl w2, w2, #3\n\t" + "add x0, sp, #0x30\n\t" /* ExceptionInformation */ + "mov x1, x3\n\t" /* args */ + "bl \"#memcpy\"\n" + "1:\tadd x0, sp, #0x10\n\t" /* rec */ + "bl \"#RtlRaiseException\"\n\t" + "ldp x29, x30, [sp], #0xb0\n\t" + "ret\n\t" + ".seh_endproc" ); +} +#else /* Some DRMs depend on RaiseException not altering non-volatile registers. */ __ASM_GLOBAL_FUNC( RaiseException, ".byte 0x48,0x8d,0xa4,0x24,0x00,0x00,0x00,0x00\n\t" /* hotpatch prolog */ @@ -350,14 +377,14 @@ __ASM_GLOBAL_FUNC( RaiseException, "add $0xc8,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -0xc8\n\t") "ret" ) - +#endif /* __arm64ec__ */ C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionCode) == 0 ); C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionFlags) == 4 ); C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionRecord) == 8 ); C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionAddress) == 0x10 ); C_ASSERT( offsetof(EXCEPTION_RECORD, NumberParameters) == 0x18 ); C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionInformation) == 0x20 ); -#else +#else /* __x86_64__ */ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD count, const ULONG_PTR *args ) { EXCEPTION_RECORD record; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b0b76f37813..eed151cdb1f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5183,7 +5183,8 @@ static void test_raiseexception_regs(void) ++expected; ok(test_raiseexception_regs_context.Rdi == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rdi); ++expected; - ok(test_raiseexception_regs_context.Rbp == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rbp); + ok(test_raiseexception_regs_context.Rbp == expected || is_arm64ec /* x29 modified by entry thunk */, + "got %#I64x.\n", test_raiseexception_regs_context.Rbp); ++expected; ok(test_raiseexception_regs_context.R12 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R12); ++expected;

1 0

Alexandre Julliard : qwave/tests: Remove todo from a succeeding test.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: f9dd0fca4c0b4fe0972011a48ce9dae6ed69e812 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9dd0fca4c0b4fe0972011a48ce9da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 23:14:02 2024 +0100 qwave/tests: Remove todo from a succeeding test. --- dlls/qwave/tests/qos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qwave/tests/qos.c b/dlls/qwave/tests/qos.c index efbc82e693d..1815784f30d 100644 --- a/dlls/qwave/tests/qos.c +++ b/dlls/qwave/tests/qos.c @@ -83,7 +83,7 @@ static void test_QOSCloseHandle(void) SetLastError(0xdeadbeef); ret = QOSCloseHandle(h); todo_wine ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = QOSCloseHandle((HANDLE)0xdeadbeef);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: e5085327ffee8c37b2f88dd524cd8554e862cda4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5085327ffee8c37b2f88dd524cd85… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Mar 1 00:38:29 2024 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 5736de36ea4..a6d4d9db987 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2024-02-20 00:47+0200\n" +"PO-Revision-Date: 2024-03-01 00:38+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10146,7 +10146,7 @@ msgstr "Valdymo skydelis" #: dlls/shell32/shell32.rc:161 msgid "Ne&w" -msgstr "" +msgstr "Na&ujas" #: dlls/shell32/shell32.rc:163 msgid "E&xplore"

1 0