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

Jacek Caban : winevulkan: Move __wine_get_vulkan_driver call to Unix lib.
by Alexandre Julliard July 27, 2022

July 27, 2022

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: Prefer thread name from GetThreadDescription() in 'info thread' listing.
by Alexandre Julliard July 27, 2022

July 27, 2022

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

Rémi Bernon : win32u: Introduce new add_mode device manager callback.
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: 20414797edf900f61d198611e7e3cb09091bbe57 URL: https://gitlab.winehq.org/wine/wine/-/commit/20414797edf900f61d198611e7e3cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 7 00:20:19 2022 +0200 win32u: Introduce new add_mode device manager callback. And use it to enumerate display modes in winex11 and wineandroid. --- dlls/win32u/sysparams.c | 104 ++++++++++++++++++++++++++++++++++---------- dlls/wineandroid.drv/init.c | 6 +++ dlls/winemac.drv/display.c | 83 ++++++++++++++++++++++++++++++++++- dlls/winex11.drv/display.c | 16 +++++++ include/wine/gdi_driver.h | 1 + 5 files changed, 187 insertions(+), 23 deletions(-)

1 0

Brendan Shanks : winedbg: Prefer thread name from GetThreadDescription() in GDB proxy mode.
by Alexandre Julliard July 27, 2022

July 27, 2022

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

Rémi Bernon : mf: Better implement topology loader graph resolution.
by Alexandre Julliard July 27, 2022

July 27, 2022

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

Rémi Bernon : mf: Split MFCreateTopoLoader to topology_loader.c.
by Alexandre Julliard July 27, 2022

July 27, 2022

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

Nikolay Sivov : dwrite: Add Arabic fallback ranges.
by Alexandre Julliard July 27, 2022

July 27, 2022

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

Brendan Shanks : winedbg: Implement GDB qGetTIBAddr query.
by Alexandre Julliard July 27, 2022

July 27, 2022

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

Zebediah Figura : d3d8: Correctly check for sysmem index buffers in d3d8_device_ApplyStateBlock().
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: 764537c0c10c03e29089d21f6c36c29f0d821676 URL: https://gitlab.winehq.org/wine/wine/-/commit/764537c0c10c03e29089d21f6c36c2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 18 14:51:47 2022 -0500 d3d8: Correctly check for sysmem index buffers in d3d8_device_ApplyStateBlock(). This fixes a regression introduced by fc0f0090f6ba24cc68d2b04503977fbcebc1f96d. --- dlls/d3d8/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 068f53d8fdf..d6a5349367b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2032,9 +2032,10 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); const struct wined3d_stateblock_state *state; + struct d3d8_vertexbuffer *vertex_buffer; struct wined3d_stateblock *stateblock; + struct d3d8_indexbuffer *index_buffer; struct wined3d_buffer *wined3d_buffer; - struct d3d8_vertexbuffer *buffer; unsigned int i; TRACE("iface %p, token %#x.\n", iface, token); @@ -2062,13 +2063,13 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD for (i = 0; i < D3D8_MAX_STREAMS; ++i) { wined3d_buffer = state->streams[i].buffer; - if (!wined3d_buffer || !(buffer = wined3d_buffer_get_parent(wined3d_buffer))) + if (!wined3d_buffer || !(vertex_buffer = wined3d_buffer_get_parent(wined3d_buffer))) continue; - if (buffer->draw_buffer) + if (vertex_buffer->draw_buffer) device->sysmem_vb |= 1u << i; } device->sysmem_ib = (wined3d_buffer = state->index_buffer) - && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; + && (index_buffer = wined3d_buffer_get_parent(wined3d_buffer)) && index_buffer->sysmem; wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Correctly check for sysmem index buffers in d3d9_stateblock_Apply().
by Alexandre Julliard July 27, 2022

July 27, 2022

Module: wine Branch: master Commit: c885524cf6cd0b8d9a1bd8ea5c7812bb2f710f25 URL: https://gitlab.winehq.org/wine/wine/-/commit/c885524cf6cd0b8d9a1bd8ea5c7812… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 18 14:48:52 2022 -0500 d3d9: Correctly check for sysmem index buffers in d3d9_stateblock_Apply(). This fixes a regression introduced by 66f37aae7e25740857aeb8ea9c2f0395781389f5. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53372 --- dlls/d3d9/stateblock.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index c797ce54b49..2a0731437e3 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -113,9 +113,10 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + struct d3d9_vertexbuffer *vertex_buffer; struct wined3d_texture *wined3d_texture; + struct d3d9_indexbuffer *index_buffer; struct wined3d_buffer *wined3d_buffer; - struct d3d9_vertexbuffer *buffer; struct d3d9_texture *texture; struct d3d9_device *device; unsigned int i; @@ -136,13 +137,13 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { if (!(wined3d_buffer = device->stateblock_state->streams[i].buffer)) continue; - if (!(buffer = wined3d_buffer_get_parent(wined3d_buffer))) + if (!(vertex_buffer = wined3d_buffer_get_parent(wined3d_buffer))) continue; - if (buffer->draw_buffer) + if (vertex_buffer->draw_buffer) device->sysmem_vb |= 1u << i; } device->sysmem_ib = (wined3d_buffer = device->stateblock_state->index_buffer) - && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; + && (index_buffer = wined3d_buffer_get_parent(wined3d_buffer)) && index_buffer->sysmem; device->auto_mipmaps = 0; for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) {

1 0