June 2023 - Wine-commits - list.winehq.org

Piotr Caban : msvcr100: Fix next writer unblocking in reader_writer_lock::unlock.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 0336d66ea1926f62dd303e266683fef7de6e9a87 URL: https://gitlab.winehq.org/wine/wine/-/commit/0336d66ea1926f62dd303e266683fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 31 22:31:12 2023 +0200 msvcr100: Fix next writer unblocking in reader_writer_lock::unlock. Fixes regression introduced by 256c344550fa27d82602232588b32e74a3a9a7f3. --- dlls/msvcrt/concurrency.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index d0f029650ac..84ee0f1817a 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -3302,7 +3302,7 @@ void __thiscall reader_writer_lock_unlock(reader_writer_lock *this) count = InterlockedDecrement(&this->count); if (count != WRITER_WAITING) return; - NtReleaseKeyedEvent(keyed_event, this->writer_head, 0, NULL); + call_Context_Unblock(this->writer_head->ctx); return; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: c1588b1bfd817fbadd1539ef63a12210525fc6fe URL: https://gitlab.winehq.org/wine/wine/-/commit/c1588b1bfd817fbadd1539ef63a122… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Jun 1 00:24:13 2023 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9477178d5a3..34912556d08 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: 2023-05-25 00:13+0300\n" +"PO-Revision-Date: 2023-06-01 00:23+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -4020,10 +4020,8 @@ msgid "Syntax error in regular expression" msgstr "Sintaksės klaida reguliariajame reiškinyje" #: dlls/jscript/jscript.rc:66 -#, fuzzy -#| msgid "Expected identifier" msgid "Unexpected quantifier" -msgstr "Tikėtasi identifikatoriaus" +msgstr "Netikėtas kvantorius" #: dlls/jscript/jscript.rc:67 msgid "Exception thrown and not caught"

1 0

Alistair Leslie-Hughes : krnl386.exe16: Don't overflow when calculating size.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 77e0aae7f3acae3f87ae38264b2edcbe3e227d6c URL: https://gitlab.winehq.org/wine/wine/-/commit/77e0aae7f3acae3f87ae38264b2edc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 1 17:51:00 2023 +1000 krnl386.exe16: Don't overflow when calculating size. The application again the bug, passed 1 as the elem parameter which doubled the memory being allocated. When it overflowed (became negative), the value was passed into GlobalAlloc16 which then failed. GlobalAlloc16 takes a DWORD parameter, so the value isn't going to be truncated. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53092 Original patch by github user cracyc for winevdm. --- dlls/krnl386.exe16/ne_segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/ne_segment.c b/dlls/krnl386.exe16/ne_segment.c index 3eb8bae2ff3..e455b118e23 100644 --- a/dlls/krnl386.exe16/ne_segment.c +++ b/dlls/krnl386.exe16/ne_segment.c @@ -945,7 +945,7 @@ static WORD NE_Ne2MemFlags(WORD flags) */ DWORD WINAPI MyAlloc16( WORD wFlags, WORD wSize, WORD wElem ) { - WORD size = wSize << wElem; + DWORD size = wSize << wElem; HANDLE16 hMem = 0; if (wSize || (wFlags & NE_SEGFLAGS_MOVEABLE))

1 0

Alistair Leslie-Hughes : xactengine: Correct XACTNOTIFICATIONTYPE_MAX value.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 6a685626be5b44f633be4746c4bd677b7ff65331 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a685626be5b44f633be4746c4bd67… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 1 12:47:52 2023 +1000 xactengine: Correct XACTNOTIFICATIONTYPE_MAX value. XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT is defined as 18. --- dlls/xactengine3_7/xact_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index cb6b76cbf30..0b0af6dd3df 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -53,7 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #define IXACT3WaveBankVtbl IXACTWaveBankVtbl #endif -#define XACTNOTIFICATIONTYPE_MAX 18 /* XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT + 1 */ +#define XACTNOTIFICATIONTYPE_MAX 19 /* XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT + 1 */ struct wrapper_lookup {

1 0

Alistair Leslie-Hughes : xactengine: IXACT3EngineImpl_CreateSoundBank isn't a stub.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 1db53cdcbbb9ff75a118d7139eb486b209b81975 URL: https://gitlab.winehq.org/wine/wine/-/commit/1db53cdcbbb9ff75a118d7139eb486… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 1 12:53:49 2023 +1000 xactengine: IXACT3EngineImpl_CreateSoundBank isn't a stub. --- dlls/xactengine3_7/xact_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 0b0af6dd3df..41d35e232df 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1170,7 +1170,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, UINT ret; HRESULT hr; - TRACE("(%p)->(%p, %lu, 0x%lx, 0x%lx, %p): stub!\n", This, pvBuffer, dwSize, dwFlags, + TRACE("(%p)->(%p, %lu, 0x%lx, 0x%lx, %p)\n", This, pvBuffer, dwSize, dwFlags, dwAllocAttributes, ppSoundBank); ret = FACTAudioEngine_CreateSoundBank(This->fact_engine, pvBuffer, dwSize,

1 0

Paul Gofman : kernelbase: Don't modify non-volatile regs in RaiseException() on x64.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: e7845fc3305c9c170730b6b7375caadc853ada87 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7845fc3305c9c170730b6b7375caa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 30 14:40:53 2023 -0600 kernelbase: Don't modify non-volatile regs in RaiseException() on x64. --- dlls/kernelbase/debug.c | 46 ++++++++++++++++++++ dlls/ntdll/tests/exception.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 4eff7ad1cca..df1b9a63604 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -283,6 +283,51 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringW( LPCWSTR str ) /******************************************************************* * RaiseException (kernelbase.@) */ +#if defined(__x86_64__) +/* 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 */ + "sub $0xc8,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0xc8\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0xc8\n\t") + "leaq 0x20(%rsp),%rax\n\t" + "movl %ecx,(%rax)\n\t" /* ExceptionCode */ + "and $1,%edx\n\t" + "movl %edx,4(%rax)\n\t" /* ExceptionFlags */ + "movq $0,8(%rax)\n\t" /* ExceptionRecord */ + "leaq " __ASM_NAME("RaiseException") "(%rip),%rcx\n\t" + "movq %rcx,0x10(%rax)\n\t" /* ExceptionAddress */ + "movq %rax,%rcx\n\t" + "movl $0,0x18(%rcx)\n\t" /* NumberParameters */ + "testl %r8d,%r8d\n\t" + "jz 2f\n\t" + "testq %r9,%r9\n\t" + "jz 2f\n\t" + "movl $15,%edx\n\t" + "cmp %edx,%r8d\n\t" + "cmovb %r8d,%edx\n\t" + "movl %edx,0x18(%rcx)\n\t" /* NumberParameters */ + "leaq 0x20(%rcx),%rax\n" /* ExceptionInformation */ + "1:\tmovq (%r9),%r8\n\t" + "movq %r8,(%rax)\n\t" + "decl %edx\n\t" + "jz 2f\n\t" + "addq $8,%rax\n\t" + "addq $8,%r9\n\t" + "jmp 1b\n" + "2:\tcall " __ASM_NAME("RtlRaiseException") "\n\t" + "add $0xc8,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -0xc8\n\t") + "ret" ) + +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 void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD count, const ULONG_PTR *args ) { EXCEPTION_RECORD record; @@ -301,6 +346,7 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou RtlRaiseException( &record ); } +#endif __ASM_STDCALL_IMPORT(RaiseException,16) /******************************************************************* diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 128b2adde3b..f2ba16f4bae 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5031,6 +5031,104 @@ static void test_syscall_clobbered_regs(void) ok(regs.r11 == regs.eflags, "Expected r11 (%#I64x) to equal EFLAGS (%#x).\n", regs.r11, regs.eflags); } + +static CONTEXT test_raiseexception_regs_context; +static LONG CALLBACK test_raiseexception_regs_handle(EXCEPTION_POINTERS *exception_info) +{ + EXCEPTION_RECORD *rec = exception_info->ExceptionRecord; + unsigned int i; + + test_raiseexception_regs_context = *exception_info->ContextRecord; + ok(rec->NumberParameters == EXCEPTION_MAXIMUM_PARAMETERS, "got %lu.\n", rec->NumberParameters); + ok(rec->ExceptionCode == 0xdeadbeaf, "got %#lx.\n", rec->ExceptionCode); + ok(!rec->ExceptionRecord, "got %p.\n", rec->ExceptionRecord); + ok(!rec->ExceptionFlags, "got %#lx.\n", rec->ExceptionFlags); + for (i = 0; i < rec->NumberParameters; ++i) + ok(rec->ExceptionInformation[i] == i, "got %Iu, i %u.\n", rec->ExceptionInformation[i], i); + return EXCEPTION_CONTINUE_EXECUTION; +} + +static void test_raiseexception_regs(void) +{ + static const BYTE code[] = + { + 0xb8, 0x00, 0xb0, 0xad, 0xde, /* mov $0xdeadb000,%eax */ + 0x53, /* push %rbx */ + 0x48, 0x89, 0xc3, /* mov %rax,%rbx */ + 0x56, /* push %rsi */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x48, 0x89, 0xc6, /* mov %rax,%rsi */ + 0x57, /* push %rdi */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x48, 0x89, 0xc7, /* mov %rax,%rdi */ + 0x55, /* push %rbp */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x48, 0x89, 0xc5, /* mov %rax,%rbp */ + 0x41, 0x54, /* push %r12 */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x49, 0x89, 0xc4, /* mov %rax,%r12 */ + 0x41, 0x55, /* push %r13 */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x49, 0x89, 0xc5, /* mov %rax,%r13 */ + 0x41, 0x56, /* push %r14 */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x49, 0x89, 0xc6, /* mov %rax,%r14 */ + 0x41, 0x57, /* push %r15 */ + 0x48, 0xff, 0xc0, /* inc %rax */ + 0x49, 0x89, 0xc7, /* mov %rax,%r15 */ + + 0x50, /* push %rax */ /* align stack */ + 0x48, 0x89, 0xc8, /* mov %rcx,%rax */ + 0xb9, 0xaf, 0xbe, 0xad, 0xde, /* mov $0xdeadbeaf,%ecx */ + 0xff, 0xd0, /* call *%rax */ + 0x58, /* pop %rax */ + + 0x41, 0x5f, /* pop %r15 */ + 0x41, 0x5e, /* pop %r14 */ + 0x41, 0x5d, /* pop %r13 */ + 0x41, 0x5c, /* pop %r12 */ + 0x5d, /* pop %rbp */ + 0x5f, /* pop %rdi */ + 0x5e, /* pop %rsi */ + 0x5b, /* pop %rbx */ + 0xc3, /* ret */ + }; + void (WINAPI *pRaiseException)( DWORD code, DWORD flags, DWORD count, const ULONG_PTR *args ) = RaiseException; + void (WINAPI *func)(void *raise_exception, DWORD flags, DWORD count, const ULONG_PTR *args); + void *vectored_handler; + ULONG_PTR args[20]; + ULONG64 expected; + unsigned int i; + + vectored_handler = AddVectoredExceptionHandler(TRUE, test_raiseexception_regs_handle); + ok(!!vectored_handler, "failed.\n"); + + memcpy(code_mem, code, sizeof(code)); + func = code_mem; + + for (i = 0; i < ARRAY_SIZE(args); ++i) + args[i] = i; + + func(pRaiseException, 0, ARRAY_SIZE(args), args); + expected = 0xdeadb000; + ok(test_raiseexception_regs_context.Rbx == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rbx); + ++expected; + ok(test_raiseexception_regs_context.Rsi == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rsi); + ++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); + ++expected; + ok(test_raiseexception_regs_context.R12 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R12); + ++expected; + ok(test_raiseexception_regs_context.R13 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R13); + ++expected; + ok(test_raiseexception_regs_context.R14 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R14); + ++expected; + ok(test_raiseexception_regs_context.R15 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R15); + + RemoveVectoredExceptionHandler(vectored_handler); +} #elif defined(__arm__) #define UNW_FLAG_NHANDLER 0 @@ -10974,6 +11072,7 @@ START_TEST(exception) test_copy_context(); test_unwind_from_apc(); test_syscall_clobbered_regs(); + test_raiseexception_regs(); #elif defined(__aarch64__)

1 0

Alexandre Julliard : ntdll: Don't pass arguments on the stack for user callbacks on ARM64.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: efa99eab0bc3edbf3f23bee9da316d901f7a14cb URL: https://gitlab.winehq.org/wine/wine/-/commit/efa99eab0bc3edbf3f23bee9da316d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 11:26:22 2023 +0200 ntdll: Don't pass arguments on the stack for user callbacks on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 45 +++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 75ba53acda3..eb9fd4c8442 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1092,14 +1092,11 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context /*********************************************************************** * call_user_mode_callback */ -extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; +extern NTSTATUS call_user_mode_callback( ULONG id, void *args, ULONG len, void **ret_ptr, + ULONG *ret_len, void *func, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "stp x29, x30, [sp,#-0xc0]!\n\t" "mov x29, sp\n\t" - "mov x16, x0\n\t" /* func */ - "mov x17, x1\n\t" /* stack */ - "mov x18, x4\n\t" /* teb */ "stp x19, x20, [x29, #0x10]\n\t" "stp x21, x22, [x29, #0x20]\n\t" "stp x23, x24, [x29, #0x30]\n\t" @@ -1109,29 +1106,28 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "stp d10, d11, [x29, #0x70]\n\t" "stp d12, d13, [x29, #0x80]\n\t" "stp d14, d15, [x29, #0x90]\n\t" - "stp x2, x3, [x29, #0xa0]\n\t" /* ret_ptr, ret_len */ - "mrs x5, fpcr\n\t" - "mrs x6, fpsr\n\t" - "bfi x5, x6, #0, #32\n\t" - "ldr x6, [x18]\n\t" /* teb->Tib.ExceptionList */ - "stp x5, x6, [x29, #0xb0]\n\t" + "stp x3, x4, [x29, #0xa0]\n\t" /* ret_ptr, ret_len */ + "mov x18, x6\n\t" /* teb */ + "mrs x3, fpcr\n\t" + "mrs x4, fpsr\n\t" + "bfi x3, x4, #0, #32\n\t" + "ldr x4, [x18]\n\t" /* teb->Tib.ExceptionList */ + "stp x3, x4, [x29, #0xb0]\n\t" "ldr x7, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ - "sub x5, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ - "str x5, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "sub x3, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ + "str x3, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ "ldr x8, [x7, #0x118]\n\t" /* prev_frame->syscall_table */ - "ldp x0, x1, [x17]\n\t" /* id, args */ - "ldr x2, [x17, #0x10]\n\t" /* len */ - "mov sp, x17\n\t" - "stp x7, x8, [x5, #0x110]\n\t" /* frame->prev_frame, frame->syscall_table */ - "br x16" ) + "mov sp, x1\n\t" /* stack */ + "stp x7, x8, [x3, #0x110]\n\t" /* frame->prev_frame, frame->syscall_table */ + "br x5" ) /*********************************************************************** * user_mode_callback_return */ -extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, - NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, + NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( user_mode_callback_return, "ldr x4, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ "ldr x5, [x4, #0x110]\n\t" /* prev_frame */ @@ -1167,18 +1163,13 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void { struct syscall_frame *frame = arm64_thread_data()->syscall_frame; void *args_data = (void *)((frame->sp - len) & ~15); - ULONG_PTR *stack = args_data; if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; memcpy( args_data, args, len ); - *(--stack) = 0; - *(--stack) = len; - *(--stack) = (ULONG_PTR)args_data; - *(--stack) = id; - - return call_user_mode_callback( pKiUserCallbackDispatcher, stack, ret_ptr, ret_len, NtCurrentTeb() ); + return call_user_mode_callback( id, args_data, len, ret_ptr, ret_len, + pKiUserCallbackDispatcher, NtCurrentTeb() ); }

1 0

Alexandre Julliard : ntdll: Don't pass arguments on the stack for user callbacks on x86-64.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 50ac25554c8ecc799d5e94addb748cad503170ea URL: https://gitlab.winehq.org/wine/wine/-/commit/50ac25554c8ecc799d5e94addb748c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 12:06:56 2023 +0200 ntdll: Don't pass arguments on the stack for user callbacks on x86-64. And convert to the sysv ABI. --- dlls/ntdll/unix/signal_x86_64.c | 136 ++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 88 deletions(-)

1 0

Alexandre Julliard : ntdll: Don't pass arguments on the stack for user callbacks on i386.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: d8c39b3d5ace3a7349cb2762aad84ced5bb1563a URL: https://gitlab.winehq.org/wine/wine/-/commit/d8c39b3d5ace3a7349cb2762aad84c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 12:44:21 2023 +0200 ntdll: Don't pass arguments on the stack for user callbacks on i386. --- dlls/ntdll/unix/signal_i386.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 748828ad99e..28cd29f4960 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1574,8 +1574,8 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context /*********************************************************************** * call_user_mode_callback */ -extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; +extern NTSTATUS call_user_mode_callback( ULONG id, void *args, ULONG len, void **ret_ptr, + ULONG *ret_len, void *func, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -1588,7 +1588,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") - "movl 0x18(%ebp),%edx\n\t" /* teb */ + "movl 0x20(%ebp),%edx\n\t" /* teb */ "pushl 0(%edx)\n\t" /* teb->Tib.ExceptionList */ "subl $0x384,%esp\n\t" /* sizeof(struct syscall_frame) + ebp */ "andl $~63,%esp\n\t" @@ -1600,8 +1600,13 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movl %eax,0x38(%esp)\n\t" "movl %ecx,0x3c(%esp)\n\t" /* frame->prev_frame */ "movl %esp,0x1f8(%edx)\n\t" /* x86_thread_data()->syscall_frame */ - "movl 8(%ebp),%ecx\n\t" /* func */ - "movl 12(%ebp),%esp\n\t" /* stack */ + "movl 0x1c(%ebp),%ecx\n\t" /* func */ + "movl 0x0c(%ebp),%edx\n\t" /* args */ + "leal -4(%edx),%esp\n\t" + "pushl 0x10(%ebp)\n\t" /* len */ + "pushl %edx\n\t" /* args */ + "pushl 0x08(%ebp)\n\t" /* id */ + "pushl $0\n\t" "xorl %ebp,%ebp\n\t" "jmpl *%ecx" ) @@ -1609,8 +1614,8 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, /*********************************************************************** * user_mode_callback_return */ -extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, - NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, + NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( user_mode_callback_return, "movl 16(%esp),%edx\n" /* teb */ "movl 0x1f8(%edx),%eax\n\t" /* x86_thread_data()->syscall_frame */ @@ -1627,9 +1632,9 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, "movl 8(%esp),%edi\n\t" /* ret_len */ "movl 12(%esp),%eax\n\t" /* status */ "leal -16(%ebp),%esp\n\t" - "movl 0x10(%ebp),%ecx\n\t" /* ret_ptr */ + "movl 0x14(%ebp),%ecx\n\t" /* ret_ptr */ "movl %esi,(%ecx)\n\t" - "movl 0x14(%ebp),%ecx\n\t" /* ret_len */ + "movl 0x18(%ebp),%ecx\n\t" /* ret_len */ "movl %edi,(%ecx)\n\t" "popl 0(%edx)\n\t" /* teb->Tib.ExceptionList */ "popl %edi\n\t" @@ -1651,19 +1656,13 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void { struct syscall_frame *frame = x86_thread_data()->syscall_frame; void *args_data = (void *)((frame->esp - len) & ~15); - ULONG_PTR *stack = args_data; if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; memcpy( args_data, args, len ); - *(--stack) = 0; - *(--stack) = len; - *(--stack) = (ULONG_PTR)args_data; - *(--stack) = id; - *(--stack) = 0xdeadbabe; - - return call_user_mode_callback( pKiUserCallbackDispatcher, stack, ret_ptr, ret_len, NtCurrentTeb() ); + return call_user_mode_callback( id, args_data, len, ret_ptr, ret_len, + pKiUserCallbackDispatcher, NtCurrentTeb() ); }

1 0

Alexandre Julliard : ntdll: Don't pass arguments on the stack for user callbacks on ARM.
by Alexandre Julliard 01 Jun '23

01 Jun '23

Module: wine Branch: master Commit: 091513ffaafd3b09dccada5df2ce31406a347c22 URL: https://gitlab.winehq.org/wine/wine/-/commit/091513ffaafd3b09dccada5df2ce31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 13:26:19 2023 +0200 ntdll: Don't pass arguments on the stack for user callbacks on ARM. --- dlls/ntdll/unix/signal_arm.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index f862610497f..4021019ab43 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1152,13 +1152,14 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context /*********************************************************************** * call_user_mode_callback */ -extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, - ULONG *ret_len, TEB *teb ) DECLSPEC_HIDDEN; +extern NTSTATUS call_user_mode_callback( ULONG id, void *args, ULONG len, void **ret_ptr, + ULONG *ret_len, void *func, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_user_mode_callback, - "push {r2-r12,lr}\n\t" + "push {r4-r12,lr}\n\t" + "ldr ip, [sp, #0x2c]\n\t" /* func */ "ldr r4, [sp, #0x30]\n\t" /* teb */ "ldr r5, [r4]\n\t" /* teb->Tib.ExceptionList */ - "str r5, [sp, #0x28]\n\t" + "push {r3, r5}\n\t" #ifndef __SOFTFP__ "sub sp, sp, #0x90\n\t" "mov r5, sp\n\t" @@ -1172,17 +1173,15 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "str sp, [r4, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "ldr r6, [r5, #0x50]\n\t" /* prev_frame->syscall_table */ "str r6, [sp, #0x50]\n\t" /* frame->syscall_table */ - "mov ip, r0\n\t" "mov sp, r1\n\t" - "pop {r0-r3}\n\t" "bx ip" ) /*********************************************************************** * user_mode_callback_return */ -extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, - NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, + NTSTATUS status, TEB *teb ) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( user_mode_callback_return, "ldr r4, [r3, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "ldr r5, [r4, #0x4c]\n\t" /* frame->prev_frame */ @@ -1195,9 +1194,9 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, "add r5, r5, #0x90\n\t" #endif "mov sp, r5\n\t" - "ldr r5, [sp, #0x28]\n\t" - "str r5, [r3]\n\t" /* teb->Tib.ExceptionList */ - "pop {r5, r6}\n\t" /* ret_ptr, ret_len */ + "pop {r5, r7}\n\t" + "ldr r6, [sp, #0x28]\n\t" /* ret_len */ + "str r7, [r3]\n\t" /* teb->Tib.ExceptionList */ "str r0, [r5]\n\t" /* ret_ptr */ "str r1, [r6]\n\t" /* ret_len */ "mov r0, r2\n\t" /* status */ @@ -1211,18 +1210,13 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void { struct syscall_frame *frame = arm_thread_data()->syscall_frame; void *args_data = (void *)((frame->sp - len) & ~15); - ULONG_PTR *stack = args_data; if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; memcpy( args_data, args, len ); - *(--stack) = 0; - *(--stack) = len; - *(--stack) = (ULONG_PTR)args_data; - *(--stack) = id; - - return call_user_mode_callback( pKiUserCallbackDispatcher, stack, ret_ptr, ret_len, NtCurrentTeb() ); + return call_user_mode_callback( id, args_data, len, ret_ptr, ret_len, + pKiUserCallbackDispatcher, NtCurrentTeb() ); }

1 0