July 2022 - Wine-commits - list.winehq.org

Brendan Shanks : winedbg: Prefer thread name from GetThreadDescription() in 'info thread' listing.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: f89c8be852e256d38bee82179e82f1599241d801 URL: https://gitlab.winehq.org/wine/wine/-/commit/f89c8be852e256d38bee82179e82f1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 24 10:52:18 2022 -0800 winedbg: Prefer thread name from GetThreadDescription() in 'info thread' listing. --- programs/winedbg/debugger.h | 1 + programs/winedbg/info.c | 50 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 17bebf9e886..c3eac423a13 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -385,6 +385,7 @@ extern void info_win32_virtual(DWORD pid); extern void info_win32_segments(DWORD start, int length); extern void info_win32_exception(void); extern void info_wine_dbg_channel(BOOL add, const char* chnl, const char* name); +extern WCHAR* fetch_thread_description(DWORD tid); /* memory.c */ extern BOOL memory_read_value(const struct dbg_lvalue* lvalue, DWORD size, void* result); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index af68ab799da..5d6b45d715f 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -595,6 +595,39 @@ static BOOL get_process_name(DWORD pid, PROCESSENTRY32W* entry) return ret; } +WCHAR* fetch_thread_description(DWORD tid) +{ + static HRESULT (WINAPI *my_GetThreadDescription)(HANDLE, PWSTR*) = NULL; + static BOOL resolved = FALSE; + HANDLE h; + WCHAR* desc = NULL; + + if (!resolved) + { + HMODULE kernelbase = GetModuleHandleA("kernelbase.dll"); + if (kernelbase) + my_GetThreadDescription = (void *)GetProcAddress(kernelbase, "GetThreadDescription"); + resolved = TRUE; + } + + if (!my_GetThreadDescription) + return NULL; + + h = OpenThread(THREAD_QUERY_LIMITED_INFORMATION, FALSE, tid); + if (!h) + return NULL; + + my_GetThreadDescription(h, &desc); + CloseHandle(h); + + if (desc && desc[0] == '\0') + { + LocalFree(desc); + return NULL; + } + return desc; +} + void info_win32_threads(void) { HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); @@ -605,6 +638,7 @@ void info_win32_threads(void) DWORD lastProcessId = 0; struct dbg_process* p = NULL; struct dbg_thread* t = NULL; + WCHAR *description; entry.dwSize = sizeof(entry); ok = Thread32First(snap, &entry); @@ -636,12 +670,20 @@ void info_win32_threads(void) entry.th32OwnerProcessID, p ? " (D)" : "", exename); lastProcessId = entry.th32OwnerProcessID; } - t = dbg_get_thread(p, entry.th32ThreadID); - dbg_printf("\t%08lx %4ld%s %s\n", + dbg_printf("\t%08lx %4ld%s ", entry.th32ThreadID, entry.tpBasePri, - (entry.th32ThreadID == dbg_curr_tid) ? " <==" : " ", - t ? t->name : ""); + (entry.th32ThreadID == dbg_curr_tid) ? " <==" : " "); + if ((description = fetch_thread_description(entry.th32ThreadID))) + { + dbg_printf("%ls\n", description); + LocalFree(description); + } + else + { + t = dbg_get_thread(p, entry.th32ThreadID); + dbg_printf("%s\n", t ? t->name : ""); + } } ok = Thread32Next(snap, &entry); }

1 0

Brendan Shanks : winedbg: Prefer thread name from GetThreadDescription() in GDB proxy mode.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 2dba29a6538374f6fec39db63fc4d64b5655544d URL: https://gitlab.winehq.org/wine/wine/-/commit/2dba29a6538374f6fec39db63fc4d6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Feb 23 16:22:09 2022 -0800 winedbg: Prefer thread name from GetThreadDescription() in GDB proxy mode. --- programs/winedbg/gdbproxy.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 1999c103372..6b523b30337 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -269,6 +269,18 @@ static inline void reply_buffer_append_str(struct reply_buffer* reply, const cha reply_buffer_append(reply, str, strlen(str)); } +static inline void reply_buffer_append_wstr(struct reply_buffer* reply, const WCHAR* wstr) +{ + char* str; + int len; + + len = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL); + str = malloc(len); + if (str && WideCharToMultiByte(CP_ACP, 0, wstr, -1, str, len, NULL, NULL)) + reply_buffer_append_str(reply, str); + free(str); +} + static inline void reply_buffer_append_hex(struct reply_buffer* reply, const void* src, size_t len) { reply_buffer_grow(reply, len * 2); @@ -1777,6 +1789,7 @@ static enum packet_return packet_query_threads(struct gdb_context* gdbctx) struct reply_buffer* reply = &gdbctx->qxfer_buffer; struct dbg_process* process = gdbctx->process; struct dbg_thread* thread; + WCHAR* description; if (!process) return packet_error; @@ -1790,7 +1803,12 @@ static enum packet_return packet_query_threads(struct gdb_context* gdbctx) reply_buffer_append_str(reply, "id=\""); reply_buffer_append_uinthex(reply, thread->tid, 4); reply_buffer_append_str(reply, "\" name=\""); - if (strlen(thread->name)) + if ((description = fetch_thread_description(thread->tid))) + { + reply_buffer_append_wstr(reply, description); + LocalFree(description); + } + else if (strlen(thread->name)) { reply_buffer_append_str(reply, thread->name); }

1 0

Jacek Caban : vulkan-1: Make sure that user32 is loaded before ICD.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 35413f9217e56209784032f749b97c481d3b4c84 URL: https://gitlab.winehq.org/wine/wine/-/commit/35413f9217e56209784032f749b97c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 22:49:28 2022 +0200 vulkan-1: Make sure that user32 is loaded before ICD. --- dlls/vulkan-1/Makefile.in | 5 ++++- dlls/vulkan-1/vulkan.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in index a4a10bc8e93..9c4dca9a880 100644 --- a/dlls/vulkan-1/Makefile.in +++ b/dlls/vulkan-1/Makefile.in @@ -1,7 +1,10 @@ MODULE = vulkan-1.dll -IMPORTS = winevulkan +IMPORTS = user32 IMPORTLIB = vulkan-1 EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc + +C_SRCS = \ + vulkan.c diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c new file mode 100644 index 00000000000..ab40260d9bd --- /dev/null +++ b/dlls/vulkan-1/vulkan.c @@ -0,0 +1,30 @@ +/* + * Copyright 2022 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include "wine/debug.h" + + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) +{ + if (reason != DLL_PROCESS_ATTACH) return TRUE; + + DisableThreadLibraryCalls(hinst); + GetDpiForSystem(); /* make sure that user32 is loaded */ + return TRUE; +}

1 0

Jacek Caban : winevulkan: Move __wine_get_vulkan_driver call to Unix lib.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 1de20f86ea81b212009a4fab7b79a2fb7d4d4e06 URL: https://gitlab.winehq.org/wine/wine/-/commit/1de20f86ea81b212009a4fab7b79a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 5 19:54:55 2022 +0200 winevulkan: Move __wine_get_vulkan_driver call to Unix lib. --- dlls/winevulkan/Makefile.in | 2 +- dlls/winevulkan/loader.c | 15 +-------------- dlls/winevulkan/vulkan.c | 9 ++++++++- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index 360fb77a6eb..732bf5493a9 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -2,7 +2,7 @@ MODULE = winevulkan.dll UNIXLIB = winevulkan.so IMPORTLIB = winevulkan IMPORTS = user32 gdi32 advapi32 setupapi win32u -UNIX_LIBS = $(PTHREAD_LIBS) +UNIX_LIBS = -lwin32u $(PTHREAD_LIBS) C_SRCS = \ loader.c \ diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 86e6718adbd..1c45c036c18 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -215,24 +215,11 @@ VkResult WINAPI vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supported_ver static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { - const void *driver; - - driver = __wine_get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); - if (!driver) - { - ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); - return FALSE; - } - if (NtQueryVirtualMemory(GetCurrentProcess(), hinstance, MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL)) return FALSE; - if (vk_unix_call(unix_init, &driver) || !driver) - return FALSE; - - unix_funcs = driver; - return TRUE; + return !vk_unix_call(unix_init, &unix_funcs); } static BOOL wine_vk_init_once(void) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 190f70f3616..071dbd4cdff 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -436,7 +436,14 @@ static void wine_vk_device_free(struct VkDevice_T *device) NTSTATUS init_vulkan(void *args) { - vk_funcs = *(const struct vulkan_funcs **)args; + vk_funcs = __wine_get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); + if (!vk_funcs) + { + ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); + return STATUS_UNSUCCESSFUL; + } + + *(const struct unix_funcs **)args = &loader_funcs; return STATUS_SUCCESS; }

1 0

Brendan Shanks : winedbg: Implement GDB qGetTIBAddr query.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: d3b72d0ff14834156bd91d6c4255012db9b77416 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3b72d0ff14834156bd91d6c425501… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jul 26 10:39:56 2022 -0700 winedbg: Implement GDB qGetTIBAddr query. --- programs/winedbg/gdbproxy.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 643860d55ee..1999c103372 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2047,6 +2047,27 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_done; } break; + case 'G': + if (gdbctx->in_packet_len > 10 && + strncmp(gdbctx->in_packet, "GetTIBAddr", 10) == 0 && + gdbctx->in_packet[10] == ':') + { + unsigned tid; + char* end; + struct dbg_thread* thd; + + tid = strtol(gdbctx->in_packet + 11, &end, 16); + if (end == NULL) break; + + thd = dbg_get_thread(gdbctx->process, tid); + if (thd == NULL) + return packet_reply_error(gdbctx, HOST_EINVAL); + packet_reply_open(gdbctx); + packet_reply_val(gdbctx, (ULONG_PTR)thd->teb, sizeof(thd->teb)); + packet_reply_close(gdbctx); + return packet_done; + } + break; case 'O': if (strncmp(gdbctx->in_packet, "Offsets", gdbctx->in_packet_len) == 0) {

1 0

Nikolay Sivov : dwrite: Add Arabic fallback ranges.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 9ff62cb30aec3d818b577b082d6a49ddb6f9adcf URL: https://gitlab.winehq.org/wine/wine/-/commit/9ff62cb30aec3d818b577b082d6a49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 27 11:47:34 2022 +0300 dwrite: Add Arabic fallback ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 11cf66ce13c..1584329d350 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -224,6 +224,10 @@ system_fallback_config[] = { "0590-05FF, FB1D-FB4F", L"Noto Sans Hebrew" }, + { "0600-06FF, 0750-077F, " + "08A0-08FF, FB50-FDCF, " + "FDF0-FDFF, FE70-FEFE", L"Noto Sans Arabic" }, + { "0900-097F", L"Noto Sans Devanagari" }, { "0980-09FF", L"Noto Sans Bengali" }, { "0A00-0A7F", L"Noto Sans Gurmukhi" }, @@ -247,8 +251,6 @@ system_fallback_config[] = { "3000-30FF, 31F0-31FF, 4E00-9FFF", L"Meiryo" }, }; -static struct fallback_data system_fallback; - struct text_source_context { IDWriteTextAnalysisSource *source; @@ -436,6 +438,8 @@ struct dwrite_fontfallback_builder size_t mappings_size; }; +static struct fallback_data system_fallback; + static void release_fallback_mapping(struct fallback_mapping *mapping) { unsigned int i;

1 0

Rémi Bernon : mf: Split MFCreateTopoLoader to topology_loader.c.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 493d60fb16a0f17c598ccc20bb837239eebcaa27 URL: https://gitlab.winehq.org/wine/wine/-/commit/493d60fb16a0f17c598ccc20bb8372… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 8 11:29:21 2022 +0200 mf: Split MFCreateTopoLoader to topology_loader.c. --- dlls/mf/Makefile.in | 3 +- dlls/mf/mf_private.h | 1 + dlls/mf/topology.c | 797 +------------------------------------------- dlls/mf/topology_loader.c | 826 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 830 insertions(+), 797 deletions(-)

1 0

Rémi Bernon : mf: Check whether node is already in the topology before cloning.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 1dc4c94ed07336b0e7f4233cd22342a5898767eb URL: https://gitlab.winehq.org/wine/wine/-/commit/1dc4c94ed07336b0e7f4233cd22342… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 5 16:03:43 2022 +0200 mf: Check whether node is already in the topology before cloning. --- dlls/mf/topology_loader.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 2ab92393c3e..997afd5ae0a 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -109,33 +109,32 @@ static IMFTopologyNode *topology_loader_get_node_for_marker(struct topoloader_co } static HRESULT topology_loader_clone_node(struct topoloader_context *context, IMFTopologyNode *node, - IMFTopologyNode **ret, unsigned int marker) + IMFTopologyNode **clone, unsigned int marker) { - IMFTopologyNode *cloned_node; MF_TOPOLOGY_TYPE node_type; HRESULT hr; + TOPOID id; - if (ret) *ret = NULL; + if (FAILED(hr = IMFTopologyNode_GetTopoNodeID(node, &id))) + return hr; + if (SUCCEEDED(hr = IMFTopology_GetNodeByID(context->output_topology, id, clone))) + return hr; IMFTopologyNode_GetNodeType(node, &node_type); - - if (FAILED(hr = MFCreateTopologyNode(node_type, &cloned_node))) + if (FAILED(hr = MFCreateTopologyNode(node_type, clone))) return hr; - if (SUCCEEDED(hr = IMFTopologyNode_CloneFrom(cloned_node, node))) - hr = IMFTopologyNode_SetUINT32(cloned_node, &context->key, marker); + if (SUCCEEDED(hr = IMFTopologyNode_CloneFrom(*clone, node))) + hr = IMFTopologyNode_SetUINT32(*clone, &context->key, marker); if (SUCCEEDED(hr)) - hr = IMFTopology_AddNode(context->output_topology, cloned_node); + hr = IMFTopology_AddNode(context->output_topology, *clone); - if (SUCCEEDED(hr) && ret) + if (FAILED(hr)) { - *ret = cloned_node; - IMFTopologyNode_AddRef(*ret); + IMFTopologyNode_Release(*clone); + *clone = NULL; } - - IMFTopologyNode_Release(cloned_node); - return hr; } @@ -470,12 +469,9 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context MF_TOPOLOGY_TYPE u_type, d_type; IMFTopologyNode *node; HRESULT hr; - TOPOID id; - /* Downstream node might have already been cloned. */ - IMFTopologyNode_GetTopoNodeID(downstream_node, &id); - if (FAILED(IMFTopology_GetNodeByID(context->output_topology, id, &node))) - topology_loader_clone_node(context, downstream_node, &node, context->marker + 1); + if (FAILED(hr = topology_loader_clone_node(context, downstream_node, &node, context->marker + 1))) + return hr; IMFTopologyNode_GetNodeType(upstream_node, &u_type); IMFTopologyNode_GetNodeType(downstream_node, &d_type); @@ -763,8 +759,12 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) { - if (FAILED(hr = topology_loader_clone_node(&context, node, NULL, 0))) + IMFTopologyNode *clone; + + if (FAILED(hr = topology_loader_clone_node(&context, node, &clone, 0))) WARN("Failed to clone source node, hr %#lx.\n", hr); + else + IMFTopologyNode_Release(clone); } IMFTopologyNode_Release(node);

1 0

Rémi Bernon : mf: Use a branch list instead of node marker in the topology loader.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: e5b06613f31b89a2a2e58e5963601e5ec6cf16e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5b06613f31b89a2a2e58e5963601e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 5 18:05:08 2022 +0200 mf: Use a branch list instead of node marker in the topology loader. --- dlls/mf/tests/mf.c | 1 - dlls/mf/topology_loader.c | 236 +++++++++++++++++++++++++--------------------- 2 files changed, 131 insertions(+), 106 deletions(-)

1 0

Rémi Bernon : mf: Better implement topology loader graph resolution.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 6dc35196ae4a5afda6490abe585bc8d468f1ed2d URL: https://gitlab.winehq.org/wine/wine/-/commit/6dc35196ae4a5afda6490abe585bc8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 4 13:52:45 2022 +0200 mf: Better implement topology loader graph resolution. Supporting more branch node types and fixing the decoder and converter resolution. --- dlls/mf/tests/mf.c | 9 +- dlls/mf/topology_loader.c | 392 ++++++++++++++++------------------------------ 2 files changed, 135 insertions(+), 266 deletions(-)

1 0