January 2024 - Wine-Commits

Alexandre Julliard : readme: Convert to Markdown.
by Alexandre Julliard Jan. 3, 2024

Jan. 3, 2024

Module: wine Branch: master Commit: 158e9e7636486062113256f2b961785363fb28c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/158e9e7636486062113256f2b96178… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 3 12:05:10 2024 +0100 readme: Convert to Markdown. --- README => README.md | 93 ++++++++-------- documentation/{README.de => README-de.md} | 100 ++++++++--------- documentation/{README.es => README-es.md} | 103 ++++++++--------- documentation/{README.fi => README-fi.md} | 94 ++++++++-------- documentation/{README.fr => README-fr.md} | 101 ++++++++--------- documentation/{README.hu => README-hu.md} | 141 ++++++++---------------- documentation/{README.it => README-it.md} | 102 ++++++++--------- documentation/{README.ja => README-ja.md} | 113 +++++++++---------- documentation/{README.ko => README-ko.md} | 108 ++++++++---------- documentation/{README.nl => README-nl.md} | 102 +++++++++-------- documentation/{README.no => README-no.md} | 103 ++++++++--------- documentation/{README.pt => README-pt.md} | 127 ++++++++------------- documentation/{README.pt_br => README-pt_br.md} | 112 ++++++++----------- documentation/{README.ru => README-ru.md} | 98 ++++++++-------- documentation/{README.sv => README-sv.md} | 107 ++++++++---------- documentation/{README.tr => README-tr.md} | 113 +++++++++---------- documentation/{README.uk => README-uk.md} | 107 ++++++++---------- documentation/{README.zh_cn => README-zh_cn.md} | 97 ++++++++-------- 18 files changed, 860 insertions(+), 1061 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/ir: Rename the "immconst_uint" field of struct vkd3d_shader_register to "immconst_u32".
by Alexandre Julliard Jan. 3, 2024

Jan. 3, 2024

Module: vkd3d Branch: master Commit: e33d3b395403d6b59a3f54dec9a01d0638dcffc0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e33d3b395403d6b59a3f54dec9a01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 23:24:36 2023 +0100 vkd3d-shader/ir: Rename the "immconst_uint" field of struct vkd3d_shader_register to "immconst_u32". For consistency with the rest of vkd3d-shader; e.g. put_u32() and read_u32(). --- libs/vkd3d-shader/d3d_asm.c | 30 +++++++++++++++--------------- libs/vkd3d-shader/d3dbc.c | 2 +- libs/vkd3d-shader/dxil.c | 6 +++--- libs/vkd3d-shader/ir.c | 6 +++--- libs/vkd3d-shader/spirv.c | 6 +++--- libs/vkd3d-shader/tpf.c | 30 +++++++++++++++--------------- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 7 files changed, 41 insertions(+), 41 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/ir: Rename the "immconst_float" field of struct vkd3d_shader_register to "immconst_f32".
by Alexandre Julliard Jan. 3, 2024

Jan. 3, 2024

Module: vkd3d Branch: master Commit: 05a542ba006da07bd3510e9b0de5ca7fc4cbedca URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/05a542ba006da07bd3510e9b0de5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 23:29:04 2023 +0100 vkd3d-shader/ir: Rename the "immconst_float" field of struct vkd3d_shader_register to "immconst_f32". --- libs/vkd3d-shader/d3d_asm.c | 18 +++++++++--------- libs/vkd3d-shader/dxil.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 97a77696..22f63dc1 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1109,7 +1109,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const switch (reg->data_type) { case VKD3D_DATA_FLOAT: - shader_print_float_literal(compiler, "", reg->u.immconst_float[0], ""); + shader_print_float_literal(compiler, "", reg->u.immconst_f32[0], ""); break; case VKD3D_DATA_INT: shader_print_int_literal(compiler, "", reg->u.immconst_u32[0], ""); @@ -1129,10 +1129,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const switch (reg->data_type) { case VKD3D_DATA_FLOAT: - shader_print_float_literal(compiler, "", reg->u.immconst_float[0], ""); - shader_print_float_literal(compiler, ", ", reg->u.immconst_float[1], ""); - shader_print_float_literal(compiler, ", ", reg->u.immconst_float[2], ""); - shader_print_float_literal(compiler, ", ", reg->u.immconst_float[3], ""); + shader_print_float_literal(compiler, "", reg->u.immconst_f32[0], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[1], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[2], ""); + shader_print_float_literal(compiler, ", ", reg->u.immconst_f32[3], ""); break; case VKD3D_DATA_INT: shader_print_int_literal(compiler, "", reg->u.immconst_u32[0], ""); @@ -1882,10 +1882,10 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(buffer, " %sc%u%s", compiler->colours.reg, shader_get_float_offset(ins->dst[0].reg.type, ins->dst[0].reg.idx[0].offset), compiler->colours.reset); - shader_print_float_literal(compiler, " = ", ins->src[0].reg.u.immconst_float[0], ""); - shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_float[1], ""); - shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_float[2], ""); - shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_float[3], ""); + shader_print_float_literal(compiler, " = ", ins->src[0].reg.u.immconst_f32[0], ""); + shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_f32[1], ""); + shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_f32[2], ""); + shader_print_float_literal(compiler, ", ", ins->src[0].reg.u.immconst_f32[3], ""); break; case VKD3DSIH_DEFI: diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 30a39d94..679f7212 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2596,7 +2596,7 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const if (type->u.width == 16) FIXME("Half float type is not supported yet.\n"); else if (type->u.width == 32) - dst->u.reg.u.immconst_float[0] = bitcast_uint64_to_float(record->operands[0]); + dst->u.reg.u.immconst_f32[0] = bitcast_uint64_to_float(record->operands[0]); else if (type->u.width == 64) dst->u.reg.u.immconst_double[0] = bitcast_uint64_to_double(record->operands[0]); else diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c744e8d9..21be361e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -842,7 +842,7 @@ struct vkd3d_shader_register union { uint32_t immconst_u32[VKD3D_VEC4_SIZE]; - float immconst_float[VKD3D_VEC4_SIZE]; + float immconst_f32[VKD3D_VEC4_SIZE]; uint64_t immconst_uint64[VKD3D_DVEC2_SIZE]; double immconst_double[VKD3D_DVEC2_SIZE]; unsigned fp_body_idx;

1 0

Henri Verbeet : vkd3d-shader/ir: Rename the "immconst_uint64" field of struct vkd3d_shader_register to "immconst_u64".
by Alexandre Julliard Jan. 3, 2024

Jan. 3, 2024

Module: vkd3d Branch: master Commit: 7f94fda05cade237f061ac9f93e04a00be00959e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7f94fda05cade237f061ac9f93e04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 23:31:18 2023 +0100 vkd3d-shader/ir: Rename the "immconst_uint64" field of struct vkd3d_shader_register to "immconst_u64". --- libs/vkd3d-shader/dxil.c | 8 ++++---- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 679f7212..b414121b 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1886,9 +1886,9 @@ static unsigned int register_get_uint_value(const struct vkd3d_shader_register * if (reg->type == VKD3DSPR_IMMCONST64) { - if (reg->u.immconst_uint64[0] > UINT_MAX) + if (reg->u.immconst_u64[0] > UINT_MAX) FIXME("Truncating 64-bit value.\n"); - return reg->u.immconst_uint64[0]; + return reg->u.immconst_u64[0]; } return reg->u.immconst_u32[0]; @@ -1902,7 +1902,7 @@ static uint64_t register_get_uint64_value(const struct vkd3d_shader_register *re if (reg->dimension == VSIR_DIMENSION_VEC4) WARN("Returning vec4.x.\n"); - return (reg->type == VKD3DSPR_IMMCONST64) ? reg->u.immconst_uint64[0] : reg->u.immconst_u32[0]; + return (reg->type == VKD3DSPR_IMMCONST64) ? reg->u.immconst_u64[0] : reg->u.immconst_u32[0]; } static inline bool sm6_value_is_function_dcl(const struct sm6_value *value) @@ -2579,7 +2579,7 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const if (type->u.width <= 32) dst->u.reg.u.immconst_u32[0] = value & ((1ull << type->u.width) - 1); else - dst->u.reg.u.immconst_uint64[0] = value; + dst->u.reg.u.immconst_u64[0] = value; break; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0afc103e..7a33a570 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3724,14 +3724,14 @@ static uint32_t spirv_compiler_emit_load_constant64(struct spirv_compiler *compi if (reg->dimension == VSIR_DIMENSION_SCALAR) { for (i = 0; i < component_count; ++i) - values[i] = *reg->u.immconst_uint64; + values[i] = *reg->u.immconst_u64; } else { for (i = 0, j = 0; i < VKD3D_DVEC2_SIZE; ++i) { if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - values[j++] = reg->u.immconst_uint64[vsir_swizzle_get_component64(swizzle, i)]; + values[j++] = reg->u.immconst_u64[vsir_swizzle_get_component64(swizzle, i)]; } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 21be361e..a8068386 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -843,7 +843,7 @@ struct vkd3d_shader_register { uint32_t immconst_u32[VKD3D_VEC4_SIZE]; float immconst_f32[VKD3D_VEC4_SIZE]; - uint64_t immconst_uint64[VKD3D_DVEC2_SIZE]; + uint64_t immconst_u64[VKD3D_DVEC2_SIZE]; double immconst_double[VKD3D_DVEC2_SIZE]; unsigned fp_body_idx; } u;

1 0

Henri Verbeet : vkd3d-shader/ir: Rename the "immconst_double" field of struct vkd3d_shader_register to "immconst_f64".
by Alexandre Julliard Jan. 3, 2024

Jan. 3, 2024

Module: vkd3d Branch: master Commit: ed4f3f32720be2fa1457d352fc5c018118d1b785 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ed4f3f32720be2fa1457d352fc5c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 23:33:16 2023 +0100 vkd3d-shader/ir: Rename the "immconst_double" field of struct vkd3d_shader_register to "immconst_f64". --- libs/vkd3d-shader/d3d_asm.c | 4 ++-- libs/vkd3d-shader/dxil.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 22f63dc1..0589bc42 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1168,9 +1168,9 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const { if (reg->data_type == VKD3D_DATA_DOUBLE) { - shader_print_double_literal(compiler, "", reg->u.immconst_double[0], ""); + shader_print_double_literal(compiler, "", reg->u.immconst_f64[0], ""); if (reg->dimension == VSIR_DIMENSION_VEC4) - shader_print_double_literal(compiler, ", ", reg->u.immconst_double[1], ""); + shader_print_double_literal(compiler, ", ", reg->u.immconst_f64[1], ""); } else { diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index b414121b..46f3b1d4 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2598,7 +2598,7 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const else if (type->u.width == 32) dst->u.reg.u.immconst_f32[0] = bitcast_uint64_to_float(record->operands[0]); else if (type->u.width == 64) - dst->u.reg.u.immconst_double[0] = bitcast_uint64_to_double(record->operands[0]); + dst->u.reg.u.immconst_f64[0] = bitcast_uint64_to_double(record->operands[0]); else vkd3d_unreachable(); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a8068386..97de7cc0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -844,7 +844,7 @@ struct vkd3d_shader_register uint32_t immconst_u32[VKD3D_VEC4_SIZE]; float immconst_f32[VKD3D_VEC4_SIZE]; uint64_t immconst_u64[VKD3D_DVEC2_SIZE]; - double immconst_double[VKD3D_DVEC2_SIZE]; + double immconst_f64[VKD3D_DVEC2_SIZE]; unsigned fp_body_idx; } u; };

1 0

Eric Pouech : winedump: Better align fields in EXPORT table.
by Alexandre Julliard Jan. 2, 2024

Jan. 2, 2024

Module: wine Branch: master Commit: a2f98478c36908fd7a368cc633b6064aca053ab6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2f98478c36908fd7a368cc633b606… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Dec 28 10:53:55 2023 +0100 winedump: Better align fields in EXPORT table. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/pe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 6e9407f6070..c90a339e5ba 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -697,9 +697,9 @@ static void dump_dir_exported_functions(void) printf(" Ordinal base: %u\n", (UINT)dir->Base); printf(" # of functions: %u\n", (UINT)dir->NumberOfFunctions); printf(" # of Names: %u\n", (UINT)dir->NumberOfNames); - printf("Addresses of functions: %08X\n", (UINT)dir->AddressOfFunctions); - printf("Addresses of name ordinals: %08X\n", (UINT)dir->AddressOfNameOrdinals); - printf("Addresses of names: %08X\n", (UINT)dir->AddressOfNames); + printf(" Functions RVA: %08X\n", (UINT)dir->AddressOfFunctions); + printf(" Ordinals RVA: %08X\n", (UINT)dir->AddressOfNameOrdinals); + printf(" Names RVA: %08X\n", (UINT)dir->AddressOfNames); printf("\n"); printf(" Entry Pt Ordn Name\n"); @@ -716,7 +716,7 @@ static void dump_dir_exported_functions(void) for (i = 0; i < dir->NumberOfFunctions; i++) { if (!pFunc[i]) continue; - printf(" %08X %5u ", pFunc[i], (UINT)dir->Base + i); + printf(" %08X %5u ", pFunc[i], (UINT)dir->Base + i); if (funcs[i]) printf("%s", get_symbol_str((const char*)RVA(funcs[i], sizeof(DWORD)))); else

1 0

Esme Povirk : mscoree/tests: Add debug code for RemoveDirectory failure.
by Alexandre Julliard Jan. 2, 2024

Jan. 2, 2024

Module: wine Branch: master Commit: 24bc422c7d3698f85c720bb12e6be62898f0fae6 URL: https://gitlab.winehq.org/wine/wine/-/commit/24bc422c7d3698f85c720bb12e6be6… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Dec 30 17:46:18 2023 +0000 mscoree/tests: Add debug code for RemoveDirectory failure. --- dlls/mscoree/tests/mscoree.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index bfcbc78db55..33f5bfa905b 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -630,7 +630,7 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, PROCESS_INFORMATION pi; STARTUPINFOW si = { 0 }; WCHAR *ptr, *end; - DWORD exit_code = 0xdeadbeef; + DWORD exit_code = 0xdeadbeef, err; BOOL ret; ok(create_new_dir(tmpdir, L"loadpaths"), @@ -702,7 +702,31 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, while (ptr >= end && (ptr = wcsrchr(tmpdir, '\\'))) { ret = RemoveDirectoryW(tmpdir); - ok(ret, "RemoveDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), GetLastError()); + err = GetLastError(); + ok(ret, "RemoveDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), err); + + if (!ret && err == ERROR_DIR_NOT_EMPTY) + { + WIN32_FIND_DATAW fd; + HANDLE hfind; + + wcscat(tmpdir, L"\\*"); + hfind = FindFirstFileW(tmpdir, &fd); + while (hfind != INVALID_HANDLE_VALUE && (!wcscmp(fd.cFileName, L".") || !wcscmp(fd.cFileName, L".."))) + { + if (!FindNextFileW(hfind, &fd)) + { + FindClose(hfind); + hfind = INVALID_HANDLE_VALUE; + } + } + if (hfind != INVALID_HANDLE_VALUE) + { + trace("file %s still present in tmpdir\n", debugstr_w(fd.cFileName)); + FindClose(hfind); + } + } + *ptr = '\0'; } }

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard Jan. 2, 2024

Jan. 2, 2024

Module: wine Branch: master Commit: c6d45b314337e888f190ea90c3144625d39efb9d URL: https://gitlab.winehq.org/wine/wine/-/commit/c6d45b314337e888f190ea90c31446… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Jan 2 08:45:52 2024 +0900 po: Update Korean translation. --- po/ko.po | 173 +++++++++++++++++---------------------------------------------- 1 file changed, 45 insertions(+), 128 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/spirv: Decorate non-float32 non-built-in pixel shader inputs as Flat.
by Alexandre Julliard Jan. 2, 2024

Jan. 2, 2024

Module: vkd3d Branch: master Commit: 78343dcf87d3a911264c6c9a87a9146c43c859c3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/78343dcf87d3a911264c6c9a87a91… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Dec 19 13:50:46 2023 +1000 vkd3d-shader/spirv: Decorate non-float32 non-built-in pixel shader inputs as Flat. As per VUID-StandaloneSpirv-Flat-04744. Not strictly a regression, but revealed by 66cb2815f because it declares unused inputs. --- libs/vkd3d-shader/spirv.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a6ececab..7bc9bc47 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4298,14 +4298,18 @@ static void spirv_compiler_decorate_builtin(struct spirv_compiler *compiler, } static void spirv_compiler_emit_interpolation_decorations(struct spirv_compiler *compiler, - uint32_t id, enum vkd3d_shader_interpolation_mode mode) + enum vkd3d_shader_component_type component_type, uint32_t id, enum vkd3d_shader_interpolation_mode mode) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; switch (mode) { case VKD3DSIM_NONE: - break; + /* VUID-StandaloneSpirv-Flat-04744: integer or double types must be + * decorated 'Flat' for fragment shaders. */ + if (compiler->shader_type != VKD3D_SHADER_TYPE_PIXEL || component_type == VKD3D_SHADER_COMPONENT_FLOAT) + break; + /* fall through */ case VKD3DSIM_CONSTANT: vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); break; @@ -4901,7 +4905,8 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); - spirv_compiler_emit_interpolation_decorations(compiler, input_id, signature_element->interpolation_mode); + spirv_compiler_emit_interpolation_decorations(compiler, component_type, input_id, + signature_element->interpolation_mode); } var_id = input_id;

1 0

Henri Verbeet : tests: Print the failing line numbers when a test fails.
by Alexandre Julliard Jan. 2, 2024

Jan. 2, 2024

Module: vkd3d Branch: master Commit: 62f18f749bb65f20c635c1c722accb156d4825d2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/62f18f749bb65f20c635c1c722acc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 7 10:26:34 2023 -0600 tests: Print the failing line numbers when a test fails. Currently, if a probe fails, it will print the line number of the [test] block the probe is in, not the line number of the probe itself. This makes it somewhat difficult to debug. This commit makes it print the line number that a test fails at. --- tests/shader_runner.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 9b373e01..bac3a8f2 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1130,6 +1130,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o HRESULT expect_hr = S_OK; bool skip_tests = false; char line_buffer[256]; + const char *testname; FILE *f; if (!test_options.filename) @@ -1143,12 +1144,19 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o runner->minimum_shader_model = minimum_shader_model; runner->maximum_shader_model = maximum_shader_model; + if ((testname = strrchr(test_options.filename, '/'))) + ++testname; + else + testname = test_options.filename; + for (;;) { char *ret = fgets(line_buffer, sizeof(line_buffer), f); const char *line = line_buffer; - ++line_number; + if (line_number++) + vkd3d_test_pop_context(); + vkd3d_test_push_context("%s:%u", testname, line_number); if (!ret || line[0] == '[') { @@ -1298,9 +1306,6 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o } } - if (state != STATE_NONE) - vkd3d_test_pop_context(); - if (!ret) break; } @@ -1443,8 +1448,6 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o free(runner->input_elements[i].name); runner->input_element_count = 0; } - - vkd3d_test_push_context("Section %.*s, line %u", strlen(line_buffer) - 1, line_buffer, line_number); } else if (line[0] != '%' && line[0] != '\n') { @@ -1499,6 +1502,9 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o } } + if (line_number) + vkd3d_test_pop_context(); + for (i = 0; i < runner->input_element_count; ++i) free(runner->input_elements[i].name); free(runner->input_elements);

1 0