February 2023 - Wine-commits

Eric Pouech : dbghelp: Unload overlapping modules in SymLoadModule*().
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 32bc569520d2761a40a88d65d9a943d7292bcdf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/32bc569520d2761a40a88d65d9a943… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 16 10:49:01 2023 +0100 dbghelp: Unload overlapping modules in SymLoadModule*(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/module.c | 20 +++++++------------- dlls/dbghelp/tests/dbghelp.c | 4 ---- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index b6f36b1f28a..ad8ec22fe32 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -992,17 +992,10 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam } if (altmodule) { - /* we have a conflict as the new module cannot be found by its base address - * we need to get rid of one on the two modules + /* We have a conflict as the new module cannot be found by its base address + * (it's hidden by altmodule). + * We need to decide which one the two modules we need to get rid of. */ - if (lstrcmpW(module->modulename, altmodule->modulename) != 0) - { - /* module overlaps an existing but different module... unload new module and return error */ - WARN("%ls overlaps %ls\n", module->modulename, altmodule->modulename); - module_remove(pcs, module); - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } /* loading same module at same address... don't change anything */ if (module->module.BaseOfImage == altmodule->module.BaseOfImage) { @@ -1010,9 +1003,10 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam SetLastError(ERROR_SUCCESS); return 0; } - /* replace old module with new one, which will look like a shift of base address */ - WARN("Shift module %ls from %I64x to %I64x\n", - module->modulename, altmodule->module.BaseOfImage, module->module.BaseOfImage); + /* replace old module with new one */ + WARN("Replace module %ls at %I64x by module %ls at %I64x\n", + altmodule->module.ImageName, altmodule->module.BaseOfImage, + module->module.ImageName, module->module.BaseOfImage); module_remove(pcs, altmodule); } diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 6b7c6b8d5b8..83805f3ed10 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -456,7 +456,6 @@ static void test_modules_overlap(void) } else { - todo_wine_if(i == 6 || i == 7) ok(base == tests[i].input.base, "SymLoadModuleEx failed: %lu\n", GetLastError()); } for (j = 0; j < ARRAY_SIZE(tests[i].outputs); j++) @@ -471,13 +470,10 @@ static void test_modules_overlap(void) break; } ok(nth.index == -1, "Expecting more modules\n"); - todo_wine_if(i == 6 || i == 7) ok(nth.module.BaseOfImage == tests[i].outputs[j].base, "Wrong base\n"); if (!nth.will_fail) { - todo_wine_if(i == 7) ok(nth.module.ImageSize == tests[i].outputs[j].size, "Wrong size\n"); - todo_wine_if(i == 6 || i == 7) ok(!strcasecmp(nth.module.ModuleName, tests[i].outputs[j].name), "Wrong name\n"); } }

1 0

Francois Gouget : winetest: Trace the keyboard layout.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: dfcc45cc173f9fe5a25055790660d6378cd444f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfcc45cc173f9fe5a25055790660d6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 15 03:59:42 2023 +0100 winetest: Trace the keyboard layout. It is important for the input tests so add it to the global locale information. --- programs/winetest/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 18fa25db101..a939034e8b9 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -583,6 +583,7 @@ static void print_language(void) xprintf (" UserDefaultUILanguage=%04x\n", pGetUserDefaultUILanguage()); if (pGetThreadUILanguage) xprintf (" ThreadUILanguage=%04x\n", pGetThreadUILanguage()); + xprintf (" KeyboardLayout=%p\n", GetKeyboardLayout(0)); xprintf (" Country=%d\n", GetUserGeoID(GEOCLASS_NATION)); xprintf (" ACP=%d\n", GetACP()); }

1 0

Francois Gouget : user32/tests: Fix the ToAscii(A) test on Hindi + UTF-8.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: df811f91cc2821dd14fa1b72d4e474fb4720624e URL: https://gitlab.winehq.org/wine/wine/-/commit/df811f91cc2821dd14fa1b72d4e474… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 15 04:18:59 2023 +0100 user32/tests: Fix the ToAscii(A) test on Hindi + UTF-8. ToAscii() can only return two bytes and thus cannot return three-byte UTF-8 characters. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54058 --- dlls/user32/tests/input.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f8b40099091..d9d2a1aee8a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3169,11 +3169,14 @@ static void test_ToUnicode(void) static void test_ToAscii(void) { + WCHAR wstr[16]; + char str[16]; WORD character; BYTE state[256]; const BYTE SC_RETURN = 0x1c, SC_A = 0x1e; const BYTE HIGHEST_BIT = 0x80; - int ret; + int ret, len; + DWORD gle; BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); memset(state, 0, sizeof(state)); @@ -3183,9 +3186,22 @@ static void test_ToAscii(void) ok(ret == 1, "ToAscii for Return key didn't return 1 (was %i)\n", ret); 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); + ok(ret == 1, "ToUnicode(A) returned %i, expected 1\n", ret); + + str[0] = '\0'; + len = WideCharToMultiByte(CP_ACP, 0, wstr, -1, str, sizeof(str), NULL, NULL); + gle = GetLastError(); + ok(len > 0, "Could not convert %s (gle %lu)\n", wine_dbgstr_w(wstr), gle); + character = 0; ret = ToAscii('A', SC_A, state, &character, 0); - ok(ret == 1, "ToAscii for character 'A' didn't return 1 (was %i)\n", ret); + if (len == 1 || len == 2) + ok(ret == 1, "ToAscii(A) returned %i, expected 1\n", ret); + else + /* ToAscii() can only return 2 chars => it fails if len > 2 */ + ok(ret == 0, "ToAscii(A) returned %i, expected 0\n", ret); if (us_kbd) ok(character == 'a', "ToAscii for character 'A' was %i (expected %i)\n", character, 'a'); state[VK_CONTROL] |= HIGHEST_BIT;

1 0

Francois Gouget : user32/tests: Show ToAscii(A) returns 'a' for multiple keyboard layouts.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 41a53f535fe6d919c75181a7aac7cf0da3ac79be URL: https://gitlab.winehq.org/wine/wine/-/commit/41a53f535fe6d919c75181a7aac7cf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 15 04:25:02 2023 +0100 user32/tests: Show ToAscii(A) returns 'a' for multiple keyboard layouts. Not all layouts return 'a' but layouts like Azerty still return 'a' despite the A and Q keys being swapped. --- dlls/user32/tests/input.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d9d2a1aee8a..ee39b11fc12 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3177,7 +3177,6 @@ static void test_ToAscii(void) const BYTE HIGHEST_BIT = 0x80; int ret, len; DWORD gle; - BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); memset(state, 0, sizeof(state)); @@ -3202,7 +3201,16 @@ static void test_ToAscii(void) else /* ToAscii() can only return 2 chars => it fails if len > 2 */ ok(ret == 0, "ToAscii(A) returned %i, expected 0\n", ret); - if (us_kbd) ok(character == 'a', "ToAscii for character 'A' was %i (expected %i)\n", character, 'a'); + switch ((ULONG_PTR)GetKeyboardLayout(0)) + { + case 0x04090409: /* Qwerty */ + case 0x04070407: /* Qwertz */ + case 0x040c040c: /* Azerty */ + ok(lstrcmpW(wstr, L"a") == 0, "ToUnicode(A) returned %s\n", wine_dbgstr_w(wstr)); + ok(character == 'a', "ToAscii(A) returned char=%i, expected %i\n", character, 'a'); + break; + /* Other keyboard layouts may or may not return 'a' */ + } state[VK_CONTROL] |= HIGHEST_BIT; state[VK_LCONTROL] |= HIGHEST_BIT;

1 0

Francois Gouget : ntdll/tests: Test the thread pool stack APIs.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 710ae2928e614ed0974374f3dd75053100c1a6d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/710ae2928e614ed0974374f3dd7505… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 03:39:55 2023 +0100 ntdll/tests: Test the thread pool stack APIs. --- dlls/ntdll/tests/threadpool.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 008755e6e5d..a7457e0a315 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -33,15 +33,17 @@ static VOID (WINAPI *pTpCallbackReleaseSemaphoreOnCompletion)(TP_CALLBACK_IN static void (WINAPI *pTpCancelAsyncIoOperation)(TP_IO *); static VOID (WINAPI *pTpDisassociateCallback)(TP_CALLBACK_INSTANCE *); static BOOL (WINAPI *pTpIsTimerSet)(TP_TIMER *); -static VOID (WINAPI *pTpReleaseWait)(TP_WAIT *); static VOID (WINAPI *pTpPostWork)(TP_WORK *); +static NTSTATUS (WINAPI *pTpQueryPoolStackInformation)(TP_POOL *,TP_POOL_STACK_INFORMATION *); static VOID (WINAPI *pTpReleaseCleanupGroup)(TP_CLEANUP_GROUP *); static VOID (WINAPI *pTpReleaseCleanupGroupMembers)(TP_CLEANUP_GROUP *,BOOL,PVOID); static void (WINAPI *pTpReleaseIoCompletion)(TP_IO *); static VOID (WINAPI *pTpReleasePool)(TP_POOL *); static VOID (WINAPI *pTpReleaseTimer)(TP_TIMER *); +static VOID (WINAPI *pTpReleaseWait)(TP_WAIT *); static VOID (WINAPI *pTpReleaseWork)(TP_WORK *); static VOID (WINAPI *pTpSetPoolMaxThreads)(TP_POOL *,DWORD); +static NTSTATUS (WINAPI *pTpSetPoolStackInformation)(TP_POOL *,TP_POOL_STACK_INFORMATION *); static VOID (WINAPI *pTpSetTimer)(TP_TIMER *,LARGE_INTEGER *,LONG,LONG); static VOID (WINAPI *pTpSetWait)(TP_WAIT *,HANDLE,LARGE_INTEGER *); static NTSTATUS (WINAPI *pTpSimpleTryPost)(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); @@ -80,6 +82,7 @@ static BOOL init_threadpool(void) GET_PROC(TpDisassociateCallback); GET_PROC(TpIsTimerSet); GET_PROC(TpPostWork); + GET_PROC(TpQueryPoolStackInformation); GET_PROC(TpReleaseCleanupGroup); GET_PROC(TpReleaseCleanupGroupMembers); GET_PROC(TpReleaseIoCompletion); @@ -88,6 +91,7 @@ static BOOL init_threadpool(void) GET_PROC(TpReleaseWait); GET_PROC(TpReleaseWork); GET_PROC(TpSetPoolMaxThreads); + GET_PROC(TpSetPoolStackInformation); GET_PROC(TpSetTimer); GET_PROC(TpSetWait); GET_PROC(TpSimpleTryPost); @@ -575,6 +579,7 @@ static void CALLBACK simple2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) static void test_tp_simple(void) { + TP_POOL_STACK_INFORMATION stack_info; TP_CALLBACK_ENVIRON environment; TP_CALLBACK_ENVIRON_V3 environment3; TP_CLEANUP_GROUP *group; @@ -678,6 +683,22 @@ static void test_tp_simple(void) pTpReleaseCleanupGroupMembers(group, TRUE, NULL); ok(userdata < 100, "expected userdata < 100, got %lu\n", userdata); + /* test querying and setting the stack size */ + status = pTpQueryPoolStackInformation(pool, &stack_info); + ok(!status, "TpQueryPoolStackInformation failed: %lx\n", status); + ok(stack_info.StackReserve == 2 * 1024 * 1024, "expected default StackReserve, got %ld\n", (ULONG)stack_info.StackReserve); + ok(stack_info.StackCommit == 4 * 1024, "expected default StackCommit, got %ld\n", (ULONG)stack_info.StackCommit); + + /* threadpool does not validate the stack size values */ + stack_info.StackReserve = stack_info.StackCommit = 1; + status = pTpSetPoolStackInformation(pool, &stack_info); + ok(!status, "TpSetPoolStackInformation failed: %lx\n", status); + + status = pTpQueryPoolStackInformation(pool, &stack_info); + ok(!status, "TpQueryPoolStackInformation failed: %lx\n", status); + ok(stack_info.StackReserve == 1, "expected 1 byte StackReserve, got %ld\n", (ULONG)stack_info.StackReserve); + ok(stack_info.StackCommit == 1, "expected 1 byte StackCommit, got %ld\n", (ULONG)stack_info.StackCommit); + /* cleanup */ pTpReleaseCleanupGroup(group); pTpReleasePool(pool);

1 0

Francois Gouget : ntdll: Use the thread pool stack information.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: c2d9e92374d472a46635ec56e9a7103ea7a51d6e URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d9e92374d472a46635ec56e9a710… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 03:39:05 2023 +0100 ntdll: Use the thread pool stack information. --- dlls/ntdll/threadpool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 99525f831e1..c50983e83d4 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1152,7 +1152,8 @@ static NTSTATUS tp_new_worker_thread( struct threadpool *pool ) HANDLE thread; NTSTATUS status; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, 0, 0, 0, + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, 0, + pool->stack_info.StackReserve, pool->stack_info.StackCommit, threadpool_worker_proc, pool, &thread, NULL ); if (status == STATUS_SUCCESS) {

1 0

Eric Pouech : ntdll: Implement RtlAddressInSectionTable.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 89d42d64d768d27e44408533d8fee9218dfa087d URL: https://gitlab.winehq.org/wine/wine/-/commit/89d42d64d768d27e44408533d8fee9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 17:07:17 2023 +0100 ntdll: Implement RtlAddressInSectionTable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54432 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/loader.c | 9 +++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0689dd0f575..f254f1beefd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4355,6 +4355,15 @@ PVOID WINAPI RtlImageRvaToVa( const IMAGE_NT_HEADERS *nt, HMODULE module, } +/*********************************************************************** + * RtlAddressInSectionTable (NTDLL.@) + */ +PVOID WINAPI RtlAddressInSectionTable( const IMAGE_NT_HEADERS *nt, HMODULE module, + DWORD rva ) +{ + return RtlImageRvaToVa( nt, module, rva, NULL ); +} + /*********************************************************************** * RtlPcToFileHeader (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 87f4629ee2c..3117e4c9b72 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -490,7 +490,7 @@ # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) @ stdcall RtlAddVectoredExceptionHandler(long ptr) -# @ stub RtlAddressInSectionTable +@ stdcall RtlAddressInSectionTable(ptr long long) @ stdcall RtlAdjustPrivilege(long long long ptr) @ stdcall RtlAllocateAndInitializeSid (ptr long long long long long long long long long ptr) @ stdcall RtlAllocateHandle(ptr ptr) diff --git a/include/winternl.h b/include/winternl.h index 87d390308af..3a6c89a5f7a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4260,6 +4260,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID NTSYSAPI NTSTATUS WINAPI RtlAddMandatoryAce(PACL,DWORD,DWORD,DWORD,DWORD,PSID); NTSYSAPI void WINAPI RtlAddRefActivationContext(HANDLE); NTSYSAPI PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); +NTSYSAPI PVOID WINAPI RtlAddressInSectionTable(const IMAGE_NT_HEADERS*,HMODULE,DWORD); NTSYSAPI NTSTATUS WINAPI RtlAdjustPrivilege(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlAllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *); NTSYSAPI RTL_HANDLE * WINAPI RtlAllocateHandle(RTL_HANDLE_TABLE *,ULONG *);

1 0

Francois Gouget : ws2_32: Warn that a libnss plugin may be missing if getaddrinfo() returns EBUSY.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: a5c007df2da825b61dd80cbd45a28e970714cdff URL: https://gitlab.winehq.org/wine/wine/-/commit/a5c007df2da825b61dd80cbd45a28e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 1 14:14:17 2023 +0100 ws2_32: Warn that a libnss plugin may be missing if getaddrinfo() returns EBUSY. --- dlls/ws2_32/unixlib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index f013e1ac3d0..4646e8ff26f 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -102,6 +102,7 @@ #include "ws2_32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winsock); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifndef HAVE_LINUX_GETHOSTBYNAME_R_6 static pthread_mutex_t host_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -463,6 +464,7 @@ static int addrinfo_err_from_unix( int err ) case EAI_SERVICE: return WS_EAI_SERVICE; case EAI_SOCKTYPE: return WS_EAI_SOCKTYPE; case EAI_SYSTEM: + if (errno == EBUSY) ERR_(winediag)("getaddrinfo() returned EBUSY. You may be missing a libnss plugin\n"); /* some broken versions of glibc return EAI_SYSTEM and set errno to * 0 instead of returning EAI_NONAME */ return errno ? errno_from_unix( errno ) : WS_EAI_NONAME;

1 0

Brendan Shanks : server: On macOS, fake debug registers when running under Rosetta.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 93fde56b494151f5e4bdfc560f930867bda52514 URL: https://gitlab.winehq.org/wine/wine/-/commit/93fde56b494151f5e4bdfc560f9308… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Feb 8 15:51:29 2023 -0800 server: On macOS, fake debug registers when running under Rosetta. Based on a patch by Tim Clem <tclem(a)codeweavers.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54367 --- server/mach.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/server/mach.c b/server/mach.c index 6051396a1bf..3852bb3ee5b 100644 --- a/server/mach.c +++ b/server/mach.c @@ -31,6 +31,9 @@ #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -74,6 +77,25 @@ static mach_port_t get_process_port( struct process *process ) return process->trace_data; } +static int is_rosetta( void ) +{ + static int rosetta_status, did_check = 0; + if (!did_check) + { + /* returns 0 for native process or on error, 1 for translated */ + int ret = 0; + size_t size = sizeof(ret); + if (sysctlbyname( "sysctl.proc_translated", &ret, &size, NULL, 0 ) == -1) + rosetta_status = 0; + else + rosetta_status = ret; + + did_check = 1; + } + + return rosetta_status; +} + /* initialize the process control mechanism */ void init_tracing_mechanism(void) { @@ -165,6 +187,14 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); + if (is_rosetta()) + { + /* getting debug registers of a translated process is not supported cross-process, return all zeroes */ + memset( &context->debug, 0, sizeof(context->debug) ); + context->flags |= SERVER_CTX_DEBUG_REGISTERS; + return; + } + if (thread->unix_pid == -1 || !process_port || mach_port_extract_right( process_port, thread->unix_tid, MACH_MSG_TYPE_COPY_SEND, &port, &type )) @@ -251,6 +281,15 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign return; } + if (is_rosetta()) + { + /* Setting debug registers of a translated process is not supported cross-process + * (and even in-process, setting debug registers never has the desired effect). + */ + set_error( STATUS_UNSUCCESSFUL ); + return; + } + /* get the debug state to determine which flavor to use */ ret = thread_get_state(port, x86_DEBUG_STATE, (thread_state_t)&state, &count); if (ret)

1 0

Brendan Shanks : ntdll: Add a WARN when setting debug registers fails under Rosetta.
by Alexandre Julliard 17 Feb '23

17 Feb '23

Module: wine Branch: master Commit: 39655dade3c802557754439451279c5b59b31ce8 URL: https://gitlab.winehq.org/wine/wine/-/commit/39655dade3c802557754439451279c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 16 21:58:26 2023 -0800 ntdll: Add a WARN when setting debug registers fails under Rosetta. --- dlls/ntdll/unix/signal_x86_64.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 13fe7051c66..80d39406ada 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1001,6 +1001,10 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (!self) { ret = set_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_AMD64 ); +#ifdef __APPLE__ + if ((flags & CONTEXT_DEBUG_REGISTERS) && (ret == STATUS_UNSUCCESSFUL)) + WARN_(seh)( "Setting debug registers is not supported under Rosetta\n" ); +#endif if (ret || !self) return ret; if (flags & CONTEXT_DEBUG_REGISTERS) {

1 0