December 2023 - Wine-commits

Conor McCarthy : tests/shader-runner: Add 64-bit bitwise tests.
by Alexandre Julliard 12 Dec '23

12 Dec '23

Module: vkd3d Branch: master Commit: 108941fce0959b2fdbdb031bfdccbd4325ce2632 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/108941fce0959b2fdbdb031bfdccb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 22 17:08:04 2023 +1000 tests/shader-runner: Add 64-bit bitwise tests. --- tests/hlsl/bitwise.shader_test | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test index 20a9db55..6b4515e2 100644 --- a/tests/hlsl/bitwise.shader_test +++ b/tests/hlsl/bitwise.shader_test @@ -160,3 +160,88 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (0.0, 1.0, 1.0, 0.0) + + +[require] +shader model >= 6.0 +int64 + +[pixel shader] +int64_t2 a; +int2 s; + +float4 main() : sv_target +{ + int64_t x = a.x; + int64_t y = a.y; + int z = s.x; + int w = s.y; + + return float4(x >> y, x >> -y, x >> z, x >> w); +} + +[test] +uniform 0 int64_t2 9223372036854775807 -1 +uniform 4 int4 34 66 0 0 +todo draw quad +probe all rgba (0.0, 4.611686018e18, 536870912.0, 2.305843009e18) 1 +uniform 0 int64_t2 -1 -1 +uniform 4 int4 34 66 0 0 +todo draw quad +probe all rgba (-1.0, -1.0, -1.0, -1.0) 1 + +[pixel shader] +uint64_t2 a; +uint2 s; + +float4 main() : sv_target +{ + uint64_t x = a.x; + uint64_t y = a.y; + uint z = s.x; + uint w = s.y; + + return float4(x >> y, x >> -y, x >> z, x >> w); +} + +[test] +uniform 0 uint64_t2 0xffffffffffffffff 1 +uniform 4 uint4 34 66 0 0 +todo draw quad +probe all rgba (9.223372036e18, 1.0, 1073741823.0, 4.611686018e18) 1 + +[pixel shader] +uint64_t2 a; +uint2 s; + +float4 main() : sv_target +{ + uint64_t x = a.x; + uint64_t y = a.y; + uint z = s.x; + uint w = s.y; + + return float4(x << y, x << -y, x << z, x << w); +} + +[test] +uniform 0 uint64_t2 0x83 1 +uniform 4 uint4 34 66 0 0 +todo draw quad +probe all rgba (262.0, 9.223372036e18, 2250562863104.0, 524.0) 1 + +[pixel shader] +uint64_t2 a; + +float4 main() : sv_target +{ + uint64_t x = a.x; + uint64_t y = a.y; + + return float4(x ^ y, x & y, x | y, ~x); +} + +[test] +uniform 0 uint64_t2 0x300000000 0x500000000 +todo draw quad +probe all rgba (25769803776.0, 4294967296.0, 30064771072.0, 1.844674404e19) 1

1 0

Conor McCarthy : vkd3d-shader/spirv: Introduce a compiler feature flag for int64 capability.
by Alexandre Julliard 12 Dec '23

12 Dec '23

Module: vkd3d Branch: master Commit: cdb9eecfd18fa80c53a48f1b4fc2ea7f43508e3c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cdb9eecfd18fa80c53a48f1b4fc2e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Dec 6 00:12:56 2023 +1000 vkd3d-shader/spirv: Introduce a compiler feature flag for int64 capability. --- include/vkd3d_shader.h | 18 ++++++++++++++++++ libs/vkd3d-shader/spirv.c | 25 ++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 290f9085..a6bf8964 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -196,6 +196,14 @@ enum vkd3d_shader_compile_option_fragment_coordinate_origin VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN), }; +/** Advertises feature availability. \since 1.11 */ +enum vkd3d_shader_compile_option_feature_flags +{ + VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64 = 0x00000001, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLAGS), +}; + enum vkd3d_shader_compile_option_name { /** @@ -253,6 +261,16 @@ enum vkd3d_shader_compile_option_name * \since 1.10 */ VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN = 0x00000009, + /** + * This option specifies the shader features available in the target + * environment. These are not extensions, i.e. they are always supported + * by the driver, but may not be supported by the available hardware. + * + * \a value is a member of enum vkd3d_shader_compile_option_feature_flags. + * + * \since 1.11 + */ + VKD3D_SHADER_COMPILE_OPTION_FEATURE = 0x0000000a, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8e970506..62ee1bef 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2396,6 +2396,7 @@ struct spirv_compiler struct vkd3d_shader_spec_constant *spec_constants; size_t spec_constants_size; enum vkd3d_shader_compile_option_formatting_flags formatting; + enum vkd3d_shader_compile_option_feature_flags features; bool write_tess_geom_point_size; struct vkd3d_string_buffer_cache string_buffers; @@ -2553,6 +2554,10 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve WARN("Ignoring unrecognised value %#x for option %#x.\n", option->value, option->name); break; + case VKD3D_SHADER_COMPILE_OPTION_FEATURE: + compiler->features = option->value; + break; + default: WARN("Ignoring unrecognised option %#x with value %#x.\n", option->name, option->value); break; @@ -5528,9 +5533,16 @@ static void spirv_compiler_emit_dcl_global_flags(struct spirv_compiler *compiler if (flags & VKD3DSGF_ENABLE_INT64) { - FIXME("Unsupported 64-bit integer ops.\n"); - spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, - "Support for 64-bit integers is not implemented."); + if (compiler->features & VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64) + { + vkd3d_spirv_enable_capability(&compiler->spirv_builder, SpvCapabilityInt64); + } + else + { + WARN("Unsupported 64-bit integer ops.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "The target environment does not support 64-bit integers."); + } flags &= ~VKD3DSGF_ENABLE_INT64; } @@ -7147,6 +7159,13 @@ static void spirv_compiler_emit_int_div(struct spirv_compiler *compiler, div_op = instruction->handler_idx == VKD3DSIH_IDIV ? SpvOpSDiv : SpvOpUDiv; mod_op = instruction->handler_idx == VKD3DSIH_IDIV ? SpvOpSRem : SpvOpUMod; + if (dst[0].reg.data_type == VKD3D_DATA_UINT64 || dst[1].reg.data_type == VKD3D_DATA_UINT64) + { + FIXME("Unsupported 64-bit result.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "Bool cast to 64-bit integer is not supported."); + } + if (dst[0].reg.type != VKD3DSPR_NULL) { component_count = vkd3d_write_mask_component_count(dst[0].write_mask);

1 0

Eric Pouech : winedump: Don't fail on extra stream entry in PDB.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: 525f990e70a89503a90e6c354e1e5fd2938fa00d URL: https://gitlab.winehq.org/wine/wine/-/commit/525f990e70a89503a90e6c354e1e5f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Dec 11 11:40:04 2023 +0100 winedump: Don't fail on extra stream entry in PDB. Latest versions of MSVC use this. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 5e699d54e2c..a578cf7cbfa 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3809,6 +3809,7 @@ static BOOL pdb_process_internal(const struct process* pcs, /* no fpo ext stream in this case */ break; case sizeof(PDB_STREAM_INDEXES): + case sizeof(PDB_STREAM_INDEXES) + 2: psi = (PDB_STREAM_INDEXES*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + symbols.module_size + symbols.sectcontrib_size + symbols.segmap_size + symbols.srcmodule_size +

1 0

Eric Pouech : dbghelp: Allow an extra stream index entry in PDB files.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: 6d7839418ea9589dd7b83f97e9c6aba0b45e18dd URL: https://gitlab.winehq.org/wine/wine/-/commit/6d7839418ea9589dd7b83f97e9c6ab… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Dec 11 11:41:11 2023 +0100 dbghelp: Allow an extra stream index entry in PDB files. Latest MSVC version use this. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/pdb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 552fa4d8da8..adc0eadc738 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -762,6 +762,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader) sidx.sections_stream); break; case sizeof(PDB_STREAM_INDEXES): + case sizeof(PDB_STREAM_INDEXES) + 2: memcpy(&sidx, (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size +

1 0

Eric Pouech : winedump: Skip deleted vector in hash inside PDB header.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: 135b132dc2c3e3e8e1c04d771df4627e4c937902 URL: https://gitlab.winehq.org/wine/wine/-/commit/135b132dc2c3e3e8e1c04d771df462… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Dec 11 11:39:00 2023 +0100 winedump: Skip deleted vector in hash inside PDB header. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/pdb.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index adc0eadc738..c028f2df2b6 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -200,11 +200,7 @@ static unsigned get_stream_by_name(struct pdb_reader* reader, const char* name) /* bitfield: first dword is len (in dword), then data */ ok_bits = pdw; pdw += *ok_bits++ + 1; - if (*pdw++ != 0) - { - printf("unexpected value\n"); - return -1; - } + pdw += *pdw + 1; /* skip deleted vector */ for (i = 0; i < count; i++) { @@ -1195,11 +1191,7 @@ static void pdb_jg_dump_header_root(struct pdb_reader* reader) /* bitfield: first dword is len (in dword), then data */ ok_bits = pdw; pdw += *ok_bits++ + 1; - if (*pdw++ != 0) - { - printf("unexpected value\n"); - return; - } + pdw += *pdw + 1; /* skip deleted vector */ for (i = 0; i < count; i++) { @@ -1346,11 +1338,7 @@ static void pdb_ds_dump_header_root(struct pdb_reader* reader) /* bitfield: first dword is len (in dword), then data */ ok_bits = pdw; pdw += *ok_bits++ + 1; - if (*pdw++ != 0) - { - printf("unexpected value\n"); - return; - } + pdw += *pdw + 1; /* skip deleted vector */ for (i = 0; i < count; i++) {

1 0

Eric Pouech : dbghelp: Skip deleted vector in hash inside PDB header.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: f2d98ea7cf2793930a093d673fe56787418069e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2d98ea7cf2793930a093d673fe567… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Dec 11 11:39:31 2023 +0100 dbghelp: Skip deleted vector in hash inside PDB header. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a578cf7cbfa..7f695928e4a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3159,11 +3159,7 @@ static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha /* bitfield: first dword is len (in dword), then data */ ok_bits = pdw; pdw += *ok_bits++ + 1; - if (*pdw++ != 0) - { - FIXME("unexpected value\n"); - return FALSE; - } + pdw += *pdw + 1; /* skip deleted vector */ for (i = j = 0; i < count; i++) {

1 0

Bartosz Kosiorek : po: Update Polish translation.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: a56954faf4094d20cf3f065151cae50e29b7701d URL: https://gitlab.winehq.org/wine/wine/-/commit/a56954faf4094d20cf3f065151cae5… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Dec 9 01:49:11 2023 +0100 po: Update Polish translation. --- po/pl.po | 521 +++++++++++++++++---------------------------------------------- 1 file changed, 140 insertions(+), 381 deletions(-)

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: f43246a389424a3df056b13d5aa13bd00a0cbee0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f43246a389424a3df056b13d5aa13b… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Mon Dec 11 21:49:54 2023 +0100 po: Update Dutch translation. --- po/nl.po | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/po/nl.po b/po/nl.po index d9b8385978d..f35f6a7c201 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-11-09 19:50+0100\n" +"PO-Revision-Date: 2023-12-11 19:30+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -12647,10 +12647,8 @@ msgid "Duplex:" msgstr "Dubbelzijdig:" #: dlls/wineps.drv/wineps.rc:45 -#, fuzzy -#| msgid "&Tray:" msgid "Paper &Tray:" -msgstr "La&de:" +msgstr "Papierla&de:" #: dlls/wininet/wininet.rc:53 dlls/wininet/wininet.rc:73 msgid "Realm" @@ -14778,17 +14776,15 @@ msgid "&Run..." msgstr "&Uitvoeren..." #: programs/explorer/explorer.rc:36 -#, fuzzy -#| msgid "E&xit Windows" msgid "E&xit desktop" -msgstr "Windows &afsluiten" +msgstr "&Scherm sluiten" #: programs/explorer/explorer.rc:37 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "" "Are you sure you want to close all programs and exit the virtual desktop?" -msgstr "Moeten deze waarden verwijderd worden?" +msgstr "" +"Alle programma's en het virtuele bureaublad worden afgesloten.\n" +"Doorgaan?" #: programs/findstr/findstr.rc:28 msgid "Usage: findstr /options string\n"

1 0

Alexandros Frantzis : winewayland.drv: Avoid deadlock when determining whether a window is managed.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: a71ec54df817ee721fd1026832d968ce234ced9d URL: https://gitlab.winehq.org/wine/wine/-/commit/a71ec54df817ee721fd1026832d968… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Dec 11 08:55:07 2023 +0200 winewayland.drv: Avoid deadlock when determining whether a window is managed. The is_window_managed function may acquire the (non-recursive) win_data lock internally (is_window_managed->has_owned_popups->is_managed), so do not call it with the win_data lock held. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55995 --- dlls/winewayland.drv/window.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 4775b64fa76..bb7f6ad6707 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -463,17 +463,23 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *visible_rect, const RECT *valid_rects, struct window_surface *surface) { - struct wayland_win_data *data = wayland_win_data_get(hwnd); + struct wayland_win_data *data; + BOOL managed; TRACE("hwnd %p window %s client %s visible %s after %p flags %08x\n", hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), wine_dbgstr_rect(visible_rect), insert_after, swp_flags); - if (!data) return; + /* Get the managed state with win_data unlocked, as is_window_managed + * may need to query win_data information about other HWNDs and thus + * acquire the lock itself internally. */ + managed = is_window_managed(hwnd, swp_flags, window_rect); + + if (!(data = wayland_win_data_get(hwnd))) return; data->window_rect = *window_rect; data->client_rect = *client_rect; - data->managed = is_window_managed(hwnd, swp_flags, window_rect); + data->managed = managed; if (surface) window_surface_add_ref(surface); if (data->window_surface) window_surface_release(data->window_surface);

1 0

Jacek Caban : dwrite: Explicitly cast DWRITE_FONT_STRETCH to float in init_font_prop_vec.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: e4ee1ffeb9e5ef562de3883352c325e8cb2b0b1e URL: https://gitlab.winehq.org/wine/wine/-/commit/e4ee1ffeb9e5ef562de3883352c325… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 00:43:01 2023 +0100 dwrite: Explicitly cast DWRITE_FONT_STRETCH to float in init_font_prop_vec. --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6a3e49dcc58..2028440ca8e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -685,7 +685,7 @@ static void init_font_prop_vec(DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STRETCH st struct dwrite_font_propvec *vec) { vec->stretch = ((INT32)stretch - DWRITE_FONT_STRETCH_NORMAL) * 11.0f; - vec->style = style * 7.0f; + vec->style = (float)style * 7.0f; vec->weight = ((INT32)weight - DWRITE_FONT_WEIGHT_NORMAL) / 100.0f * 5.0f; }

1 0