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

Michael Stefaniuc : wmvcore: Remove superfluous casts to self.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 19cc1dbe56a3231577df110a0d9231ce501d7321 URL: https://gitlab.winehq.org/wine/wine/-/commit/19cc1dbe56a3231577df110a0d9231… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 19 18:57:09 2023 +0200 wmvcore: Remove superfluous casts to self. --- dlls/wmvcore/async_reader.c | 2 +- dlls/wmvcore/tests/wmvcore.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wmvcore/async_reader.c b/dlls/wmvcore/async_reader.c index 47de592c95c..95f617b5cf8 100644 --- a/dlls/wmvcore/async_reader.c +++ b/dlls/wmvcore/async_reader.c @@ -1932,7 +1932,7 @@ static HRESULT WINAPI async_reader_create(IWMReader **reader) list_init(&object->async_ops); TRACE("Created async reader %p.\n", object); - *reader = (IWMReader *)&object->IWMReader_iface; + *reader = &object->IWMReader_iface; return S_OK; failed: diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 9f755859481..6071ac25ad7 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1920,7 +1920,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta callback->callback_tid = GetCurrentThreadId(); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_started, 100); ok(!ret, "Wait timed out.\n"); callback->end_of_streaming_count = callback->eof_count = callback->sample_count = 0; @@ -1933,7 +1933,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_stopped, 100); ok(!ret, "Wait timed out.\n"); SetEvent(callback->got_stopped); @@ -1942,7 +1942,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta case WMT_CLOSED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ++callback->closed_count; break; @@ -1950,7 +1950,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ++callback->end_of_streaming_count; break; @@ -1958,7 +1958,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->sample_count == 0, "Got %u samples.\n", callback->sample_count); else @@ -1976,7 +1976,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(callback->callback_tid == GetCurrentThreadId(), "got wrong thread\n"); ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); ok(*(QWORD *)value == 3000, "Got value %#lx.\n", *(DWORD *)value); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->sample_count == 0, "Got %u samples.\n", callback->sample_count); else @@ -2082,7 +2082,7 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, if (stream) ok(stream->input_tid != GetCurrentThreadId(), "got wrong thread\n"); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); check_async_sample(callback, sample); @@ -2166,7 +2166,7 @@ static HRESULT WINAPI callback_advanced_OnStreamSample(IWMReaderCallbackAdvanced if (stream) ok(stream->input_tid != GetCurrentThreadId(), "got wrong thread\n"); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); check_async_sample(callback, sample); @@ -2191,7 +2191,7 @@ static HRESULT WINAPI callback_advanced_OnTime(IWMReaderCallbackAdvanced *iface, todo_wine_if(time % 10000) ok(time == callback->expect_time, "Got time %I64u.\n", time); - ok(context == (void *)callback->expect_context, "Got unexpected context %p.\n", context); + ok(context == callback->expect_context, "Got unexpected context %p.\n", context); ret = WaitForSingleObject(callback->expect_ontime, 100); ok(!ret, "Wait timed out.\n"); SetEvent(callback->got_ontime);

1 0

Paul Gofman : kernelbase: Don't modify non-volatile regs in RaiseException() on x64.
by Alexandre Julliard June 1, 2023

June 1, 2023

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

Alistair Leslie-Hughes : xactengine: IXACT3EngineImpl_CreateSoundBank isn't a stub.
by Alexandre Julliard June 1, 2023

June 1, 2023

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 1, 2023

June 1, 2023

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 June 1, 2023

June 1, 2023

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 June 1, 2023

June 1, 2023

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

Alexandre Julliard : ntdll: Don't use WINAPI for KeUserModeCallback().
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 231f1854f5e7b91e500c077d9a6be899317bb9f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/231f1854f5e7b91e500c077d9a6be8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 13:59:14 2023 +0200 ntdll: Don't use WINAPI for KeUserModeCallback(). --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- include/wine/unixlib.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 4021019ab43..28cb2222809 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1206,7 +1206,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, /*********************************************************************** * KeUserModeCallback */ -NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) +NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { struct syscall_frame *frame = arm_thread_data()->syscall_frame; void *args_data = (void *)((frame->sp - len) & ~15); diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index eb9fd4c8442..f553aac1993 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1159,7 +1159,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, /*********************************************************************** * KeUserModeCallback */ -NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) +NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { struct syscall_frame *frame = arm64_thread_data()->syscall_frame; void *args_data = (void *)((frame->sp - len) & ~15); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 28cd29f4960..293b8689c06 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1652,7 +1652,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, /*********************************************************************** * KeUserModeCallback */ -NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) +NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { struct syscall_frame *frame = x86_thread_data()->syscall_frame; void *args_data = (void *)((frame->esp - len) & ~15); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 7ec519a6efd..508a3a5b323 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1668,7 +1668,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, /*********************************************************************** * KeUserModeCallback */ -NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) +NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { struct syscall_frame *frame = amd64_thread_data()->syscall_frame; void *args_data = (void *)((frame->rsp - len) & ~15); diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index f8360f1549e..2513edfd5ed 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -81,7 +81,7 @@ extern void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); } \ } while (0); -NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ); +NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ); /* wide char string functions */

1 0

Alexandre Julliard : ntdll: Store the PE function pointers as simple void pointers.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 1aa2f0d1281334b812d0c78c79ed430b3c15d266 URL: https://gitlab.winehq.org/wine/wine/-/commit/1aa2f0d1281334b812d0c78c79ed43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 17:23:03 2023 +0200 ntdll: Store the PE function pointers as simple void pointers. Their prototypes are not meaningful on the Unix side. --- dlls/ntdll/unix/loader.c | 16 ++++++++-------- dlls/ntdll/unix/unix_private.h | 17 ++++++++--------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5b8b6962b4a..4d855a18cff 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -104,14 +104,14 @@ static const char so_dir[] = "/aarch64-unix"; static const char so_dir[] = ""; #endif -void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; -NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; -NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; -void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; -void (WINAPI *pKiUserCallbackDispatcher)(ULONG,void*,ULONG) = NULL; -void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NULL; -void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; -void (WINAPI *p__wine_ctrl_routine)(void*); +void *pDbgUiRemoteBreakin = NULL; +void *pKiRaiseUserExceptionDispatcher = NULL; +void *pKiUserExceptionDispatcher = NULL; +void *pKiUserApcDispatcher = NULL; +void *pKiUserCallbackDispatcher = NULL; +void *pLdrInitializeThunk = NULL; +void *pRtlUserThreadStart = NULL; +void *p__wine_ctrl_routine = NULL; SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; static void *p__wine_syscall_dispatcher; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 7fd536db909..a9a829a1685 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -121,16 +121,15 @@ static const LONG teb_offset = 0x2000; #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) /* callbacks to PE ntdll from the Unix side */ -extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; -extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; -extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; -extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; -extern void (WINAPI *pKiUserCallbackDispatcher)(ULONG,void*,ULONG) DECLSPEC_HIDDEN; -extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; -extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; -extern void (WINAPI *p__wine_ctrl_routine)(void *) DECLSPEC_HIDDEN; +extern void *pDbgUiRemoteBreakin DECLSPEC_HIDDEN; +extern void *pKiRaiseUserExceptionDispatcher DECLSPEC_HIDDEN; +extern void *pKiUserExceptionDispatcher DECLSPEC_HIDDEN; +extern void *pKiUserApcDispatcher DECLSPEC_HIDDEN; +extern void *pKiUserCallbackDispatcher DECLSPEC_HIDDEN; +extern void *pLdrInitializeThunk DECLSPEC_HIDDEN; +extern void *pRtlUserThreadStart DECLSPEC_HIDDEN; +extern void *p__wine_ctrl_routine DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; -extern LONGLONG CDECL fast_RtlGetSystemTimePrecise(void) DECLSPEC_HIDDEN; struct _FILE_FS_DEVICE_INFORMATION;

1 0

Alexandre Julliard : include: Only declare __wine_unix_call() on the PE side.
by Alexandre Julliard June 1, 2023

June 1, 2023

Module: wine Branch: master Commit: 7d279bcd3b86bfc18d9a10313e4504ad3a973383 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d279bcd3b86bfc18d9a10313e4504… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 20:56:35 2023 +0200 include: Only declare __wine_unix_call() on the PE side. --- include/wine/unixlib.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 2513edfd5ed..aa97e7d0843 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -21,9 +21,9 @@ #ifndef __WINE_WINE_UNIXLIB_H #define __WINE_WINE_UNIXLIB_H -typedef UINT64 unixlib_handle_t; +#include "winternl.h" -extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); +typedef UINT64 unixlib_handle_t; #ifdef WINE_UNIX_LIB @@ -267,6 +267,7 @@ static inline ULONG ntdll_wcstoul( const WCHAR *s, WCHAR **end, int base ) #else /* WINE_UNIX_LIB */ +extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); extern unixlib_handle_t __wine_unixlib_handle DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *__wine_unix_call_dispatcher)( unixlib_handle_t, unsigned int, void * ) DECLSPEC_HIDDEN; extern NTSTATUS WINAPI __wine_init_unix_call(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Don't pass arguments on the stack for user callbacks on i386.
by Alexandre Julliard June 1, 2023

June 1, 2023

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