January 2023 - Wine-Commits

Alexandre Julliard : ntdll: Prefer the ntdll path over argv[0] on platforms without reliable exe information.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 8a6115f76f51f434d0380835b93bb4e4b31bd26f URL: https://gitlab.winehq.org/wine/wine/-/commit/8a6115f76f51f434d0380835b93bb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 26 10:37:48 2023 +0100 ntdll: Prefer the ntdll path over argv[0] on platforms without reliable exe information. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54371 --- dlls/ntdll/unix/loader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a1525cf7f93..2890e05c633 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -640,8 +640,6 @@ static void init_paths( char *argv[] ) bin_dir = realpath_dirname( path ); free( path ); } -#else - bin_dir = realpath_dirname( argv[0] ); #endif if (!bin_dir) bin_dir = build_path( dll_dir, DLL_TO_BINDIR ); data_dir = build_path( bin_dir, BIN_TO_DATADIR );

1 0

Alexandre Julliard : ntdll: Initialize a variable to silence a compiler warning.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: b6f58142f72b820b0863eed7fab452bb533c0433 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6f58142f72b820b0863eed7fab452… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 26 11:55:50 2023 +0100 ntdll: Initialize a variable to silence a compiler warning. --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 26302cfb376..f18181210aa 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1329,7 +1329,7 @@ NTSTATUS WINAPI RtlIdnToUnicode( DWORD flags, const WCHAR *src, INT srclen, WCHA int i, buflen, start, end, out_label, out = 0; NTSTATUS status; UINT buffer[64]; - WCHAR ch; + WCHAR ch = 0; if (!src || srclen < -1) return STATUS_INVALID_PARAMETER; if (srclen == -1) srclen = wcslen( src ) + 1;

1 0

Alexandre Julliard : scrobj: Initialize a variable to silence a compiler warning.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: bf0225753a051fbf6753570488396c528babd2f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf0225753a051fbf6753570488396c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 26 22:04:50 2023 +0100 scrobj: Initialize a variable to silence a compiler warning. --- dlls/scrobj/scrobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 90cf2024537..5056977624a 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1188,7 +1188,7 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis struct script_host *factory_host, *host; struct scriptlet_instance *obj; IDispatch *script_dispatch; - HRESULT hres; + HRESULT hres = S_OK; if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY;

1 0

Alexandre Julliard : shell32: Allocate the right size for an ITEMIDLIST.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 5260a81edc29d691a3e6d1f8eb10982de3b64246 URL: https://gitlab.winehq.org/wine/wine/-/commit/5260a81edc29d691a3e6d1f8eb1098… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 26 10:37:11 2023 +0100 shell32: Allocate the right size for an ITEMIDLIST. Spotted by Eric Pouech. --- dlls/shell32/shfldr_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index d47911dbef7..609a5c5ee6e 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -347,7 +347,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, /* Special case for the root folder. */ if (!wcsicmp( szPath, L"\\\\?\\unix\\" )) { - *ppidl = SHAlloc(sizeof(*ppidl)); + *ppidl = SHAlloc(sizeof(**ppidl)); if (!*ppidl) return E_FAIL; (*ppidl)->mkid.cb = 0; /* Terminate the ITEMIDLIST */ return S_OK;

1 0

Francisco Casas : tests: Test correct copy-prop object replacement.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 17888f6493c48a585994a235ea85e8135a0d0eed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/17888f6493c48a585994a235ea85e… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 23 15:22:40 2023 -0300 tests: Test correct copy-prop object replacement. --- tests/object-references.shader_test | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tests/object-references.shader_test b/tests/object-references.shader_test index 5e8e2641..0c203d5a 100644 --- a/tests/object-references.shader_test +++ b/tests/object-references.shader_test @@ -1,6 +1,43 @@ [require] shader model >= 4.0 + +[texture 0] +size (1, 1) +0.77 0.77 0.77 0.77 + +[texture 1] +size (1, 1) +0.64 0.64 0.64 0.64 + +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[pixel shader] +Texture2D t_good, t_bad; +sampler sam; + +float4 main() : sv_target +{ + Texture2D a, b[1]; + + // This is basically a 'b[0] = t_good' but so that the copy-prop is delayed + int4 co = {0, 0, 0, 0}; + b[(int) co.x + (int) co.y] = t_good; + + a = b[0]; + b[0] = t_bad; + + // 'a' should be 't_good', not 't_bad' at this point + return 100 * a.Sample(sam, float2(0, 0)) + t_good.Sample(sam, float2(0, 0)); +} + +[test] +draw quad +todo probe all rgba (77.77, 77.77, 77.77, 77.77) + + [texture 0] size (2, 2) 0.1 0.2 0.3 0.4 0.5 0.7 0.6 0.8

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Avoid infinite loop and invalid derefs in copy-prop.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: d2f8a576a83614eba93e87e9c2d3041b94d62ba0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d2f8a576a83614eba93e87e9c2d30… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 5 15:32:11 2023 -0300 vkd3d-shader/hlsl: Avoid infinite loop and invalid derefs in copy-prop. Co-authored-by: Francisco Casas <fcasas(a)codeweavers.com> Co-authored-by: Zebediah Figura <zfigura(a)codeweavers.com> Because copy_propagation_transform_object_load() replaces a deref instead of an instruction, it is currently prone to two problems: 1- It can replace a deref with the same deref, returning true every time and getting the compilation stuck in an endless loop of copy-propagation iterations. 2- When performed multiple times in the same deref, the second time it can replace the deref with a deref from a temp that is only valid in another point of the program execution, resulting in an incorrect value. This patch preempts this by avoiding replacing derefs when the new deref doesn't point to a uniform variable. Because, uniform variables cannot be written to. --- libs/vkd3d-shader/hlsl_codegen.c | 20 +++++++++++++++++++ tests/object-references.shader_test | 39 ++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 63002a5c..4fa860a6 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -927,6 +927,26 @@ static bool copy_propagation_transform_object_load(struct hlsl_ctx *ctx, /* Only HLSL_IR_LOAD can produce an object. */ load = hlsl_ir_load(value->node); + /* As we are replacing the instruction's deref (with the one in the hlsl_ir_load) and not the + * instruction itself, we won't be able to rely on the value retrieved by + * copy_propagation_get_value() for the new deref in subsequent iterations of copy propagation. + * This is because another value may be written to that deref between the hlsl_ir_load and + * this instruction. + * + * For this reason, we only replace the new deref when it corresponds to a uniform variable, + * which cannot be written to. + * + * In a valid shader, all object references must resolve statically to a single uniform object. + * If this is the case, we can expect copy propagation on regular store/loads and the other + * compilation passes to replace all hlsl_ir_loads with loads to uniform objects, so this + * implementation is complete, even with this restriction. + */ + if (!load->src.var->is_uniform) + { + TRACE("Ignoring load from non-uniform object variable %s\n", load->src.var->name); + return false; + } + hlsl_cleanup_deref(deref); hlsl_copy_deref(ctx, deref, &load->src); diff --git a/tests/object-references.shader_test b/tests/object-references.shader_test index 0c203d5a..bc74ccd4 100644 --- a/tests/object-references.shader_test +++ b/tests/object-references.shader_test @@ -1,3 +1,15 @@ +[pixel shader fail] +sampler sam; + +float4 main() : sv_target +{ + Texture2D tex; + + tex = tex; // Uninitialized assignment to self. + return tex.Sample(sam, float2(0, 0)); +} + + [require] shader model >= 4.0 @@ -35,7 +47,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (77.77, 77.77, 77.77, 77.77) +probe all rgba (77.77, 77.77, 77.77, 77.77) [texture 0] @@ -201,3 +213,28 @@ float4 main(Texture2D tex2) : sv_target tex2 = tex1; return tex2.Load(int3(0, 0, 0)); } + + +[require] +shader model >= 5.0 + + +[texture 0] +size (1, 1) +1.0 2.0 3.0 4.0 + +[pixel shader todo] +struct apple { + Texture2D tex; + float4 fo : COLOR; +}; + +float4 main(struct apple input) : sv_target +{ + input.tex = input.tex; // Assignment to self. + return input.tex.Load(int3(0, 0, 0)); +} + +[test] +todo draw quad +todo probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)

1 0

Zebediah Figura : tests: Add a test for compute thread IDs.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 809a43f06b56f146e71783420a752ce651f47ebf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/809a43f06b56f146e71783420a752… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 18:55:56 2021 -0500 tests: Add a test for compute thread IDs. --- tests/d3d12.c | 39 ------------ tests/d3d12_test_utils.h | 29 +++++++++ tests/hlsl_d3d12.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++ tests/utils.h | 10 +++ 4 files changed, 200 insertions(+), 39 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 thread ID registers.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 653cc02f4cd827140c243dc3e1773cf75fcd9011 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/653cc02f4cd827140c243dc3e1773… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 19:02:17 2021 -0500 vkd3d-shader/hlsl: Write SM4 thread ID registers. --- libs/vkd3d-shader/hlsl_sm4.c | 26 +++++++-- tests/hlsl-numthreads.shader_test | 4 +- tests/hlsl_d3d12.c | 115 +++++++++++++++++++------------------- 3 files changed, 78 insertions(+), 67 deletions(-)

1 0

Conor McCarthy : vkd3d-shader: Use the instruction array interface in scan_with_parser().
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 2559d622de2672a813af0a1b91dbbb9df29ed827 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2559d622de2672a813af0a1b91dbb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 20 12:23:27 2023 +1000 vkd3d-shader: Use the instruction array interface in scan_with_parser(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index fc7ccbf8..8c50e193 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1067,9 +1067,10 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser *parser) { struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info; - struct vkd3d_shader_instruction instruction; + struct vkd3d_shader_instruction *instruction; struct vkd3d_shader_scan_context context; - int ret; + int ret = VKD3D_OK; + unsigned int i; if ((scan_descriptor_info = vkd3d_find_struct(compile_info->next, SCAN_DESCRIPTOR_INFO))) { @@ -1084,30 +1085,17 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info vkd3d_shader_trace(parser); } - while (!vkd3d_shader_parser_is_end(parser)) + for (i = 0; i < parser->instructions.count; ++i) { - vkd3d_shader_parser_read_instruction(parser, &instruction); - - if (instruction.handler_idx == VKD3DSIH_INVALID) - { - WARN("Encountered unrecognized or invalid instruction.\n"); - if (scan_descriptor_info) - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); - ret = VKD3D_ERROR_INVALID_SHADER; - goto done; - } - - if ((ret = vkd3d_shader_scan_instruction(&context, &instruction)) < 0) + instruction = &parser->instructions.elements[i]; + if ((ret = vkd3d_shader_scan_instruction(&context, instruction)) < 0) { if (scan_descriptor_info) vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); - goto done; + break; } } - ret = parser->failed ? VKD3D_ERROR_INVALID_SHADER : VKD3D_OK; - -done: vkd3d_shader_scan_context_cleanup(&context); return ret; }

1 0

Conor McCarthy : vkd3d-shader/spirv: Pass a parser pointer to spirv_compiler_generate_spirv().
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: d14f42be9df3c4de8e7f674e43ae02d107a57792 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d14f42be9df3c4de8e7f674e43ae0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 20 12:58:57 2023 +1000 vkd3d-shader/spirv: Pass a parser pointer to spirv_compiler_generate_spirv(). --- libs/vkd3d-shader/spirv.c | 14 ++++++++++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 9 +-------- libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0d0515de..417cdc92 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9577,7 +9577,7 @@ static bool is_dcl_instruction(enum vkd3d_shader_opcode handler_idx) || handler_idx == VKD3DSIH_HS_DECLS; } -int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, +static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { int ret = VKD3D_OK; @@ -9934,12 +9934,22 @@ int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, } int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_parser *parser, + struct vkd3d_shader_code *spirv) { + const struct vkd3d_shader_instruction_array *instructions = &parser->instructions; const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; const struct vkd3d_shader_spirv_domain_shader_target_info *ds_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *phase; + enum vkd3d_result result = VKD3D_OK; + unsigned int i; + + for (i = 0; i < instructions->count; ++i) + { + if ((result = spirv_compiler_handle_instruction(compiler, &instructions->elements[i])) < 0) + return result; + } if ((phase = spirv_compiler_get_current_shader_phase(compiler))) spirv_compiler_leave_shader_phase(compiler, phase); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 012b3eb6..f5038eb7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1176,7 +1176,6 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info struct vkd3d_shader_compile_info scan_info; struct spirv_compiler *spirv_compiler; struct vkd3d_shader_parser *parser; - unsigned int i; int ret; scan_info = *compile_info; @@ -1234,13 +1233,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - for (i = 0; i < parser->instructions.count && ret >= 0; ++i) - { - ret = spirv_compiler_handle_instruction(spirv_compiler, &parser->instructions.elements[i]); - } - - if (ret >= 0) - ret = spirv_compiler_generate_spirv(spirv_compiler, compile_info, out); + ret = spirv_compiler_generate_spirv(spirv_compiler, compile_info, parser, out); spirv_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b5f45834..6c5a1917 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1144,10 +1144,9 @@ struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version * const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location); -int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, - const struct vkd3d_shader_instruction *instruction); int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_parser *parser, + struct vkd3d_shader_code *spirv); void spirv_compiler_destroy(struct spirv_compiler *compiler); void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]);

1 0