December 2023 - Wine-Commits

Hans Leidekker : dnsapi/tests: Don't test extra records returned for CNAME query.
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: wine Branch: master Commit: f9542adb3895525cd2e4f1d4b580ae4f775a5309 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9542adb3895525cd2e4f1d4b580ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 11 13:52:47 2023 +0100 dnsapi/tests: Don't test extra records returned for CNAME query. It depends on DNS configuration. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54847 --- dlls/dnsapi/tests/query.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 51438924aa0..1412fdfa17b 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -180,19 +180,6 @@ static void test_DnsQuery(void) wcscpy(domain, L"winehq.org"); if (ptr->wType == DNS_TYPE_CNAME) ok(!wcscmp(domain, ptr->Data.CNAME.pNameHost), "expected CNAME target %s, got %s\n", wine_dbgstr_w(domain), wine_dbgstr_w(ptr->Data.CNAME.pNameHost)); - ptr = ptr->pNext; - - while (ptr) - { - if (ptr->wType != DNS_TYPE_OPT) - { - ok(wcscmp(domain, ptr->pName), "did not expect a record for %s\n", - wine_dbgstr_w(ptr->pName)); - ok(ptr->wType == DNS_TYPE_A || ptr->wType == DNS_TYPE_AAAA, - "unexpected record type %d\n", ptr->wType); - } - ptr = ptr->pNext; - } DnsRecordListFree(rec, DnsFreeRecordList); status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL);

1 0

Giovanni Mascellani : ci: Build vkd3d with SPIRV-Tools.
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: vkd3d Branch: master Commit: f087aa752d59ea3bb8875166b6dfb5e1357e1c20 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f087aa752d59ea3bb8875166b6dfb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Sep 25 15:45:36 2023 +0200 ci: Build vkd3d with SPIRV-Tools. --- gitlab/build-linux | 2 +- gitlab/build.yml | 4 ++-- gitlab/image.docker | 31 ++++++++++++++++++++++++++++++- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index 4a8c793b..d7e7573f 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -12,7 +12,7 @@ rm -fr build mkdir build cd build export LD_LIBRARY_PATH=/usr/local/lib -if ../configure --enable-demos DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ +if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ make -j$(nproc) ; then make -j$(nproc) check || \ touch ../tests_failed diff --git a/gitlab/build.yml b/gitlab/build.yml index 9695a304..9a19316b 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -48,7 +48,7 @@ build-radv-32: - amd-gpu variables: VK_LOADER_DRIVERS_SELECT: 'radeon_*' - CC: 'gcc -m32' + CC: 'i686-linux-gnu-gcc' VKD3D_SHADER_CONFIG: 'force_validation' build-llvmpipe-32: @@ -58,7 +58,7 @@ build-llvmpipe-32: - 2 variables: VK_LOADER_DRIVERS_SELECT: 'lvp_*' - CC: 'gcc -m32' + CC: 'i686-linux-gnu-gcc' VKD3D_SHADER_CONFIG: 'force_validation' build-crosstest: diff --git a/gitlab/image.docker b/gitlab/image.docker index 9b7b17b0..270c509b 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -2,6 +2,12 @@ WORKDIR /tmp +# Package spirv-tools from Debian has two problems for us: first, it +# doesn't have shared libraries; second, it's not multiarch. So we +# have to rebuild it with some tweaks. In order to make it multiarch +# we also have to drop the executables, but we don't care about those +# anyway. + RUN export DEBIAN_FRONTEND=noninteractive; \ echo 'path-exclude=/usr/share/doc/*' > /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \ echo 'path-exclude=/usr/share/locale/*' >> /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \ @@ -11,9 +17,10 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ echo 'exit 101' >> /usr/sbin/policy-rc.d && \ chmod +x /usr/sbin/policy-rc.d && \ dpkg --add-architecture i386 && \ + sed -i -e 's|Types: deb|Types: deb deb-src|g' /etc/apt/sources.list.d/* && \ apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y build-essential pkg-config gcc-multilib gcc-mingw-w64 \ + apt-get install -y build-essential pkg-config gcc-mingw-w64 crossbuild-essential-i386 \ autoconf automake libtool flex bison curl \ git ca-certificates rsync \ doxygen doxygen-latex graphviz \ @@ -27,6 +34,8 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libxcb-util-dev libxcb-util-dev:i386 \ libxcb-icccm4-dev libxcb-icccm4-dev:i386 \ libxcb-keysyms1-dev libxcb-keysyms1-dev:i386 && \ + apt-get build-dep -y spirv-tools && \ + apt-get build-dep -y -ai386 spirv-tools && \ git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git && \ cd wine && \ mkdir build && \ @@ -36,6 +45,26 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cp tools/widl/widl /usr/local/bin && \ cd ../.. && \ rm -rf wine && \ + apt-get source spirv-tools && \ + cd spirv-tools-* && \ + sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \ + sed -i -e 's|dh_install$|dh_install \&\& rm debian/spirv-tools/usr/bin/*|g' debian/rules && \ + sed -i '/Architecture: any/a Multi-Arch: same' debian/control && \ + dpkg-buildpackage -uc -us && \ + cd .. && \ + rm -f spirv-tools-dbgsym_*.deb && \ + dpkg -i spirv-tools_*.deb && \ + rm -fr * && \ + apt-get source spirv-tools && \ + cd spirv-tools-* && \ + sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \ + sed -i -e 's|dh_install$|dh_install \&\& rm debian/spirv-tools/usr/bin/*|g' debian/rules && \ + sed -i '/Architecture: any/a Multi-Arch: same' debian/control && \ + CONFIG_SITE=/etc/dpkg-cross/cross-config.amd64 DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -ai386 -Pcross,nocheck -uc -us && \ + cd .. && \ + rm -f spirv-tools-dbgsym_*.deb && \ + dpkg -i spirv-tools_*.deb && \ + rm -fr * && \ apt-get clean && \ curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2… | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \ groupadd host-render -g 800 && \

1 0

Giovanni Mascellani : vkd3d-shader/spirv: Honor force_validation after emitting SPIR-V code.
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: vkd3d Branch: master Commit: ec4986e9e28558d7bca2ad26eca122e03ebbae06 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ec4986e9e28558d7bca2ad26eca12… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Sep 25 15:00:12 2023 +0200 vkd3d-shader/spirv: Honor force_validation after emitting SPIR-V code. --- libs/vkd3d-shader/spirv.c | 45 +++++++++++++++++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 62ee1bef..b1710da6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -133,7 +133,7 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, } } -static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, +static bool vkd3d_spirv_validate(struct vkd3d_string_buffer *buffer, const struct vkd3d_shader_code *spirv, enum vkd3d_shader_spirv_environment environment) { spv_diagnostic diagnostic = NULL; @@ -145,12 +145,13 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, if ((ret = spvValidateBinary(context, spirv->code, spirv->size / sizeof(uint32_t), &diagnostic))) { - FIXME("Failed to validate SPIR-V binary, ret %d.\n", ret); - FIXME("Diagnostic message: %s.\n", debugstr_a(diagnostic->error)); + vkd3d_string_buffer_printf(buffer, "%s", diagnostic->error); } spvDiagnosticDestroy(diagnostic); spvContextDestroy(context); + + return !ret; } #else @@ -163,8 +164,11 @@ static enum vkd3d_result vkd3d_spirv_binary_to_text(const struct vkd3d_shader_co } static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_spirv_environment environment) {} -static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, - enum vkd3d_shader_spirv_environment environment) {} +static bool vkd3d_spirv_validate(struct vkd3d_string_buffer *buffer, const struct vkd3d_shader_code *spirv, + enum vkd3d_shader_spirv_environment environment) +{ + return true; +} #endif /* HAVE_SPIRV_TOOLS */ @@ -2403,6 +2407,8 @@ struct spirv_compiler struct ssa_register_info *ssa_register_info; unsigned int ssa_register_count; + + uint64_t config_flags; }; static bool is_in_default_phase(const struct spirv_compiler *compiler) @@ -2458,7 +2464,8 @@ static void spirv_compiler_destroy(struct spirv_compiler *compiler) static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *shader_version, struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info1 *scan_descriptor_info, - struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location) + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location, + uint64_t config_flags) { const struct shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct shader_signature *output_signature = &shader_desc->output_signature; @@ -2475,6 +2482,7 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve memset(compiler, 0, sizeof(*compiler)); compiler->message_context = message_context; compiler->location = *location; + compiler->config_flags = config_flags; if ((target_info = vkd3d_find_struct(compile_info->next, SPIRV_TARGET_INFO))) { @@ -9977,11 +9985,28 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, if (!vkd3d_spirv_compile_module(builder, spirv, spirv_compiler_get_entry_point_name(compiler))) return VKD3D_ERROR; - if (TRACE_ON()) + if (TRACE_ON() || parser->config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION) { enum vkd3d_shader_spirv_environment environment = spirv_compiler_get_target_environment(compiler); - vkd3d_spirv_dump(spirv, environment); - vkd3d_spirv_validate(spirv, environment); + struct vkd3d_string_buffer buffer; + + if (TRACE_ON()) + vkd3d_spirv_dump(spirv, environment); + + vkd3d_string_buffer_init(&buffer); + if (!vkd3d_spirv_validate(&buffer, spirv, environment)) + { + FIXME("Failed to validate SPIR-V binary.\n"); + vkd3d_shader_trace_text(buffer.buffer, buffer.content_size); + + if (compiler->config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION) + { + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_SHADER, + "Execution generated an invalid shader, failing compilation:\n%s", + buffer.buffer); + } + } + vkd3d_string_buffer_cleanup(&buffer); } if (compiler->failed) @@ -10008,7 +10033,7 @@ int spirv_compile(struct vkd3d_shader_parser *parser, int ret; if (!(spirv_compiler = spirv_compiler_create(&parser->shader_version, &parser->shader_desc, - compile_info, scan_descriptor_info, message_context, &parser->location))) + compile_info, scan_descriptor_info, message_context, &parser->location, parser->config_flags))) { ERR("Failed to create SPIR-V compiler.\n"); return VKD3D_ERROR; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 74f3e990..2eb8a448 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -96,6 +96,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_SPV_INVALID_TYPE = 2006, VKD3D_SHADER_ERROR_SPV_INVALID_HANDLER = 2007, VKD3D_SHADER_ERROR_SPV_NOT_IMPLEMENTED = 2008, + VKD3D_SHADER_ERROR_SPV_INVALID_SHADER = 2009, VKD3D_SHADER_WARNING_SPV_INVALID_SWIZZLE = 2300,

1 0

Giovanni Mascellani : vkd3d: Pad push constant ranges to 16 bytes.
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: vkd3d Branch: master Commit: a6317e5f3bcdff060ed7dab0edcba9e6a65215b5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a6317e5f3bcdff060ed7dab0edcba… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Dec 1 12:27:40 2023 +0100 vkd3d: Pad push constant ranges to 16 bytes. Because that's the granularity of Constant Buffer accesses in SM4. This commit requires using more push constants, but without it the generated SPIR-V can be invalid. --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index fc3187f4..9a039452 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -515,7 +515,7 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat assert(p->ShaderVisibility <= D3D12_SHADER_VISIBILITY_PIXEL); push_constants[p->ShaderVisibility].stageFlags = use_vk_heaps ? VK_SHADER_STAGE_ALL : stage_flags_from_visibility(p->ShaderVisibility); - push_constants[p->ShaderVisibility].size += p->u.Constants.Num32BitValues * sizeof(uint32_t); + push_constants[p->ShaderVisibility].size += align(p->u.Constants.Num32BitValues, 4) * sizeof(uint32_t); } if (push_constants[D3D12_SHADER_VISIBILITY_ALL].size) { @@ -564,7 +564,7 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat idx = push_constant_count == 1 ? 0 : p->ShaderVisibility; offset = push_constants_offset[idx]; - push_constants_offset[idx] += p->u.Constants.Num32BitValues * sizeof(uint32_t); + push_constants_offset[idx] += align(p->u.Constants.Num32BitValues, 4) * sizeof(uint32_t); root_signature->parameters[i].parameter_type = p->ParameterType; root_constant->stage_flags = push_constant_count == 1

1 0

Rémi Bernon : mf/tests: Workaround broken Win7 test_h264_decoder_concat_streams result.
by Alexandre Julliard Dec. 12, 2023

Dec. 12, 2023

Module: wine Branch: master Commit: d748440ea27dc7456ffa98ee76b0cb9302226583 URL: https://gitlab.winehq.org/wine/wine/-/commit/d748440ea27dc7456ffa98ee76b0cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 11 09:39:41 2023 +0100 mf/tests: Workaround broken Win7 test_h264_decoder_concat_streams result. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55638 --- dlls/mf/tests/transform.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index e228dcf12ac..f9e6b3b45cd 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4677,7 +4677,14 @@ static void test_h264_decoder_concat_streams(void) hr = IMFCollection_GetElementCount(output_samples, &output_count); ok(hr == S_OK, "GetElementCount returned %#lx\n", hr); - ok(output_count == 96, "GetElementCount returned %#lx\n", output_count); + ok(output_count == 96 || broken(output_count == 120) /* Win7 sometimes */, "GetElementCount returned %lu\n", output_count); + while (broken(output_count > 96)) /* Win7 sometimes */ + { + IMFSample *sample; + hr = IMFCollection_RemoveElement(output_samples, --output_count, (IUnknown **)&sample); + ok(hr == S_OK, "GetElementCount returned %#lx\n", hr); + IMFSample_Release(sample); + } ret = check_mf_sample_collection(output_samples, output_sample_desc, NULL); ok(ret == 0, "got %lu%% diff\n", ret);

1 0

Akihiro Sagawa : comctl32/tests: Store old DPI awareness context.
by Alexandre Julliard Dec. 12, 2023

Dec. 12, 2023

Module: wine Branch: master Commit: fad15dae939c51efca1c9f2b2229bdde83bbd9ab URL: https://gitlab.winehq.org/wine/wine/-/commit/fad15dae939c51efca1c9f2b2229bd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 12 21:13:37 2023 +0900 comctl32/tests: Store old DPI awareness context. --- dlls/comctl32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index d128c202c67..d2bb85b2d75 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -908,7 +908,7 @@ static void test_themed_background(void) pSetThreadDpiAwarenessContext = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "SetThreadDpiAwarenessContext"); if (pSetThreadDpiAwarenessContext) - pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); + old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); memset(&cls, 0, sizeof(cls)); cls.hInstance = GetModuleHandleA(0);

1 0

Alexandros Frantzis : winewayland.drv: Avoid transient deactivation of foreground thread.
by Alexandre Julliard Dec. 12, 2023

Dec. 12, 2023

Module: wine Branch: master Commit: 902884e6db333f72fae29f1bd4a98f826776496d URL: https://gitlab.winehq.org/wine/wine/-/commit/902884e6db333f72fae29f1bd4a98f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Dec 8 10:28:39 2023 +0200 winewayland.drv: Avoid transient deactivation of foreground thread. When updating the foreground window, even if both the old and new active window belong to the same non-current thread, the win32u code currently explicitly deactivates the old window. This will cause the transient deactivation of the foreground thread which can lead to undesirable side-effects (e.g., some apps may minimize when they become inactive). Until this is fixed in Wine core, use an internal driver message to ensure that we call NtUserSetForegroundWindow from the context of the new foreground window thread, to avoid the problematic behavior. --- dlls/winewayland.drv/wayland_keyboard.c | 7 ++++++- dlls/winewayland.drv/waylanddrv.h | 3 ++- dlls/winewayland.drv/window.c | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winewayland.drv/wayland_keyboard.c b/dlls/winewayland.drv/wayland_keyboard.c index ba6a66995a6..16ce2a2210b 100644 --- a/dlls/winewayland.drv/wayland_keyboard.c +++ b/dlls/winewayland.drv/wayland_keyboard.c @@ -717,7 +717,12 @@ static void keyboard_handle_enter(void *data, struct wl_keyboard *wl_keyboard, if ((surface = wayland_surface_lock_hwnd(hwnd))) { - if (surface->window.managed) NtUserSetForegroundWindow(hwnd); + /* TODO: Drop the internal message and call NtUserSetForegroundWindow + * directly once it's updated to not explicitly deactivate the old + * foreground window when both the old and new foreground windows + * are in the same non-current thread. */ + if (surface->window.managed) + NtUserPostMessage(hwnd, WM_WAYLAND_SET_FOREGROUND, 0, 0); pthread_mutex_unlock(&surface->mutex); } } diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index c6db31369b2..5522d9df2d0 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -60,7 +60,8 @@ extern struct wayland process_wayland; enum wayland_window_message { WM_WAYLAND_INIT_DISPLAY_DEVICES = 0x80001000, - WM_WAYLAND_CONFIGURE = 0x80001001 + WM_WAYLAND_CONFIGURE = 0x80001001, + WM_WAYLAND_SET_FOREGROUND = 0x80001002, }; enum wayland_surface_config_state diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index bb7f6ad6707..ac5da371e5c 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -628,6 +628,9 @@ LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) case WM_WAYLAND_CONFIGURE: wayland_configure_window(hwnd); return 0; + case WM_WAYLAND_SET_FOREGROUND: + NtUserSetForegroundWindow(hwnd); + return 0; default: FIXME("got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, (long)wp, lp); return 0;

1 0

Rémi Bernon : winebus: Return backend init status from bus_main_thread_start.
by Alexandre Julliard Dec. 12, 2023

Dec. 12, 2023

Module: wine Branch: master Commit: 31c61075be084b3f12a6d624bdc0e7e601345e3a URL: https://gitlab.winehq.org/wine/wine/-/commit/31c61075be084b3f12a6d624bdc0e7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 12 08:32:39 2023 +0100 winebus: Return backend init status from bus_main_thread_start. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54361 --- dlls/winebus.sys/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ae676f80565..e5adfed8611 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -542,6 +542,7 @@ struct bus_main_params void *init_args; HANDLE init_done; + NTSTATUS *init_status; unsigned int init_code; unsigned int wait_code; struct bus_event *bus_event; @@ -555,6 +556,7 @@ static DWORD CALLBACK bus_main_thread(void *args) TRACE("%s main loop starting\n", debugstr_w(bus.name)); status = winebus_call(bus.init_code, bus.init_args); + *bus.init_status = status; SetEvent(bus.init_done); TRACE("%s main loop started\n", debugstr_w(bus.name)); @@ -603,6 +605,7 @@ static DWORD CALLBACK bus_main_thread(void *args) static NTSTATUS bus_main_thread_start(struct bus_main_params *bus) { DWORD i = bus_count++, max_size; + NTSTATUS status; if (!(bus->init_done = CreateEventW(NULL, FALSE, FALSE, NULL))) { @@ -620,6 +623,7 @@ static NTSTATUS bus_main_thread_start(struct bus_main_params *bus) return STATUS_UNSUCCESSFUL; } + bus->init_status = &status; if (!(bus_thread[i] = CreateThread(NULL, 0, bus_main_thread, bus, 0, NULL))) { ERR("failed to create %s bus thread.\n", debugstr_w(bus->name)); @@ -630,7 +634,7 @@ static NTSTATUS bus_main_thread_start(struct bus_main_params *bus) WaitForSingleObject(bus->init_done, INFINITE); CloseHandle(bus->init_done); - return STATUS_SUCCESS; + return status; } static void sdl_bus_free_mappings(struct sdl_bus_options *options)

1 0

Hans Lehnert : gdiplus: Fix invalid pointer returned when failing to create font.
by Alexandre Julliard Dec. 12, 2023

Dec. 12, 2023

Module: wine Branch: master Commit: a03cbbdbe2cd50e1d6f113639be20edb562d4052 URL: https://gitlab.winehq.org/wine/wine/-/commit/a03cbbdbe2cd50e1d6f113639be20e… Author: Hans Lehnert <hans.lehnert(a)gmail.com> Date: Fri Dec 8 21:58:30 2023 -0800 gdiplus: Fix invalid pointer returned when failing to create font. --- dlls/gdiplus/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 4970043eb15..0dcfad34bbb 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -236,6 +236,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, if (stat != Ok) { free(*font); + *font = NULL; return NotTrueTypeFont; }

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Add an "internal" mode for the ASM dumper.
by Alexandre Julliard Dec. 12, 2023

Dec. 12, 2023

Module: vkd3d Branch: master Commit: 1015cc952e42828d79a68cfa0e659cac53772676 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1015cc952e42828d79a68cfa0e659… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 30 12:09:04 2023 +0100 vkd3d-shader/d3d-asm: Add an "internal" mode for the ASM dumper. The new mode exposes more details about what's going on inside the VSIR code and it's meant to ease development and debugging. --- libs/vkd3d-shader/d3d_asm.c | 38 +++++++++++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 8 ++++++- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 48355828..2d52ee07 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -364,6 +364,7 @@ struct vkd3d_d3d_asm_compiler struct vkd3d_string_buffer buffer; struct vkd3d_shader_version shader_version; struct vkd3d_d3d_asm_colours colours; + enum vsir_asm_dialect dialect; }; static int VKD3D_PRINTF_FUNC(2, 3) shader_addline(struct vkd3d_string_buffer *buffer, const char *format, ...) @@ -1277,6 +1278,32 @@ static void shader_print_non_uniform(struct vkd3d_d3d_asm_compiler *compiler, co compiler->colours.modifier, compiler->colours.reset); } +static void shader_dump_reg_type(struct vkd3d_d3d_asm_compiler *compiler, + const struct vkd3d_shader_register *reg) +{ + static const char *dimensions[] = + { + [VSIR_DIMENSION_NONE] = "", + [VSIR_DIMENSION_SCALAR] = "s:", + [VSIR_DIMENSION_VEC4] = "v4:", + }; + + struct vkd3d_string_buffer *buffer = &compiler->buffer; + const char *dimension; + + if (compiler->dialect != VSIR_ASM_VSIR) + return; + + if (reg->dimension < ARRAY_SIZE(dimensions)) + dimension = dimensions[reg->dimension]; + else + dimension = "??"; + + shader_addline(buffer, " <%s", dimension); + shader_dump_data_type(compiler, reg->data_type); + shader_addline(buffer, ">"); +} + static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_dst_param *param, bool is_declaration) { @@ -1306,6 +1333,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, shader_print_precision(compiler, &param->reg); shader_print_non_uniform(compiler, &param->reg); + shader_dump_reg_type(compiler, &param->reg); } static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, @@ -1379,6 +1407,7 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, shader_print_precision(compiler, &param->reg); shader_print_non_uniform(compiler, &param->reg); + shader_dump_reg_type(compiler, &param->reg); } static void shader_dump_ins_modifiers(struct vkd3d_d3d_asm_compiler *compiler, @@ -1924,10 +1953,13 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vkd3d_shader_instruction_array *instructions, const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *out) + struct vkd3d_shader_code *out, enum vsir_asm_dialect dialect) { enum vkd3d_shader_compile_option_formatting_flags formatting; - struct vkd3d_d3d_asm_compiler compiler; + struct vkd3d_d3d_asm_compiler compiler = + { + .dialect = dialect, + }; enum vkd3d_result result = VKD3D_OK; struct vkd3d_string_buffer *buffer; unsigned int indent, i, j; @@ -2053,7 +2085,7 @@ void vkd3d_shader_trace(const struct vkd3d_shader_instruction_array *instruction const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(instructions, shader_version, NULL, &code) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(instructions, shader_version, NULL, &code, VSIR_ASM_VSIR) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 88155502..2ee97e6c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1546,7 +1546,7 @@ static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, switch (compile_info->target_type) { case VKD3D_SHADER_TARGET_D3D_ASM: - ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out); + ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out, VSIR_ASM_D3D); break; case VKD3D_SHADER_TARGET_GLSL: @@ -1623,7 +1623,7 @@ static int compile_d3d_bytecode(const struct vkd3d_shader_compile_info *compile_ if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { - ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out); + ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out, VSIR_ASM_D3D); vkd3d_shader_parser_destroy(parser); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a69205f4..74f3e990 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1315,9 +1315,15 @@ struct vkd3d_string_buffer_cache size_t count, max_count, capacity; }; +enum vsir_asm_dialect +{ + VSIR_ASM_VSIR, + VSIR_ASM_D3D, +}; + enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vkd3d_shader_instruction_array *instructions, const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *out); + struct vkd3d_shader_code *out, enum vsir_asm_dialect dialect); void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list); void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer);

1 0