December 2023 - Wine-Commits

Conor McCarthy : vkd3d: Update the descriptor `next` index before getting a reference for writing.
by Alexandre Julliard Dec. 14, 2023

Dec. 14, 2023

Module: vkd3d Branch: master Commit: 70962ae7d86297fd4b54cd5b9e2d2fd197f3a4b7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/70962ae7d86297fd4b54cd5b9e2d2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Jul 30 13:25:56 2023 +1000 vkd3d: Update the descriptor `next` index before getting a reference for writing. Fixes a race condition where the descriptor is modified between getting its object and resetting the `next` index. The new object would never be written. While it is invalid for the app to write descriptors used by a command list which has been submitted to a queue, unused descriptors may be written. This change also supports writing descriptors in a worker thread. --- libs/vkd3d/resource.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index abbdfbe2..0c9c911a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2632,20 +2632,18 @@ void d3d12_desc_flush_vk_heap_updates_locked(struct d3d12_descriptor_heap *descr for (; i != UINT_MAX; i = next) { src = &descriptors[i]; - next = (int)src->next >> 1; + next = vkd3d_atomic_exchange(&src->next, 0); + next = (int)next >> 1; + /* A race exists here between updating src->next and getting the current object. The best + * we can do is get the object last, which may result in a harmless rewrite later. */ u.object = d3d12_desc_get_object_ref(src, device); if (!u.object) - { - vkd3d_atomic_exchange(&src->next, 0); continue; - } writes.held_refs[writes.held_ref_count++] = u.object; d3d12_desc_write_vk_heap(descriptor_heap, i, &writes, u.object, device); - - vkd3d_atomic_exchange(&src->next, 0); } /* Avoid thunk calls wherever possible. */

1 0

Rémi Bernon : explorer: Handle WM_CLOSE for docked icons for when they lose embedding.
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: wine Branch: master Commit: 23ee9b29695d9c024cf05d9d3ffaa7594d005391 URL: https://gitlab.winehq.org/wine/wine/-/commit/23ee9b29695d9c024cf05d9d3ffaa7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 13 10:29:28 2023 +0100 explorer: Handle WM_CLOSE for docked icons for when they lose embedding. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56015 --- programs/explorer/systray.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 1af8a72de46..b012d3ffe72 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -478,6 +478,15 @@ static LRESULT WINAPI tray_icon_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPA break; } + case WM_CLOSE: + if (icon->display == ICON_DISPLAY_DOCKED) + { + TRACE( "icon %u no longer embedded\n", icon->id ); + hide_icon( icon ); + show_icon( icon ); + } + return 0; + case WM_CREATE: icon->window = hwnd; create_tooltip( icon );

1 0

Sven Baars : sapi/tests: Remove registry keys created by SetId().
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: wine Branch: master Commit: 8fa8ebaa479fb1aca840efdd0236697cde74cbad URL: https://gitlab.winehq.org/wine/wine/-/commit/8fa8ebaa479fb1aca840efdd023669… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Dec 13 16:25:01 2023 +0100 sapi/tests: Remove registry keys created by SetId(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55288 --- dlls/sapi/tests/token.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 8befd98c2a5..a7d164389d9 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -783,6 +783,8 @@ static void test_object_token(void) ISpObjectToken_Release( test_class_token ); IUnknown_Release( obj ); ISpObjectToken_Release( token ); + + RegDeleteTreeA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Winetest\\sapi" ); } START_TEST(token)

1 0

Rémi Bernon : server: Peek wine internal driver messages regardless of filter.
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: wine Branch: master Commit: 19ad5bd598d603617341cbb2beec90bd69fa6349 URL: https://gitlab.winehq.org/wine/wine/-/commit/19ad5bd598d603617341cbb2beec90… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 11 20:26:59 2023 +0100 server: Peek wine internal driver messages regardless of filter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55774 --- dlls/win32u/spy.c | 1 - dlls/wineandroid.drv/android.h | 2 +- dlls/winemac.drv/macdrv.h | 4 ++-- dlls/winewayland.drv/waylanddrv.h | 6 +++--- dlls/winex11.drv/x11drv.h | 4 ++-- include/ntuser.h | 4 ++-- server/queue.c | 5 +++++ 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/win32u/spy.c b/dlls/win32u/spy.c index ddeaba2d96f..20a57803cb6 100644 --- a/dlls/win32u/spy.c +++ b/dlls/win32u/spy.c @@ -1139,7 +1139,6 @@ static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = "WM_WINE_SETACTIVEWINDOW", "WM_WINE_KEYBOARD_LL_HOOK", "WM_WINE_MOUSE_LL_HOOK", - "WM_WINE_CLIPCURSOR", "WM_WINE_UPDATEWINDOWSTATE", }; diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 184fec8372b..e793d103788 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -125,7 +125,7 @@ extern MONITORINFOEXW default_monitor; enum android_window_messages { - WM_ANDROID_REFRESH = 0x80001000, + WM_ANDROID_REFRESH = WM_WINE_FIRST_DRIVER_MSG, }; extern void init_gralloc( const struct hw_module_t *module ); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index e1dd1c61b3f..b9cd9fde2ed 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -91,10 +91,10 @@ extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp); * Mac USER driver */ -/* Mac driver private messages, must be in the range 0x80001000..0x80001fff */ +/* Mac driver private messages */ enum macdrv_window_messages { - WM_MACDRV_SET_WIN_REGION = 0x80001000, + WM_MACDRV_SET_WIN_REGION = WM_WINE_FIRST_DRIVER_MSG, WM_MACDRV_RESET_DEVICE_METRICS, WM_MACDRV_DISPLAYCHANGE, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 5522d9df2d0..0883c43f1ff 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -59,9 +59,9 @@ extern struct wayland process_wayland; enum wayland_window_message { - WM_WAYLAND_INIT_DISPLAY_DEVICES = 0x80001000, - WM_WAYLAND_CONFIGURE = 0x80001001, - WM_WAYLAND_SET_FOREGROUND = 0x80001002, + WM_WAYLAND_INIT_DISPLAY_DEVICES = WM_WINE_FIRST_DRIVER_MSG, + WM_WAYLAND_CONFIGURE, + WM_WAYLAND_SET_FOREGROUND, }; enum wayland_surface_config_state diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9996b1f687d..c80e4b3d3c9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -585,10 +585,10 @@ extern void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ extern DWORD EVENT_x11_time_to_win32_time(Time time); -/* X11 driver private messages, must be in the range 0x80001000..0x80001fff */ +/* X11 driver private messages */ enum x11drv_window_messages { - WM_X11DRV_UPDATE_CLIPBOARD = 0x80001000, + WM_X11DRV_UPDATE_CLIPBOARD = WM_WINE_FIRST_DRIVER_MSG, WM_X11DRV_SET_WIN_REGION, WM_X11DRV_DESKTOP_RESIZED, WM_X11DRV_DELETE_TAB, diff --git a/include/ntuser.h b/include/ntuser.h index dd19c57221e..f23249ace5a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -488,10 +488,10 @@ enum wine_internal_message WM_WINE_SETACTIVEWINDOW, WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, - WM_WINE_CLIPCURSOR, - WM_WINE_SETCURSOR, WM_WINE_UPDATEWINDOWSTATE, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ + WM_WINE_CLIPCURSOR = 0x80001ff0, /* internal driver notification messages */ + WM_WINE_SETCURSOR, WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; diff --git a/server/queue.c b/server/queue.c index 0558bd111f9..9007438e082 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2762,6 +2762,11 @@ DECL_HANDLER(get_message) get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, req->flags, reply )) return; + /* check for any internal driver message */ + if (get_hardware_message( current, req->hw_id, get_win, WM_WINE_FIRST_DRIVER_MSG, + WM_WINE_LAST_DRIVER_MSG, req->flags, reply )) + return; + /* now check for WM_PAINT */ if ((filter & QS_PAINT) && queue->paint_count &&

1 0

Henri Verbeet : vkd3d-shader/ir: Pass a uint32_t write mask to vkd3d_write_mask_32_from_64().
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: vkd3d Branch: master Commit: 21491d1bbb168da8aeaa7bdde6e5f182b2205558 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/21491d1bbb168da8aeaa7bdde6e5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 22:42:32 2023 +0100 vkd3d-shader/ir: Pass a uint32_t write mask to vkd3d_write_mask_32_from_64(). --- libs/vkd3d-shader/d3d_asm.c | 2 +- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 2d52ee07..86ddd1ff 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1317,7 +1317,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, static const char write_mask_chars[] = "xyzw"; if (param->reg.data_type == VKD3D_DATA_DOUBLE) - write_mask = vkd3d_write_mask_32_from_64(write_mask); + write_mask = vsir_write_mask_32_from_64(write_mask); shader_addline(buffer, ".%s", compiler->colours.write_mask); if (write_mask & VKD3DSP_WRITEMASK_0) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8bb9ad9d..980c26bc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3932,7 +3932,7 @@ static uint32_t spirv_compiler_emit_load_reg(struct spirv_compiler *compiler, assert(reg_info.component_type != VKD3D_SHADER_COMPONENT_DOUBLE); spirv_compiler_emit_dereference_register(compiler, reg, &reg_info); - write_mask32 = (reg->data_type == VKD3D_DATA_DOUBLE) ? vkd3d_write_mask_32_from_64(write_mask) : write_mask; + write_mask32 = (reg->data_type == VKD3D_DATA_DOUBLE) ? vsir_write_mask_32_from_64(write_mask) : write_mask; /* Intermediate value (no storage class). */ if (reg_info.storage_class == SpvStorageClassMax) @@ -4149,7 +4149,7 @@ static void spirv_compiler_emit_store_reg(struct spirv_compiler *compiler, if (component_type != reg_info.component_type) { if (reg->data_type == VKD3D_DATA_DOUBLE) - src_write_mask = vkd3d_write_mask_32_from_64(write_mask); + src_write_mask = vsir_write_mask_32_from_64(write_mask); type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, vsir_write_mask_component_count(src_write_mask)); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 4fd6db0b..bdb7163e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1550,9 +1550,9 @@ static inline uint32_t vsir_write_mask_64_from_32(uint32_t write_mask32) return (write_mask64 & VKD3DSP_WRITEMASK_0) | ((write_mask64 & VKD3DSP_WRITEMASK_2) >> 1); } -static inline unsigned int vkd3d_write_mask_32_from_64(unsigned int write_mask64) +static inline uint32_t vsir_write_mask_32_from_64(uint32_t write_mask64) { - unsigned int write_mask32 = (write_mask64 | (write_mask64 << 1)) + uint32_t write_mask32 = (write_mask64 | (write_mask64 << 1)) & (VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_2); return write_mask32 | (write_mask32 << 1); }

1 0

Henri Verbeet : vkd3d-shader/ir: Pass a uint32_t write mask to vkd3d_write_mask_64_from_32().
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: vkd3d Branch: master Commit: 3759186193534f7bbd59b21f25b42e1ce026c0c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3759186193534f7bbd59b21f25b42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 22:39:12 2023 +0100 vkd3d-shader/ir: Pass a uint32_t write mask to vkd3d_write_mask_64_from_32(). --- libs/vkd3d-shader/tpf.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index d236c9f4..235e8552 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2231,7 +2231,7 @@ static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, cons } if (data_type == VKD3D_DATA_DOUBLE) - dst_param->write_mask = vkd3d_write_mask_64_from_32(dst_param->write_mask); + dst_param->write_mask = vsir_write_mask_64_from_32(dst_param->write_mask); /* Some scalar registers are declared with no write mask in shader bytecode. */ if (!dst_param->write_mask && shader_sm4_is_scalar_register(&dst_param->reg)) dst_param->write_mask = VKD3DSP_WRITEMASK_0; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a89248ef..4fd6db0b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1544,9 +1544,9 @@ static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int co return (VKD3DSP_WRITEMASK_0 << component_count) - 1; } -static inline unsigned int vkd3d_write_mask_64_from_32(DWORD write_mask32) +static inline uint32_t vsir_write_mask_64_from_32(uint32_t write_mask32) { - unsigned int write_mask64 = write_mask32 | (write_mask32 >> 1); + uint32_t write_mask64 = write_mask32 | (write_mask32 >> 1); return (write_mask64 & VKD3DSP_WRITEMASK_0) | ((write_mask64 & VKD3DSP_WRITEMASK_2) >> 1); }

1 0

Henri Verbeet : vkd3d-shader/ir: Pass a uint32_t write mask to vkd3d_write_mask_component_count().
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: vkd3d Branch: master Commit: 713adaa56af4f2f5db2d930a887e70d5c7c51408 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/713adaa56af4f2f5db2d930a887e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 22:35:37 2023 +0100 vkd3d-shader/ir: Pass a uint32_t write mask to vkd3d_write_mask_component_count(). --- libs/vkd3d-shader/ir.c | 2 +- libs/vkd3d-shader/spirv.c | 112 +++++++++++++++---------------- libs/vkd3d-shader/tpf.c | 5 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 61 insertions(+), 60 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/ir: Pass a uint32_t write mask to vkd3d_write_mask_get_component_idx().
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: vkd3d Branch: master Commit: e1aa12f94baa5e9c517829dc48a9475765a090ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e1aa12f94baa5e9c517829dc48a94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 22:19:07 2023 +0100 vkd3d-shader/ir: Pass a uint32_t write mask to vkd3d_write_mask_get_component_idx(). --- libs/vkd3d-shader/ir.c | 12 +++++----- libs/vkd3d-shader/spirv.c | 40 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-)

1 0

Giovanni Mascellani : tests: Test assigning multisampled textures with different sample counts.
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: vkd3d Branch: master Commit: 09235d9e09f33f1880fb426e52184e14d821e417 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/09235d9e09f33f1880fb426e52184… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 13 12:14:39 2023 +0100 tests: Test assigning multisampled textures with different sample counts. --- tests/hlsl/texture-load.shader_test | 66 +++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/tests/hlsl/texture-load.shader_test b/tests/hlsl/texture-load.shader_test index 8609828b..30a33a4a 100644 --- a/tests/hlsl/texture-load.shader_test +++ b/tests/hlsl/texture-load.shader_test @@ -51,3 +51,69 @@ probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1) probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8) probe (1, 1) rgba (0.8, 0.0, 0.7, 1.0) + +% The sample count only matters for the external definition in SM4-5; +% internally it doesn't, you can even avoid it + +[require] +shader model >= 4.0 +shader model < 6.0 + +[pixel shader] +static const int size = 2; +Texture2DMS<float4, size - 1> t; + +float4 main(float4 pos : sv_position) : sv_target +{ + Texture2DMS<float4, 4> s = t; + return s.Load(pos.yx, 0); +} + +[test] +draw quad +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) +probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1) +probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8) +probe (1, 1) rgba (0.8, 0.0, 0.7, 1.0) + +[pixel shader todo] +static const int size = 2; +Texture2DMS<float4, size - 1> t; + +float4 main(float4 pos : sv_position) : sv_target +{ + Texture2DMS<float4> s = t; + return s.Load(pos.yx, 0); +} + +[test] +todo draw quad +probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4) +probe (1, 0) rgba (0.6, 0.5, 0.2, 0.1) +probe (0, 1) rgba (0.5, 0.7, 0.6, 0.8) +probe (1, 1) rgba (0.8, 0.0, 0.7, 1.0) + +% SM6 is stricter instead + +[require] +shader model >= 6.0 + +[pixel shader fail] +static const int size = 2; +Texture2DMS<float4, size - 1> t; + +float4 main(float4 pos : sv_position) : sv_target +{ + Texture2DMS<float4, 4> s = t; + return s.Load(pos.yx, 0); +} + +[pixel shader fail] +static const int size = 2; +Texture2DMS<float4, size - 1> t; + +float4 main(float4 pos : sv_position) : sv_target +{ + Texture2DMS<float4> s = t; + return s.Load(pos.yx, 0); +}

1 0

Conor McCarthy : tests/shader-runner: Fix the arithmetic-int-uniform int64 abs expected results.
by Alexandre Julliard Dec. 13, 2023

Dec. 13, 2023

Module: vkd3d Branch: master Commit: af731024d7537e2751bc3559d36f95671eb6b045 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af731024d7537e2751bc3559d36f9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Dec 13 15:00:33 2023 +1000 tests/shader-runner: Fix the arithmetic-int-uniform int64 abs expected results. --- tests/hlsl/arithmetic-int-uniform.shader_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/hlsl/arithmetic-int-uniform.shader_test b/tests/hlsl/arithmetic-int-uniform.shader_test index 0463b27e..c1b0e8ab 100644 --- a/tests/hlsl/arithmetic-int-uniform.shader_test +++ b/tests/hlsl/arithmetic-int-uniform.shader_test @@ -195,4 +195,4 @@ float4 main() : SV_TARGET [test] uniform 0 int64_t2 5000000000 -7000000000 todo draw quad -probe all rgba (5.0, 7.0, 0.0, 10.0) +probe all rgba (5.0, 7.0, 0.0, 0.0)

1 0