- Wine-Commits - list.winehq.org

Torge Matthies : kernelbase: Fix WaitForThreadpoolIoCallbacks spec entry.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 2db94ca8f98c9e760e0236fc36cf84af6cfc6984 URL: https://gitlab.winehq.org/wine/wine/-/commit/2db94ca8f98c9e760e0236fc36cf84… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Thu Feb 23 19:49:27 2023 +0100 kernelbase: Fix WaitForThreadpoolIoCallbacks spec entry. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 80cc163468c..e3a0ad257f2 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1734,7 +1734,7 @@ @ stdcall WaitForMultipleObjectsEx(long ptr long long long) @ stdcall WaitForSingleObject(long long) @ stdcall WaitForSingleObjectEx(long long long) -@ stdcall WaitForThreadpoolIoCallbacks(ptr) ntdll.TpWaitForIoCompletion +@ stdcall WaitForThreadpoolIoCallbacks(ptr long) ntdll.TpWaitForIoCompletion @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) ntdll.TpWaitForTimer @ stdcall WaitForThreadpoolWaitCallbacks(ptr long) ntdll.TpWaitForWait @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) ntdll.TpWaitForWork

1 0

Torge Matthies : kernel32: Fix WaitForThreadpoolIoCallbacks spec entry.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: wine Branch: master Commit: 78ce8e0018c8a5c806c596b10158343f705f4bf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/78ce8e0018c8a5c806c596b1015834… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Thu Feb 23 19:49:15 2023 +0100 kernel32: Fix WaitForThreadpoolIoCallbacks spec entry. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8068e45e5e5..d6b0eb62a69 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1603,7 +1603,7 @@ @ stdcall -import WaitForMultipleObjectsEx(long ptr long long long) @ stdcall -import WaitForSingleObject(long long) @ stdcall -import WaitForSingleObjectEx(long long long) -@ stdcall WaitForThreadpoolIoCallbacks(ptr) NTDLL.TpWaitForIoCompletion +@ stdcall WaitForThreadpoolIoCallbacks(ptr long) NTDLL.TpWaitForIoCompletion @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) NTDLL.TpWaitForTimer @ stdcall WaitForThreadpoolWaitCallbacks(ptr long) NTDLL.TpWaitForWait @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) NTDLL.TpWaitForWork

1 0

Giovanni Mascellani : vkd3d-shader: Do not pass client-given strings as printf()-style format strings.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: vkd3d Branch: master Commit: a1c6bb85ade1da5cae3ba2f9717f882b0c9bf611 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a1c6bb85ade1da5cae3ba2f9717f8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 23 16:21:55 2023 +0100 vkd3d-shader: Do not pass client-given strings as printf()-style format strings. --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f0cfee47..beee1548 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1767,7 +1767,7 @@ static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder, const rb_init(&builder->declarations, vkd3d_spirv_declaration_compare); builder->main_function_id = vkd3d_spirv_alloc_id(builder); - vkd3d_spirv_build_op_name(builder, builder->main_function_id, entry_point); + vkd3d_spirv_build_op_name(builder, builder->main_function_id, "%s", entry_point); } static void vkd3d_spirv_builder_begin_main_function(struct vkd3d_spirv_builder *builder)

1 0

Francois Gouget : mscoree/tests: Trace the error when a Windows API fails.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: c898503e949ea3b2c478bfb4ccbf6a1d9400b08f URL: https://gitlab.winehq.org/wine/wine/-/commit/c898503e949ea3b2c478bfb4ccbf6a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 23 03:07:09 2023 +0100 mscoree/tests: Trace the error when a Windows API fails. --- dlls/mscoree/tests/comtest.c | 2 +- dlls/mscoree/tests/mscoree.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index db6acac1e9e..2881fdb8943 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -102,7 +102,7 @@ static BOOL compile_cs_to_dll(char *source_path, char *dest_path) ok(ret, "Compilation failed\n"); ret = MoveFileA(path_temp, dest_path); - ok(ret, "Moving temporary file failed\n"); + ok(ret, "Could not move %s to %s: %lu\n", path_temp, dest_path, GetLastError()); return ret; } diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 7da40d92887..bb6545b8a21 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -148,7 +148,7 @@ static BOOL runtime_is_usable(void) si.cb = sizeof(si); ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "CreateProcessA failed\n"); + ok(ret, "Could not create process: %lu\n", GetLastError()); if (!ret) return FALSE; @@ -159,7 +159,7 @@ static BOOL runtime_is_usable(void) ret = GetExitCodeProcess(pi.hProcess, &exitcode); CloseHandle(pi.hProcess); - ok(ret, "GetExitCodeProcess failed\n"); + ok(ret, "GetExitCodeProcess failed: %lu\n", GetLastError()); if (!ret || exitcode != 0) { @@ -424,7 +424,7 @@ static void create_xml_file(LPCWSTR filename) DWORD dwNumberOfBytesWritten; HANDLE hfile = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(hfile != INVALID_HANDLE_VALUE, "File creation failed\n"); + ok(hfile != INVALID_HANDLE_VALUE, "Could not open %s for writing: %lu\n", wine_dbgstr_w(filename), GetLastError()); WriteFile(hfile, xmldata, sizeof(xmldata) - 1, &dwNumberOfBytesWritten, NULL); CloseHandle(hfile); }

1 0

Sven Baars : bcrypt: Factor out wow64 padding conversion.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: a554ff21d442fa77a0cc10d69f54d70a6d822b1c URL: https://gitlab.winehq.org/wine/wine/-/commit/a554ff21d442fa77a0cc10d69f54d7… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Feb 24 19:07:12 2023 +0100 bcrypt: Factor out wow64 padding conversion. --- dlls/bcrypt/gnutls.c | 52 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 89e5c91776d..a84c2a33ba5 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2302,6 +2302,34 @@ struct key32 } u; }; +union padding +{ + BCRYPT_PKCS1_PADDING_INFO pkcs1; +}; + +union padding32 +{ + struct + { + PTR32 pszAlgId; + } pkcs1; +}; + +static union padding *get_padding( union padding32 *padding32, union padding *padding, ULONG flags) +{ + if (!padding32) return NULL; + + switch (flags) + { + case BCRYPT_PAD_PKCS1: + padding->pkcs1.pszAlgId = ULongToPtr( padding32->pkcs1.pszAlgId ); + return padding; + default: + break; + } + return NULL; +} + static struct key *get_symmetric_key( struct key32 *key32, struct key *key ) { key->hdr = key32->hdr; @@ -2576,12 +2604,12 @@ static NTSTATUS wow64_key_asymmetric_sign( void *args ) NTSTATUS ret; struct key key; - BCRYPT_PKCS1_PADDING_INFO padding; + union padding padding; struct key32 *key32 = ULongToPtr( params32->key ); struct key_asymmetric_sign_params params = { get_asymmetric_key( key32, &key ), - NULL, /* padding */ + get_padding(ULongToPtr( params32->padding ), &padding, params32->flags), ULongToPtr(params32->input), params32->input_len, ULongToPtr(params32->output), @@ -2590,14 +2618,6 @@ static NTSTATUS wow64_key_asymmetric_sign( void *args ) params32->flags }; - if (params32->flags & BCRYPT_PAD_PKCS1) - { - PTR32 *info = ULongToPtr( params32->padding ); - if (!info) return STATUS_INVALID_PARAMETER; - padding.pszAlgId = ULongToPtr( *info ); - params.padding = &padding; - } - ret = key_asymmetric_sign( &params ); put_asymmetric_key32( &key, key32 ); return ret; @@ -2618,12 +2638,12 @@ static NTSTATUS wow64_key_asymmetric_verify( void *args ) NTSTATUS ret; struct key key; - BCRYPT_PKCS1_PADDING_INFO padding; + union padding padding; struct key32 *key32 = ULongToPtr( params32->key ); struct key_asymmetric_verify_params params = { get_asymmetric_key( key32, &key ), - NULL, /* padding */ + get_padding(ULongToPtr( params32->padding ), &padding, params32->flags), ULongToPtr(params32->hash), params32->hash_len, ULongToPtr(params32->signature), @@ -2631,14 +2651,6 @@ static NTSTATUS wow64_key_asymmetric_verify( void *args ) params32->flags }; - if (params32->flags & BCRYPT_PAD_PKCS1) - { - PTR32 *info = ULongToPtr( params32->padding ); - if (!info) return STATUS_INVALID_PARAMETER; - padding.pszAlgId = ULongToPtr( *info ); - params.padding = &padding; - } - ret = key_asymmetric_verify( &params ); put_asymmetric_key32( &key, key32 ); return ret;

1 0

Sven Baars : bcrypt: Add wow64 support for PSS padding.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: 3fb2a5d55e948670222170075f0054a2aabf8d7e URL: https://gitlab.winehq.org/wine/wine/-/commit/3fb2a5d55e948670222170075f0054… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Feb 24 19:12:16 2023 +0100 bcrypt: Add wow64 support for PSS padding. --- dlls/bcrypt/gnutls.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index a84c2a33ba5..3c64a3643ef 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2305,6 +2305,7 @@ struct key32 union padding { BCRYPT_PKCS1_PADDING_INFO pkcs1; + BCRYPT_PSS_PADDING_INFO pss; }; union padding32 @@ -2313,6 +2314,11 @@ union padding32 { PTR32 pszAlgId; } pkcs1; + struct + { + PTR32 pszAlgId; + ULONG cbSalt; + } pss; }; static union padding *get_padding( union padding32 *padding32, union padding *padding, ULONG flags) @@ -2324,6 +2330,10 @@ static union padding *get_padding( union padding32 *padding32, union padding *pa case BCRYPT_PAD_PKCS1: padding->pkcs1.pszAlgId = ULongToPtr( padding32->pkcs1.pszAlgId ); return padding; + case BCRYPT_PAD_PSS: + padding->pss.pszAlgId = ULongToPtr( padding32->pss.pszAlgId ); + padding->pss.cbSalt = padding32->pss.cbSalt; + return padding; default: break; }

1 0

Francois Gouget : winmm/tests: Ignore spurious WM_DWMCOLORIZATIONCOLORCHANGED messages.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: 632c8cfd2b8b1f9cb4a65e428c49202f4a736167 URL: https://gitlab.winehq.org/wine/wine/-/commit/632c8cfd2b8b1f9cb4a65e428c4920… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 22 15:57:22 2023 +0100 winmm/tests: Ignore spurious WM_DWMCOLORIZATIONCOLORCHANGED messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54557 --- dlls/winmm/tests/midi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index cf58e1e955a..d6f54e75f23 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -39,8 +39,9 @@ extern const char* mmsys_error(MMRESULT error); /* from wave.c */ static BOOL spurious_message(LPMSG msg) { - /* WM_DEVICECHANGE 0x0219 appears randomly */ - if(msg->message == WM_DEVICECHANGE) { + /* These messages appear randomly */ + if(msg->message == WM_DEVICECHANGE || + msg->message == WM_DWMCOLORIZATIONCOLORCHANGED) { trace("skipping spurious message %04x\n", msg->message); return TRUE; }

1 0

Marcus Meissner : user32/tests: Fix size passed to ToUnicode.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: aa1cc9ad38df7fe6e3d2dc46f84e4955f20ea802 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa1cc9ad38df7fe6e3d2dc46f84e49… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Feb 24 11:31:58 2023 +0100 user32/tests: Fix size passed to ToUnicode. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/user32/tests/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index ee39b11fc12..be41078bf29 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3186,7 +3186,7 @@ static void test_ToAscii(void) ok(character == '\r', "ToAscii for Return was %i (expected 13)\n", character); wstr[0] = 0; - ret = ToUnicode('A', SC_A, state, wstr, sizeof(wstr), 0); + ret = ToUnicode('A', SC_A, state, wstr, ARRAY_SIZE(wstr), 0); ok(ret == 1, "ToUnicode(A) returned %i, expected 1\n", ret); str[0] = '\0';

1 0

Alexandre Julliard : ntdll: Implement getting/setting the WoW context on ARM64.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: 881defc4b2b8a57f31c9cede0cc27b1f62336a91 URL: https://gitlab.winehq.org/wine/wine/-/commit/881defc4b2b8a57f31c9cede0cc27b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 11:46:11 2023 +0100 ntdll: Implement getting/setting the WoW context on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 213 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 209 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index ac16ae065b1..3855afc34f4 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -690,8 +690,9 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) */ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) { - BOOL self; + BOOL self = (handle == GetCurrentThread()); USHORT machine; + void *frame; switch (size) { @@ -699,7 +700,112 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) case sizeof(ARM_CONTEXT): machine = IMAGE_FILE_MACHINE_ARMNT; break; default: return STATUS_INFO_LENGTH_MISMATCH; } - return set_thread_context( handle, ctx, &self, machine ); + + if (!self) + { + NTSTATUS ret = set_thread_context( handle, ctx, &self, machine ); + if (ret || !self) return ret; + } + + if (!(frame = get_cpu_area( machine ))) return STATUS_INVALID_PARAMETER; + + switch (machine) + { + case IMAGE_FILE_MACHINE_I386: + { + I386_CONTEXT *wow_frame = frame; + const I386_CONTEXT *context = ctx; + DWORD flags = context->ContextFlags & ~CONTEXT_i386; + + if (flags & CONTEXT_I386_INTEGER) + { + wow_frame->Eax = context->Eax; + wow_frame->Ebx = context->Ebx; + wow_frame->Ecx = context->Ecx; + wow_frame->Edx = context->Edx; + wow_frame->Esi = context->Esi; + wow_frame->Edi = context->Edi; + } + if (flags & CONTEXT_I386_CONTROL) + { + WOW64_CPURESERVED *cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED]; + + wow_frame->Esp = context->Esp; + wow_frame->Ebp = context->Ebp; + wow_frame->Eip = context->Eip; + wow_frame->EFlags = context->EFlags; + wow_frame->SegCs = context->SegCs; + wow_frame->SegSs = context->SegSs; + cpu->Flags |= WOW64_CPURESERVED_FLAG_RESET_STATE; + } + if (flags & CONTEXT_I386_SEGMENTS) + { + wow_frame->SegDs = context->SegDs; + wow_frame->SegEs = context->SegEs; + wow_frame->SegFs = context->SegFs; + wow_frame->SegGs = context->SegGs; + } + if (flags & CONTEXT_I386_DEBUG_REGISTERS) + { + wow_frame->Dr0 = context->Dr0; + wow_frame->Dr1 = context->Dr1; + wow_frame->Dr2 = context->Dr2; + wow_frame->Dr3 = context->Dr3; + wow_frame->Dr6 = context->Dr6; + wow_frame->Dr7 = context->Dr7; + } + if (flags & CONTEXT_I386_EXTENDED_REGISTERS) + { + memcpy( &wow_frame->ExtendedRegisters, context->ExtendedRegisters, sizeof(context->ExtendedRegisters) ); + } + if (flags & CONTEXT_I386_FLOATING_POINT) + { + memcpy( &wow_frame->FloatSave, &context->FloatSave, sizeof(context->FloatSave) ); + } + /* FIXME: CONTEXT_I386_XSTATE */ + break; + } + + case IMAGE_FILE_MACHINE_ARMNT: + { + ARM_CONTEXT *wow_frame = frame; + const ARM_CONTEXT *context = ctx; + DWORD flags = context->ContextFlags & ~CONTEXT_ARM; + + if (flags & CONTEXT_INTEGER) + { + wow_frame->R0 = context->R0; + wow_frame->R1 = context->R1; + wow_frame->R2 = context->R2; + wow_frame->R3 = context->R3; + wow_frame->R4 = context->R4; + wow_frame->R5 = context->R5; + wow_frame->R6 = context->R6; + wow_frame->R7 = context->R7; + wow_frame->R8 = context->R8; + wow_frame->R9 = context->R9; + wow_frame->R10 = context->R10; + wow_frame->R11 = context->R11; + wow_frame->R12 = context->R12; + } + if (flags & CONTEXT_CONTROL) + { + wow_frame->Sp = context->Sp; + wow_frame->Lr = context->Lr; + wow_frame->Pc = context->Pc & ~1; + wow_frame->Cpsr = context->Cpsr; + if (context->Cpsr & 0x20) wow_frame->Pc |= 1; /* thumb */ + } + if (flags & CONTEXT_FLOATING_POINT) + { + wow_frame->Fpscr = context->Fpscr; + memcpy( wow_frame->u.D, context->u.D, sizeof(context->u.D) ); + } + break; + } + + } + return STATUS_SUCCESS; } @@ -708,8 +814,9 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) */ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) { - BOOL self; + BOOL self = (handle == GetCurrentThread()); USHORT machine; + void *frame; switch (size) { @@ -717,7 +824,105 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) case sizeof(ARM_CONTEXT): machine = IMAGE_FILE_MACHINE_ARMNT; break; default: return STATUS_INFO_LENGTH_MISMATCH; } - return get_thread_context( handle, ctx, &self, machine ); + + if (!self) + { + NTSTATUS ret = get_thread_context( handle, ctx, &self, machine ); + if (ret || !self) return ret; + } + + if (!(frame = get_cpu_area( machine ))) return STATUS_INVALID_PARAMETER; + + switch (machine) + { + case IMAGE_FILE_MACHINE_I386: + { + I386_CONTEXT *wow_frame = frame, *context = ctx; + DWORD needed_flags = context->ContextFlags & ~CONTEXT_i386; + + if (needed_flags & CONTEXT_I386_INTEGER) + { + context->Eax = wow_frame->Eax; + context->Ebx = wow_frame->Ebx; + context->Ecx = wow_frame->Ecx; + context->Edx = wow_frame->Edx; + context->Esi = wow_frame->Esi; + context->Edi = wow_frame->Edi; + context->ContextFlags |= CONTEXT_I386_INTEGER; + } + if (needed_flags & CONTEXT_I386_CONTROL) + { + context->Esp = wow_frame->Esp; + context->Ebp = wow_frame->Ebp; + context->Eip = wow_frame->Eip; + context->EFlags = wow_frame->EFlags; + context->SegCs = wow_frame->SegCs; + context->SegSs = wow_frame->SegSs; + context->ContextFlags |= CONTEXT_I386_CONTROL; + } + if (needed_flags & CONTEXT_I386_SEGMENTS) + { + context->SegDs = wow_frame->SegDs; + context->SegEs = wow_frame->SegEs; + context->SegFs = wow_frame->SegFs; + context->SegGs = wow_frame->SegGs; + context->ContextFlags |= CONTEXT_I386_SEGMENTS; + } + if (needed_flags & CONTEXT_I386_EXTENDED_REGISTERS) + { + memcpy( context->ExtendedRegisters, &wow_frame->ExtendedRegisters, sizeof(context->ExtendedRegisters) ); + context->ContextFlags |= CONTEXT_I386_EXTENDED_REGISTERS; + } + if (needed_flags & CONTEXT_I386_FLOATING_POINT) + { + memcpy( &context->FloatSave, &wow_frame->FloatSave, sizeof(context->FloatSave) ); + context->ContextFlags |= CONTEXT_I386_FLOATING_POINT; + } + /* FIXME: CONTEXT_I386_XSTATE */ + break; + } + + case IMAGE_FILE_MACHINE_ARMNT: + { + ARM_CONTEXT *wow_frame = frame, *context = ctx; + DWORD needed_flags = context->ContextFlags & ~CONTEXT_ARM; + + if (needed_flags & CONTEXT_INTEGER) + { + context->R0 = wow_frame->R0; + context->R1 = wow_frame->R1; + context->R2 = wow_frame->R2; + context->R3 = wow_frame->R3; + context->R4 = wow_frame->R4; + context->R5 = wow_frame->R5; + context->R6 = wow_frame->R6; + context->R7 = wow_frame->R7; + context->R8 = wow_frame->R8; + context->R9 = wow_frame->R9; + context->R10 = wow_frame->R10; + context->R11 = wow_frame->R11; + context->R12 = wow_frame->R12; + context->ContextFlags |= CONTEXT_INTEGER; + } + if (needed_flags & CONTEXT_CONTROL) + { + context->Sp = wow_frame->Sp; + context->Lr = wow_frame->Lr; + context->Pc = wow_frame->Pc; + context->Cpsr = wow_frame->Cpsr; + context->ContextFlags |= CONTEXT_CONTROL; + } + if (needed_flags & CONTEXT_FLOATING_POINT) + { + context->Fpscr = wow_frame->Fpscr; + memcpy( context->u.D, wow_frame->u.D, sizeof(wow_frame->u.D) ); + context->ContextFlags |= CONTEXT_FLOATING_POINT; + } + break; + } + + } + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : ntdll: Build an initial WoW context on ARM64.
by Alexandre Julliard Feb. 24, 2023

Feb. 24, 2023

Module: wine Branch: master Commit: ecb80c6e794ebd25a4384688f7cdd1e2c19ed469 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecb80c6e794ebd25a4384688f7cdd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 11:45:45 2023 +0100 ntdll: Build an initial WoW context on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index d94b335bc8d..ac16ae065b1 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1390,6 +1390,8 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B struct arm64_thread_data *thread_data = (struct arm64_thread_data *)&teb->GdiTebBatch; struct syscall_frame *frame = thread_data->syscall_frame; CONTEXT *ctx, context = { CONTEXT_ALL }; + I386_CONTEXT *i386_context; + ARM_CONTEXT *arm_context; context.u.s.X0 = (DWORD64)entry; context.u.s.X1 = (DWORD64)arg; @@ -1397,6 +1399,33 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.Sp = (DWORD64)teb->Tib.StackBase; context.Pc = (DWORD64)pRtlUserThreadStart; + if ((i386_context = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) + { + i386_context->ContextFlags = CONTEXT_I386_ALL; + i386_context->Eax = (ULONG_PTR)entry; + i386_context->Ebx = (arg == peb ? get_wow_teb( teb )->Peb : (ULONG_PTR)arg); + i386_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; + i386_context->Eip = pLdrSystemDllInitBlock->pRtlUserThreadStart; + i386_context->SegCs = 0x23; + i386_context->SegDs = 0x2b; + i386_context->SegEs = 0x2b; + i386_context->SegFs = 0x53; + i386_context->SegGs = 0x2b; + i386_context->SegSs = 0x2b; + i386_context->EFlags = 0x202; + i386_context->FloatSave.ControlWord = 0x27f; + ((XSAVE_FORMAT *)i386_context->ExtendedRegisters)->MxCsr = 0x1f80; + } + else if ((arm_context = get_cpu_area( IMAGE_FILE_MACHINE_ARMNT ))) + { + arm_context->ContextFlags = CONTEXT_ARM_ALL; + arm_context->R0 = (ULONG_PTR)entry; + arm_context->R1 = (arg == peb ? get_wow_teb( teb )->Peb : (ULONG_PTR)arg); + arm_context->Sp = get_wow_teb( teb )->Tib.StackBase; + arm_context->Pc = pLdrSystemDllInitBlock->pRtlUserThreadStart; + if (arm_context->Pc & 1) arm_context->Cpsr |= 0x20; /* thumb mode */ + } + if (suspend) wait_suspend( &context ); ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1;

1 0