December 2023 - Wine-Commits

Conor McCarthy : vkd3d-shader: Introduce an instruction flag to suppress masking of bitwise shift counts.
by Alexandre Julliard Dec. 12, 2023

Dec. 12, 2023

Module: vkd3d Branch: master Commit: 192943255937bd0f9d0af50139118d04093b04b2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/192943255937bd0f9d0af50139118… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 22 23:58:44 2023 +1000 vkd3d-shader: Introduce an instruction flag to suppress masking of bitwise shift counts. DXIL does not use implicit masking of shift counts. --- libs/vkd3d-shader/d3d_asm.c | 6 ++++++ libs/vkd3d-shader/dxil.c | 6 ++++++ libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 82d1d71d..d7b406ac 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1577,6 +1577,12 @@ static void shader_dump_instruction_flags(struct vkd3d_d3d_asm_compiler *compile shader_addline(buffer, "p"); break; + case VKD3DSIH_ISHL: + case VKD3DSIH_ISHR: + case VKD3DSIH_USHR: + if (ins->flags & VKD3DSI_SHIFT_UNMASKED) + shader_addline(buffer, "_unmasked"); + /* fall through */ default: shader_dump_precise_flags(compiler, ins->flags); break; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4175a1af..602056e2 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3279,6 +3279,12 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco } else { + if (handler_idx == VKD3DSIH_ISHL || handler_idx == VKD3DSIH_ISHR || handler_idx == VKD3DSIH_USHR) + { + /* DXC emits AND instructions where necessary to mask shift counts. Shift binops + * do not imply masking the shift as the TPF equivalents do. */ + ins->flags |= VKD3DSI_SHIFT_UNMASKED; + } instruction_dst_param_init_ssa_scalar(ins, sm6); } } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a60246fd..945b9b48 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6764,8 +6764,8 @@ static enum vkd3d_result spirv_compiler_emit_alu_instruction(struct spirv_compil * Microsoft fxc will compile immediate constants larger than 5 bits. * Fixing up the constants would be more elegant, but the simplest way is * to let this handle constants too. */ - if (instruction->handler_idx == VKD3DSIH_ISHL || instruction->handler_idx == VKD3DSIH_ISHR - || instruction->handler_idx == VKD3DSIH_USHR) + if (!(instruction->flags & VKD3DSI_SHIFT_UNMASKED) && (instruction->handler_idx == VKD3DSIH_ISHL + || instruction->handler_idx == VKD3DSIH_ISHR || instruction->handler_idx == VKD3DSIH_USHR)) { uint32_t mask_id = spirv_compiler_get_constant_vector(compiler, VKD3D_SHADER_COMPONENT_UINT, vkd3d_write_mask_component_count(dst->write_mask), 0x1f); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 102d49a3..66c93f02 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -741,6 +741,7 @@ enum vkd3d_tessellator_domain #define VKD3DSI_RESINFO_UINT 0x2 #define VKD3DSI_SAMPLE_INFO_UINT 0x1 #define VKD3DSI_SAMPLER_COMPARISON_MODE 0x1 +#define VKD3DSI_SHIFT_UNMASKED 0x1 #define VKD3DSI_PRECISE_X 0x100 #define VKD3DSI_PRECISE_Y 0x200

1 0

Conor McCarthy : tests/shader-runner: Add 64-bit arithmetic tests.
by Alexandre Julliard Dec. 12, 2023

Dec. 12, 2023

Module: vkd3d Branch: master Commit: 27d4ccf225840f007aa8d0675db5d833d792e0c9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/27d4ccf225840f007aa8d0675db5d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Nov 23 00:11:41 2023 +1000 tests/shader-runner: Add 64-bit arithmetic tests. --- tests/hlsl/arithmetic-float-uniform.shader_test | 50 ++++++++++++++++ tests/hlsl/arithmetic-int-uniform.shader_test | 77 +++++++++++++++++++++++++ 2 files changed, 127 insertions(+) diff --git a/tests/hlsl/arithmetic-float-uniform.shader_test b/tests/hlsl/arithmetic-float-uniform.shader_test index 4812d053..75684cc6 100644 --- a/tests/hlsl/arithmetic-float-uniform.shader_test +++ b/tests/hlsl/arithmetic-float-uniform.shader_test @@ -90,3 +90,53 @@ float4 main() : SV_TARGET uniform 0 float4 1.0 0.0 0.0 0.0 draw quad probe all rgba (1e99, 1e99, 1e99, 1e99) + +[require] +shader model >= 5.0 +float64 + +[pixel shader todo] +uniform double2 a; + +float4 main() : SV_TARGET +{ + double x = a.x; + double y = a.y; + return float4(x + y, x - y, x * y, x / y); +} + +[test] +uniform 0 double2 7.5 -2.5 +todo(sm<6) draw quad +probe all rgba (5.0, 10.0, -18.75, -3.0) + +[pixel shader todo] +uniform double2 a; + +float4 main() : SV_TARGET +{ + double x = a.x; + double y = a.y; + return x * y; +} + +[test] +uniform 0 double2 3.0e-300 2.5e300 +todo(sm<6) draw quad +probe all rgba (7.5, 7.5, 7.5, 7.5) + +% Note: DXC does not support modulo on doubles. +[pixel shader todo] +uniform double2 a; + +float4 main() : SV_TARGET +{ + double x = a.x; + double y = a.y; + return x / y; +} + +[test] +uniform 0 double2 1.5e300 2.0e299 +todo(sm<6) draw quad +probe all rgba (7.5, 7.5, 7.5, 7.5) diff --git a/tests/hlsl/arithmetic-int-uniform.shader_test b/tests/hlsl/arithmetic-int-uniform.shader_test index 7f5cdaaa..0463b27e 100644 --- a/tests/hlsl/arithmetic-int-uniform.shader_test +++ b/tests/hlsl/arithmetic-int-uniform.shader_test @@ -119,3 +119,80 @@ uniform 0 float4 45.0 5.0 50.0 10.0 uniform 4 float4 3.0 8.0 2.0 5.0 draw quad probe all rgba (9.0, 5.0, 1.0, 3.0) + +[require] +shader model >= 6.0 +int64 + +[pixel shader] +uniform int64_t2 a; + +float4 main() : SV_TARGET +{ + int64_t x = a.x; + int64_t y = a.y; + return float4(x + y, x - y, x * (y >> 4), x / y); +} + +[test] +uniform 0 int64_t2 5000000000 16000000000 +todo draw quad +probe all rgba (21.0e9, -11.0e9, 5.0e18, 0.0) 1 + +[pixel shader] +uniform int64_t2 a; + +float4 main() : SV_TARGET +{ + int64_t x = a.x; + int64_t y = a.y; + return float4(x % y, +x, -x, y / x); +} + +[test] +uniform 0 int64_t2 5000000000 16000000000 +todo draw quad +probe all rgba (5.0e9, 5.0e9, -5.0e9, 3.0) + +[pixel shader] +uniform int64_t2 a; + +float4 main() : SV_TARGET +{ + int64_t x = a.x; + int64_t y = a.y; + return float4(x / y, -x / y, x / -y, -x / -y); +} + +[test] +uniform 0 int64_t2 42000000000 5000000000 +todo draw quad +probe all rgba (8.0, -8.0, -8.0, 8.0) + +[pixel shader] +uniform int64_t2 a; + +float4 main() : SV_TARGET +{ + int64_t x = a.x; + int64_t y = a.y; + return float4(x % y, -x % y, x % -y, -x % -y); +} + +[test] +uniform 0 int64_t2 42000000000 5000000000 +todo draw quad +probe all rgba (2.0e9, -2.0e9, 2.0e9, -2.0e9) + +[pixel shader] +uniform int64_t2 a; + +float4 main() : SV_TARGET +{ + return float4(abs(a), 0, 0); +} + +[test] +uniform 0 int64_t2 5000000000 -7000000000 +todo draw quad +probe all rgba (5.0, 7.0, 0.0, 10.0)

1 0

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

Dec. 11, 2023

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

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

Dec. 11, 2023

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 : winedump: Skip deleted vector in hash inside PDB header.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

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: Allow an extra stream index entry in PDB files.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

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

Fabian Maurer : gdiplus: Prevent uninitializd memory access (Coverity).
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: wine Branch: master Commit: 00692f5bf51dab8661ae06db90a29e312c753c2b URL: https://gitlab.winehq.org/wine/wine/-/commit/00692f5bf51dab8661ae06db90a29e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 10 19:39:03 2023 +0100 gdiplus: Prevent uninitializd memory access (Coverity). This fixes a regression by 69d815407d99 Originally this used GdipAlloc (calloc) --- dlls/gdiplus/metafile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index eb8b4197f3f..5c50d0d1d37 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3404,6 +3404,8 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { if (flags & 0x800) /* P */ { + points[0].X = 0; + points[0].Y = 0; for (i = 1; i < fill->Count; i++) { points[i].X = points[i - 1].X + fill->PointData.pointsR[i].X;

1 0

Alexandre Julliard : server: Leave some free space between modules in ASLR mode.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: wine Branch: master Commit: d96864eb4fbdbd384094b2c7754fc45a3a41d708 URL: https://gitlab.winehq.org/wine/wine/-/commit/d96864eb4fbdbd384094b2c7754fc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 11 17:49:15 2023 +0100 server: Leave some free space between modules in ASLR mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55993 --- server/mapping.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index b5684c484d2..a101110c76c 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1165,6 +1165,8 @@ static client_ptr_t assign_map_address( struct mapping *mapping ) if ((ret = get_fd_map_address( mapping->fd ))) return ret; + size += granularity_mask + 1; /* leave some free space between mappings */ + for (i = 0; i < range->count; i++) { if (range->free[i].size < size) continue;

1 0

Jacek Caban : configure: Enable -Wenum-conversion warnings.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: wine Branch: master Commit: c84812c86a76e53775a74cc8a06de4ef3d90a4c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c84812c86a76e53775a74cc8a06de4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 00:35:12 2023 +0100 configure: Enable -Wenum-conversion warnings. --- configure | 34 ++++++++++++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 35 insertions(+) diff --git a/configure b/configure index f06c761f6a3..c4c79ae8493 100755 --- a/configure +++ b/configure @@ -11529,6 +11529,40 @@ if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -Wabsolute-value" fi } + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wenum-conversion" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wenum-conversion" >&5 +printf %s "checking whether $CC supports -Wenum-conversion... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -Wenum-conversion" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void *__os_arm64x_dispatch_ret = 0; +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + as_fn_append ${wine_arch}_EXTRACFLAGS " -Wenum-conversion" +fi } case $wine_arch in i386) { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-fno-omit-frame-pointer" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index a8bb26a5092..cba55126869 100644 --- a/configure.ac +++ b/configure.ac @@ -998,6 +998,7 @@ This is an error since --enable-archs=$wine_arch was requested.])]) WINE_TRY_PE_CFLAGS([-Wpointer-arith]) WINE_TRY_PE_CFLAGS([-Wlogical-op]) WINE_TRY_PE_CFLAGS([-Wabsolute-value]) + WINE_TRY_PE_CFLAGS([-Wenum-conversion]) case $wine_arch in i386) WINE_TRY_PE_CFLAGS([-fno-omit-frame-pointer])

1 0

Jacek Caban : ntdll: Declare seh debug channel in signal_arm64ec.c.
by Alexandre Julliard Dec. 11, 2023

Dec. 11, 2023

Module: wine Branch: master Commit: 6ea417d33930e495679ad799d7ddb1b26b4452cb URL: https://gitlab.winehq.org/wine/wine/-/commit/6ea417d33930e495679ad799d7ddb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 10 20:40:36 2023 +0100 ntdll: Declare seh debug channel in signal_arm64ec.c. --- dlls/ntdll/signal_arm64ec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 9422bdefc0f..3d6bc39468d 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -34,6 +34,7 @@ #include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(unwind); +WINE_DECLARE_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay);

1 0