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

Gabriel Ivăncescu : kernel32: Fix GetCurrencyFormatA when input length is 0.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: 606e0c191ed8fc26544c04f236c560b2f5e3e835 URL: https://gitlab.winehq.org/wine/wine/-/commit/606e0c191ed8fc26544c04f236c560… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 20:31:29 2023 +0200 kernel32: Fix GetCurrencyFormatA when input length is 0. Fixes a regression introduced by 42afb693b10dee9a06fcadb204560490a24f1754. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/locale.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 3783cf6505f..235034f6117 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -481,8 +481,6 @@ int WINAPI GetCurrencyFormatA( LCID lcid, DWORD flags, const char *value, } MultiByteToWideChar( cp, 0, value, -1, input, ARRAY_SIZE(input) ); - if (len > (int)ARRAY_SIZE(output)) len = ARRAY_SIZE(output); - if (format) { CURRENCYFMTW fmt; @@ -509,9 +507,9 @@ int WINAPI GetCurrencyFormatA( LCID lcid, DWORD flags, const char *value, fmt.lpDecimalSep = fmt_decimal; fmt.lpThousandSep = fmt_thousand; fmt.lpCurrencySymbol = fmt_symbol; - ret = GetCurrencyFormatW( lcid, flags, input, &fmt, output, len ); + ret = GetCurrencyFormatW( lcid, flags, input, &fmt, output, ARRAY_SIZE(output) ); } - else ret = GetCurrencyFormatW( lcid, flags, input, NULL, output, len ); + else ret = GetCurrencyFormatW( lcid, flags, input, NULL, output, ARRAY_SIZE(output) ); if (ret) ret = WideCharToMultiByte( cp, 0, output, -1, buffer, len, 0, 0 ); return ret;

1 0

Eric Pouech : dbghelp/tests: Better use global variables.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: 2d3b6d03fe911b3ab278634f6683a72d146e6848 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d3b6d03fe911b3ab278634f6683a7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 8 11:43:22 2023 +0100 dbghelp/tests: Better use global variables. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index f68ca8281de..07dfe6fbf6e 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -29,6 +29,8 @@ static const BOOL is_win64 = sizeof(void*) > sizeof(int); static WCHAR system_directory[MAX_PATH]; static WCHAR wow64_directory[MAX_PATH]; +static BOOL (*WINAPI pIsWow64Process2)(HANDLE, USHORT*, USHORT*); + #if defined(__i386__) || defined(__x86_64__) static DWORD CALLBACK stack_walk_thread(void *arg) @@ -564,13 +566,8 @@ enum process_kind static enum process_kind get_process_kind(HANDLE process) { - HMODULE mod; USHORT m1, m2; - BOOL (WINAPI *pIsWow64Process2)(HANDLE,USHORT*,USHORT*); - const BOOL is_win64 = sizeof(void*) == 8; - mod = GetModuleHandleA("kernel32"); - pIsWow64Process2 = (void*)GetProcAddress(mod, "IsWow64Process2"); if (!pIsWow64Process2) { BOOL is_wow64; @@ -820,6 +817,8 @@ START_TEST(dbghelp) SetEnvironmentVariableA("_NT_SYMBOL_PATH", NULL); SetEnvironmentVariableA("_NT_ALT_SYMBOL_PATH", NULL); + pIsWow64Process2 = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process2"); + ret = SymInitialize(GetCurrentProcess(), NULL, TRUE); ok(ret, "got error %lu\n", GetLastError());

1 0

Eric Pouech : dbghelp/tests: Preserve last error in process_get_kind().
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: e1f41c0a174f874f8b19dbe813480a343d67f369 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1f41c0a174f874f8b19dbe813480a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 8 11:43:22 2023 +0100 dbghelp/tests: Preserve last error in process_get_kind(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 07dfe6fbf6e..f6cea0125f4 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -564,7 +564,7 @@ enum process_kind PCSKIND_WOW64, /* Wine "new" wow64 configuration, and Windows with wow64 support */ }; -static enum process_kind get_process_kind(HANDLE process) +static enum process_kind get_process_kind_internal(HANDLE process) { USHORT m1, m2; @@ -601,6 +601,14 @@ static enum process_kind get_process_kind(HANDLE process) return PCSKIND_ERROR; } +static enum process_kind get_process_kind(HANDLE process) +{ + DWORD gle = GetLastError(); + enum process_kind pcskind = get_process_kind_internal(process); + SetLastError(gle); + return pcskind; +} + struct loaded_module_aggregation { HANDLE proc;

1 0

Eric Pouech : dbghelp: Use 'wine' as loader on multi-arch configuration.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: aabb4e12bc3d3a8f0b5b8d301867cb4d7e039729 URL: https://gitlab.winehq.org/wine/wine/-/commit/aabb4e12bc3d3a8f0b5b8d301867cb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 8 11:43:22 2023 +0100 dbghelp: Use 'wine' as loader on multi-arch configuration. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/module.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index ad8ec22fe32..8c7639dba38 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -134,7 +134,7 @@ WCHAR *get_wine_loader_name(struct process *pcs) unsigned len; name = process_getenv(pcs, L"WINELOADER"); - if (!name) name = pcs->is_64bit ? L"wine64" : L"wine"; + if (!name) name = pcs->is_system_64bit ? L"wine64" : L"wine"; len = lstrlenW(name); /* WINELOADER isn't properly updated in Wow64 process calling inside Windows env block @@ -145,9 +145,14 @@ WCHAR *get_wine_loader_name(struct process *pcs) if (altname) { memcpy(altname, name, len * sizeof(WCHAR)); - if (pcs->is_64bit && len >= 2 && memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR)) != 0) + if (pcs->is_system_64bit && len >= 2 && memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR)) != 0) + { lstrcpyW(altname + len, L"64"); - else if (!pcs->is_64bit && len >= 2 && !memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR))) + /* in multi-arch wow configuration, wine64 doesn't exist */ + if (GetFileAttributesW(altname) == INVALID_FILE_ATTRIBUTES) + altname[len] = L'\0'; + } + else if (!pcs->is_system_64bit && len >= 2 && !memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR))) altname[len - 2] = '\0'; else altname[len] = '\0';

1 0

Eric Pouech : dbghelp/tests: Add tests for SymRefreshModuleList() on non-live target.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: 0f98972fe2165d5eca52de48d8a6130de7e61a30 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f98972fe2165d5eca52de48d8a613… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 8 11:43:22 2023 +0100 dbghelp/tests: Add tests for SymRefreshModuleList() on non-live target. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index f6cea0125f4..445576532e6 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -424,6 +424,9 @@ static BOOL test_modules(void) ret = SymInitialize(dummy, NULL, FALSE); ok(ret, "got error %lu\n", GetLastError()); + ret = SymRefreshModuleList(dummy); + ok(!ret, "SymRefreshModuleList should have failed\n"); + count = get_module_count(dummy); ok(count == 0, "Unexpected count (%u instead of 0)\n", count); @@ -731,6 +734,10 @@ static void test_loaded_modules(void) } } + ret = SymRefreshModuleList(pi.hProcess); + todo_wine_if(get_process_kind(pi.hProcess) == PCSKIND_WOW64) + ok(ret || broken(GetLastError() == STATUS_PARTIAL_COPY /* Win11 in some cases */), "SymRefreshModuleList failed: %lu\n", GetLastError()); + SymCleanup(pi.hProcess); TerminateProcess(pi.hProcess, 0); @@ -766,6 +773,9 @@ static void test_loaded_modules(void) "Wrong directory aggregation count %u %u\n", aggregation.count_systemdir, aggregation.count_wowdir); + ret = SymRefreshModuleList(pi.hProcess); + ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError()); + SymCleanup(pi.hProcess); TerminateProcess(pi.hProcess, 0); } @@ -804,6 +814,9 @@ static void test_loaded_modules(void) "Wrong directory aggregation count %u %u\n", aggregation2.count_systemdir, aggregation2.count_wowdir); + ret = SymRefreshModuleList(pi.hProcess); + ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError()); + SymCleanup(pi.hProcess); TerminateProcess(pi.hProcess, 0); }

1 0

Eric Pouech : dbghelp: Don't set ELF loader when wine's loader isn't accessible.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: 9877ba97320e8786437d4465816e281ad8b527e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9877ba97320e8786437d4465816e28… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 8 11:43:22 2023 +0100 dbghelp: Don't set ELF loader when wine's loader isn't accessible. For dbghelp in 32-bit, when accessing a live debuggee in multi-arch configuration, Wine's ELF loader is likely mapped above 4G, hence not accessible with 32bit Windows APIs. So don't try to expose the ELF libraries in that case. Introducing a new loader operation class to support live targets, for which system operations are not accessible, but pretending they are successful. Note: - when Wine's loader ELF module isn't registered by dbghelp, any other ELF module will not be registered by dbghelp. - further work may be needed for winedbg in auto mode (launched with AeDebug key on process exception) as in that mode winedbg doesn't relaunch itself in 64bit, so won't be able to access (64bit) ELF information (in multi-arch configuration). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/elf_module.c | 12 +++++++++--- dlls/dbghelp/module.c | 41 +++++++++++++++++++++++++++++++---------- dlls/dbghelp/tests/dbghelp.c | 1 - 4 files changed, 41 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 1852aef1795..c11ccf81a92 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -716,6 +716,7 @@ void minidump_add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size extern const WCHAR S_ElfW[] DECLSPEC_HIDDEN; extern const WCHAR S_WineLoaderW[] DECLSPEC_HIDDEN; extern const struct loader_ops no_loader_ops DECLSPEC_HIDDEN; +extern const struct loader_ops empty_loader_ops DECLSPEC_HIDDEN; extern BOOL module_init_pair(struct module_pair* pair, HANDLE hProcess, DWORD64 addr) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 3c1e225e195..ee8315c4a23 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); struct elf_info { unsigned flags; /* IN one (or several) of the ELF_INFO constants */ - DWORD_PTR dbg_hdr_addr; /* OUT address of debug header (if ELF_INFO_DEBUG_HEADER is set) */ + DWORD64 dbg_hdr_addr; /* OUT address of debug header (if ELF_INFO_DEBUG_HEADER is set) */ struct module* module; /* OUT loaded module (if ELF_INFO_MODULE is set) */ const WCHAR* module_name; /* OUT found module name (if ELF_INFO_NAME is set) */ }; @@ -1769,8 +1769,14 @@ BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr) HeapFree(GetProcessHeap(), 0, loader); } if (!ret || !elf_info.dbg_hdr_addr) return FALSE; - - TRACE("Found ELF debug header %#Ix\n", elf_info.dbg_hdr_addr); + if (elf_info.dbg_hdr_addr != (ULONG_PTR)elf_info.dbg_hdr_addr) + { + ERR("Unable to access ELF libraries (outside 32bit limit)\n"); + module_remove(pcs, elf_info.module); + pcs->loader = &empty_loader_ops; + return FALSE; + } + TRACE("Found ELF debug header %#I64x\n", elf_info.dbg_hdr_addr); elf_info.module->format_info[DFI_ELF]->u.elf_info->elf_loader = 1; module_set_module(elf_info.module, S_WineLoaderW); pcs->dbg_hdr_addr = elf_info.dbg_hdr_addr; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 8c7639dba38..ee559cfd99e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1548,11 +1548,6 @@ PVOID WINAPI SymFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase) return module->cpu->find_runtime_function(module, AddrBase); } -static BOOL native_synchronize_module_list(struct process* pcs) -{ - return FALSE; -} - static struct module* native_load_module(struct process* pcs, const WCHAR* name, ULONG_PTR addr) { return NULL; @@ -1564,22 +1559,48 @@ static BOOL native_load_debug_info(struct process* process, struct module* modul return FALSE; } -static BOOL native_enum_modules(struct process *process, enum_modules_cb cb, void* user) +static BOOL native_fetch_file_info(struct process* process, const WCHAR* name, ULONG_PTR load_addr, DWORD_PTR* base, + DWORD* size, DWORD* checksum) { return FALSE; } -static BOOL native_fetch_file_info(struct process* process, const WCHAR* name, ULONG_PTR load_addr, DWORD_PTR* base, - DWORD* size, DWORD* checksum) +static BOOL noloader_synchronize_module_list(struct process* pcs) +{ + return FALSE; +} + +static BOOL noloader_enum_modules(struct process *process, enum_modules_cb cb, void* user) { return FALSE; } +static BOOL empty_synchronize_module_list(struct process* pcs) +{ + return TRUE; +} + +static BOOL empty_enum_modules(struct process *process, enum_modules_cb cb, void* user) +{ + return TRUE; +} + +/* to be used when debuggee isn't a live target */ const struct loader_ops no_loader_ops = { - native_synchronize_module_list, + noloader_synchronize_module_list, + native_load_module, + native_load_debug_info, + noloader_enum_modules, + native_fetch_file_info, +}; + +/* to be used when debuggee is a live target, but which system information isn't available */ +const struct loader_ops empty_loader_ops = +{ + empty_synchronize_module_list, native_load_module, native_load_debug_info, - native_enum_modules, + empty_enum_modules, native_fetch_file_info, }; diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 445576532e6..339585993e0 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -735,7 +735,6 @@ static void test_loaded_modules(void) } ret = SymRefreshModuleList(pi.hProcess); - todo_wine_if(get_process_kind(pi.hProcess) == PCSKIND_WOW64) ok(ret || broken(GetLastError() == STATUS_PARTIAL_COPY /* Win11 in some cases */), "SymRefreshModuleList failed: %lu\n", GetLastError()); SymCleanup(pi.hProcess);

1 0

Eric Pouech : dbghelp: Fix vdso.so lookup.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: 5477ee640b9d948cee8e4facec38ca0468372f61 URL: https://gitlab.winehq.org/wine/wine/-/commit/5477ee640b9d948cee8e4facec38ca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 8 11:43:22 2023 +0100 dbghelp: Fix vdso.so lookup. - should have been fixed when libwine.so has been removed - code was broken anyway - enhanced protect against error when reading debuggee's memory Introducing helper to correctly read pointer's from debuggee (and other integral values). vdso is now listed in ELF's module list (except if Wine's preloader removes it from auxilary vector) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 9 +++++++++ dlls/dbghelp/elf_module.c | 44 +++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index c11ccf81a92..9a9773269af 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -523,6 +523,15 @@ static inline BOOL read_process_memory(const struct process *process, UINT64 add return ReadProcessMemory(process->handle, (void*)(UINT_PTR)addr, buf, size, NULL); } +static inline BOOL read_process_integral_value(const struct process* process, UINT64 addr, UINT64* pvalue, size_t size) +{ + /* Assuming that debugger and debuggee are little endian. */ + UINT64 value = 0; + if (size > sizeof(value) || !read_process_memory(process, addr, &value, size)) return FALSE; + *pvalue = value; + return TRUE; +} + struct line_info { ULONG_PTR is_first : 1, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index ee8315c4a23..a2a60752a68 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1339,39 +1339,51 @@ static BOOL elf_load_file_cb(void *param, HANDLE handle, const WCHAR *filename) /****************************************************************** * elf_search_auxv * - * locate some a value from the debuggee auxiliary vector + * Locate a value from the debuggee auxiliary vector */ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, ULONG_PTR* val) { char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; SYMBOL_INFO*si = (SYMBOL_INFO*)buffer; - BYTE* addr; - BYTE* str; - BYTE* str_max; + const unsigned ptr_size = pcs->is_system_64bit ? 8 : 4; + UINT64 envp; + UINT64 addr; + UINT64 str; + UINT64 str_max; si->SizeOfStruct = sizeof(*si); si->MaxNameLen = MAX_SYM_NAME; - if (!SymFromName(pcs->handle, "libwine.so.1!__wine_main_environ", si) || - !(addr = (void*)(DWORD_PTR)si->Address) || - !ReadProcessMemory(pcs->handle, addr, &addr, sizeof(addr), NULL) || - !addr) + if (!SymFromName(pcs->handle, "ntdll.so!main_envp", si) || + !si->Address || + !read_process_integral_value(pcs, si->Address, &envp, ptr_size) || + !envp) { FIXME("can't find symbol in module\n"); return FALSE; } /* walk through envp[] */ /* envp[] strings are located after the auxiliary vector, so protect the walk */ - str_max = (void*)(DWORD_PTR)~0L; - while (ReadProcessMemory(pcs->handle, addr, &str, sizeof(str), NULL) && - (addr = (void*)((DWORD_PTR)addr + sizeof(str))) != NULL && str != NULL) - str_max = min(str_max, str); + str_max = ~(UINT64)0u; + addr = envp; + for (;;) + { + if (!read_process_integral_value(pcs, addr, &str, ptr_size) || (addr += ptr_size) <= ptr_size) + return FALSE; + if (!str) break; + /* It can be some env vars have been changed, pointing to a different location */ + if (str >= envp) + str_max = min(str_max, str); + } /* Walk through the end of envp[] array. * Actually, there can be several NULLs at the end of envp[]. This happens when an env variable is * deleted, the last entry is replaced by an extra NULL. */ - while (addr < str_max && ReadProcessMemory(pcs->handle, addr, &str, sizeof(str), NULL) && str == NULL) - addr = (void*)((DWORD_PTR)addr + sizeof(str)); + for (; addr < str_max; addr += ptr_size) + { + if (!read_process_integral_value(pcs, addr, &str, ptr_size)) return FALSE; + if (str) break; + } if (pcs->is_system_64bit) { @@ -1381,7 +1393,7 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, ULONG_PTR* UINT64 a_val; } auxv; - while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type) + while (read_process_memory(pcs, addr, &auxv, sizeof(auxv)) && auxv.a_type) { if (auxv.a_type == type) { @@ -1399,7 +1411,7 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, ULONG_PTR* UINT32 a_val; } auxv; - while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type) + while (read_process_memory(pcs, addr, &auxv, sizeof(auxv)) && auxv.a_type) { if (auxv.a_type == type) {

1 0

Rémi Bernon : user32/tests: Skip tests if layout failed to activate.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: 9f072a273d35d29bd5ae09b9c6ba00ffd63236a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f072a273d35d29bd5ae09b9c6ba00… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 1 22:57:29 2023 +0100 user32/tests: Skip tests if layout failed to activate. --- dlls/user32/tests/input.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c534880679a..7b155d80ede 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3331,7 +3331,20 @@ static void test_keyboard_layout_name(void) for (i = len - 1; i >= 0; --i) { id = (DWORD_PTR)layouts[i]; + + winetest_push_context( "%08lx", id ); + ActivateKeyboardLayout(layouts[i], 0); + + tmplayout = GetKeyboardLayout(0); + todo_wine_if(tmplayout != layouts[i]) + ok( tmplayout == layouts[i], "Failed to activate keyboard layout\n"); + if (tmplayout != layouts[i]) + { + winetest_pop_context(); + continue; + } + GetKeyboardLayoutNameW(klid); for (j = 0; j < len; ++j) @@ -3370,6 +3383,8 @@ static void test_keyboard_layout_name(void) /* The layout name only depends on the keyboard layout: the high word of HKL. */ GetKeyboardLayoutNameW(tmpklid); ok(!wcsicmp(klid, tmpklid), "GetKeyboardLayoutNameW returned %s, expected %s\n", debugstr_w(tmpklid), debugstr_w(klid)); + + winetest_pop_context(); } ActivateKeyboardLayout(layout, 0);

1 0

Giovanni Mascellani : vkd3d: Always enqueue execute operations, even when they can be executed right away.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: vkd3d Branch: master Commit: 0d329ba168f98634dd680f0ff26bb13f4eab3550 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0d329ba168f98634dd680f0ff26bb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Feb 8 17:08:50 2023 +0100 vkd3d: Always enqueue execute operations, even when they can be executed right away. The goal is to simplify the CS queue handling: with this and the following changes operations are always started by d3d12_command_queue_flush_ops(), in order to make further refactoring easier. Notice that while with this change executing an operation on an empty CS queue is a bit less efficient, it doesn't require more locking. On the other hand, this change paves the road for executing CS operations without holding the queue lock. --- libs/vkd3d/command.c | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 772649cd..7b522427 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -27,6 +27,7 @@ static void d3d12_fence_signal_timeline_semaphore(struct d3d12_fence *fence, uin static HRESULT d3d12_command_queue_signal(struct d3d12_command_queue *command_queue, struct d3d12_fence *fence, uint64_t value); static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, bool *flushed_any); +static HRESULT d3d12_command_queue_flush_ops_locked(struct d3d12_command_queue *queue, bool *flushed_any); HRESULT vkd3d_queue_create(struct d3d12_device *device, uint32_t family_index, const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue) @@ -6147,6 +6148,18 @@ static void d3d12_command_queue_execute(struct d3d12_command_queue *command_queu vkd3d_free(buffers); } +static void d3d12_command_queue_submit_locked(struct d3d12_command_queue *queue) +{ + bool flushed_any = false; + HRESULT hr; + + if (queue->ops_count == 1) + { + if (FAILED(hr = d3d12_command_queue_flush_ops_locked(queue, &flushed_any))) + ERR("Cannot flush queue, hr %#x.\n", hr); + } +} + static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12CommandQueue *iface, UINT command_list_count, ID3D12CommandList * const *command_lists) { @@ -6185,13 +6198,6 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm vkd3d_mutex_lock(&command_queue->op_mutex); - if (!command_queue->ops_count) - { - d3d12_command_queue_execute(command_queue, buffers, command_list_count); - vkd3d_mutex_unlock(&command_queue->op_mutex); - return; - } - if (!(op = d3d12_command_queue_require_space_locked(command_queue))) { ERR("Failed to add op.\n"); @@ -6201,6 +6207,8 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm op->u.execute.buffers = buffers; op->u.execute.buffer_count = command_list_count; + d3d12_command_queue_submit_locked(command_queue); + vkd3d_mutex_unlock(&command_queue->op_mutex); return; } @@ -6769,13 +6777,9 @@ static const struct ID3D12CommandQueueVtbl d3d12_command_queue_vtbl = d3d12_command_queue_GetDesc, }; -/* flushed_any is initialised by the caller. */ static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, bool *flushed_any) { - struct vkd3d_cs_op_data *op; - struct d3d12_fence *fence; - HRESULT hr = S_OK; - unsigned int i; + HRESULT hr; if (!queue->ops_count) return S_OK; @@ -6788,6 +6792,21 @@ static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, vkd3d_mutex_lock(&queue->op_mutex); + hr = d3d12_command_queue_flush_ops_locked(queue, flushed_any); + + vkd3d_mutex_unlock(&queue->op_mutex); + + return hr; +} + +/* flushed_any is initialised by the caller. */ +static HRESULT d3d12_command_queue_flush_ops_locked(struct d3d12_command_queue *queue, bool *flushed_any) +{ + struct vkd3d_cs_op_data *op; + struct d3d12_fence *fence; + HRESULT hr = S_OK; + unsigned int i; + /* Currently only required for d3d12_command_queue_signal(), but set it here anyway. */ queue->is_flushing = true; @@ -6832,7 +6851,6 @@ static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, done: queue->is_flushing = false; - vkd3d_mutex_unlock(&queue->op_mutex); return hr; }

1 0

Giovanni Mascellani : vkd3d: Always enqueue signal operations, even when they can be executed right away.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: vkd3d Branch: master Commit: 9eba44396a00d35366026d5e0ed85d8e6c124ca6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9eba44396a00d35366026d5e0ed85… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 2 12:04:57 2023 +0100 vkd3d: Always enqueue signal operations, even when they can be executed right away. --- libs/vkd3d/command.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7b522427..5d8eb3e9 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6274,12 +6274,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * vkd3d_mutex_lock(&command_queue->op_mutex); - if (!command_queue->ops_count) - { - hr = d3d12_command_queue_signal(command_queue, fence, value); - goto done; - } - if (!(op = d3d12_command_queue_require_space_locked(command_queue))) { hr = E_OUTOFMEMORY; @@ -6291,6 +6285,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * d3d12_fence_incref(fence); + d3d12_command_queue_submit_locked(command_queue); + done: vkd3d_mutex_unlock(&command_queue->op_mutex); return hr;

1 0