January 2024 - Wine-commits

Henri Verbeet : vkd3d-shader/tpf: Store the "addressing" token as a uint32_t in shader_sm4_read_param().
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: c5facd4e031471fd267a14a031619b67ccdde482 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5facd4e031471fd267a14a031619… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 17:05:39 2024 +0100 vkd3d-shader/tpf: Store the "addressing" token as a uint32_t in shader_sm4_read_param(). --- libs/vkd3d-shader/tpf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 200fbc62..5c95c363 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -1759,11 +1759,11 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui const struct vkd3d_sm4_register_type_info *register_type_info; enum vkd3d_shader_register_type vsir_register_type; enum vkd3d_sm4_register_precision precision; + uint32_t token, order, extended, addressing; enum vkd3d_sm4_register_type register_type; enum vkd3d_sm4_extended_operand_type type; - enum vkd3d_sm4_register_modifier m; enum vkd3d_sm4_dimension sm4_dimension; - uint32_t token, order, extended; + enum vkd3d_sm4_register_modifier m; if (*ptr >= end) { @@ -1861,7 +1861,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui if (order >= 1) { - DWORD addressing = (token & VKD3D_SM4_ADDRESSING_MASK0) >> VKD3D_SM4_ADDRESSING_SHIFT0; + addressing = (token & VKD3D_SM4_ADDRESSING_MASK0) >> VKD3D_SM4_ADDRESSING_SHIFT0; if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[0]))) { ERR("Failed to read register index.\n"); @@ -1871,7 +1871,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui if (order >= 2) { - DWORD addressing = (token & VKD3D_SM4_ADDRESSING_MASK1) >> VKD3D_SM4_ADDRESSING_SHIFT1; + addressing = (token & VKD3D_SM4_ADDRESSING_MASK1) >> VKD3D_SM4_ADDRESSING_SHIFT1; if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[1]))) { ERR("Failed to read register index.\n"); @@ -1881,7 +1881,7 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui if (order >= 3) { - DWORD addressing = (token & VKD3D_SM4_ADDRESSING_MASK2) >> VKD3D_SM4_ADDRESSING_SHIFT2; + addressing = (token & VKD3D_SM4_ADDRESSING_MASK2) >> VKD3D_SM4_ADDRESSING_SHIFT2; if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[2]))) { ERR("Failed to read register index.\n");

1 0

Henri Verbeet : vkd3d-shader/tpf: Store the current token as a uint32_t in shader_sm4_read_src_param().
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: fd854bc0c09d2b0f81926547a508836b810acc3b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd854bc0c09d2b0f81926547a5088… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 17:10:07 2024 +0100 vkd3d-shader/tpf: Store the current token as a uint32_t in shader_sm4_read_src_param(). --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 5c95c363..74e086c3 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2075,7 +2075,7 @@ static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, cons const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) { unsigned int dimension, mask; - DWORD token; + uint32_t token; if (*ptr >= end) {

1 0

Henri Verbeet : vkd3d-shader/tpf: Store the current token as a uint32_t in shader_sm4_read_dst_param().
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: b8903f55269186f016cfa5fc9b8c12735791989f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b8903f55269186f016cfa5fc9b8c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 22:43:57 2024 +0100 vkd3d-shader/tpf: Store the current token as a uint32_t in shader_sm4_read_dst_param(). --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 74e086c3..c7b19a09 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2162,7 +2162,7 @@ static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, cons enum vkd3d_sm4_swizzle_type swizzle_type; enum vkd3d_shader_src_modifier modifier; unsigned int dimension, swizzle; - DWORD token; + uint32_t token; if (*ptr >= end) {

1 0

Henri Verbeet : vkd3d-shader/tpf: Store the "recognized_bits" mask as a uint32_t in shader_sm4_read_instruction_modifier().
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: ad2af68d2aaa4c8eff1893be0bf55018f2fa8f85 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ad2af68d2aaa4c8eff1893be0bf55… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 22:46:09 2024 +0100 vkd3d-shader/tpf: Store the "recognized_bits" mask as a uint32_t in shader_sm4_read_instruction_modifier(). --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c7b19a09..40bd91e5 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2250,7 +2250,7 @@ static void shader_sm4_read_instruction_modifier(uint32_t modifier, struct vkd3d { case VKD3D_SM4_MODIFIER_AOFFIMMI: { - static const DWORD recognized_bits = VKD3D_SM4_INSTRUCTION_MODIFIER + static const uint32_t recognized_bits = VKD3D_SM4_INSTRUCTION_MODIFIER | VKD3D_SM4_MODIFIER_MASK | VKD3D_SM4_AOFFIMMI_U_MASK | VKD3D_SM4_AOFFIMMI_V_MASK

1 0

Henri Verbeet : vkd3d-shader/tpf: Store the "precise" mask as a uint32_t in shader_sm4_read_instruction().
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: 68b898fcb6b4ab2a9660f35edf3554465ab0efbe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/68b898fcb6b4ab2a9660f35edf355… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 10 22:49:28 2024 +0100 vkd3d-shader/tpf: Store the "precise" mask as a uint32_t in shader_sm4_read_instruction(). --- libs/vkd3d-shader/tpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 40bd91e5..1f1944bc 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2334,9 +2334,9 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_sm4_parser *sm4, str struct vkd3d_shader_src_param *src_params; const uint32_t **ptr = &sm4->ptr; unsigned int i, len; - size_t remaining; const uint32_t *p; - DWORD precise; + uint32_t precise; + size_t remaining; if (*ptr >= sm4->end) {

1 0

Rémi Bernon : gitlab: Force WINETEST_ARGS to always be a string array.
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: wine Branch: master Commit: a6b58a2c1fe4951348c788d637acf768aed4d908 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6b58a2c1fe4951348c788d637acf7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 15 08:59:06 2024 +0100 gitlab: Force WINETEST_ARGS to always be a string array. Fixes the test name passed to winetest.exe which is otherwise split into a character array when there's a single line in the winetest.args file, and then causes it to miss the test and always return success. --- tools/gitlab/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 756c4a41ae5..92c14d83996 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -79,7 +79,7 @@ test-win10-21h2-32: tags: - win10-21h2 script: - - $WINETEST_ARGS = Get-Content ./winetest.args + - $WINETEST_ARGS = @(Get-Content ./winetest.args) - if ($WINETEST_ARGS.count -gt 0) { ./winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL @WINETEST_ARGS >winetest.log } else { echo $null >winetest.log } after_script: - Get-Content ./winetest.log @@ -100,7 +100,7 @@ test-win10-21h2-64: tags: - win10-21h2 script: - - $WINETEST_ARGS = Get-Content ./winetest.args + - $WINETEST_ARGS = @(Get-Content ./winetest.args) - if ($WINETEST_ARGS.count -gt 0) { ./winetest64.exe -q -q -o - -t gitlab -u $CI_JOB_URL @WINETEST_ARGS >winetest.log } else { echo $null >winetest.log } after_script: - Get-Content ./winetest.log

1 0

Conor McCarthy : vkd3d-shader/spirv: Support vector source param for FIRSTBIT_HI and FIRSTBIT_SHI instructions.
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: 52902b042fbfa0dd96fb56d3211e911fdf6df3f4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/52902b042fbfa0dd96fb56d3211e9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 10 15:34:16 2024 +1000 vkd3d-shader/spirv: Support vector source param for FIRSTBIT_HI and FIRSTBIT_SHI instructions. --- libs/vkd3d-shader/spirv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 87d7c360..067ba1b2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6907,8 +6907,8 @@ static void spirv_compiler_emit_ext_glsl_instruction(struct spirv_compiler *comp const struct vkd3d_shader_src_param *src = instruction->src; uint32_t src_id[SPIRV_MAX_SRC_COUNT]; uint32_t instr_set_id, type_id, val_id; + unsigned int i, component_count; enum GLSLstd450 glsl_inst; - unsigned int i; glsl_inst = spirv_compiler_map_ext_glsl_instruction(instruction); if (glsl_inst == GLSLstd450Bad) @@ -6934,8 +6934,9 @@ static void spirv_compiler_emit_ext_glsl_instruction(struct spirv_compiler *comp || instruction->handler_idx == VKD3DSIH_FIRSTBIT_SHI) { /* In D3D bits are numbered from the most significant bit. */ + component_count = vsir_write_mask_component_count(dst->write_mask); val_id = vkd3d_spirv_build_op_isub(builder, type_id, - spirv_compiler_get_constant_uint(compiler, 31), val_id); + spirv_compiler_get_constant_uint_vector(compiler, 31, component_count), val_id); } spirv_compiler_emit_store_dst(compiler, dst, val_id);

1 0

Conor McCarthy : tests/d3d12: Test vector parameter for countbits() and firstbithigh() in test_shader_instructions().
by Alexandre Julliard 15 Jan '24

15 Jan '24

Module: vkd3d Branch: master Commit: c5bc28b454b09fdea17ba047c6e56de12cd27fb0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5bc28b454b09fdea17ba047c6e56… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 10 15:37:33 2024 +1000 tests/d3d12: Test vector parameter for countbits() and firstbithigh() in test_shader_instructions(). --- tests/d3d12.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 427e59c2..0edad708 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9157,6 +9157,28 @@ static void test_shader_instructions(void) 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, }; static struct named_shader ps_bits = {"bits", ps_bits_code, sizeof(ps_bits_code)}; + static const DWORD ps_bits_vector_code[] = + { +#if 0 + uint2 u; + + uint4 main() : SV_Target + { + return uint4(countbits(u), firstbithigh(u)); + } +#endif + 0x43425844, 0x799764f6, 0x7e5d98cf, 0x4dd694ef, 0xa30ee79a, 0x00000001, 0x0000013c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000c4, 0x00000050, 0x00000031, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x06000087, 0x00100032, 0x00000000, 0x00208046, 0x00000000, 0x00000000, + 0x0b00001e, 0x00100032, 0x00000000, 0x80100046, 0x00000041, 0x00000000, 0x00004002, 0x0000001f, + 0x0000001f, 0x00000000, 0x00000000, 0x0d000037, 0x001020c2, 0x00000000, 0x00208406, 0x00000000, + 0x00000000, 0x00100406, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, + 0x06000086, 0x00102032, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x0100003e, + }; + static struct named_shader ps_bits_vector = {"bits_vector", ps_bits_vector_code, sizeof(ps_bits_vector_code)}; static const DWORD ps_ishr_code[] = { #if 0 @@ -10529,6 +10551,8 @@ static void test_shader_instructions(void) {&ps_bits, {{{0x8000000f, 0x8000000f}}}, {{ 5, 0, 31, 30}}}, {&ps_bits, {{{0x00080000, 0x00080000}}}, {{ 1, 19, 19, 19}}}, + {&ps_bits_vector, {{{0x11111111, 0x00080000}}}, {{8, 1, 28, 19}}}, + {&ps_ishr, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, {~0x1fu, 0, 32, 64}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, {&ps_ishr, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, {~0x1fu, 0, 32, 64}}},

1 0

Bernhard Übelacker : msvcrt: Protect setlocale against concurrent accesses.
by Alexandre Julliard 12 Jan '24

12 Jan '24

Module: wine Branch: master Commit: 3481d165d16587101857991a02ce169018d9e657 URL: https://gitlab.winehq.org/wine/wine/-/commit/3481d165d16587101857991a02ce16… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri Dec 8 16:54:45 2023 +0100 msvcrt: Protect setlocale against concurrent accesses. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55467 --- dlls/msvcrt/locale.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index f7be2a1e9bc..99612edfa3e 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -2036,6 +2036,7 @@ char* CDECL setlocale(int category, const char* locale) { thread_data_t *data = msvcrt_get_thread_data(); pthreadlocinfo locinfo = get_locinfo(), newlocinfo; + int locale_flags; if(category<LC_MIN || category>LC_MAX) return NULL; @@ -2047,7 +2048,11 @@ char* CDECL setlocale(int category, const char* locale) return locinfo->lc_category[category].locale; } + /* Make sure that locinfo is not updated by e.g. stricmp function */ + locale_flags = data->locale_flags; + data->locale_flags |= LOCALE_THREAD; newlocinfo = create_locinfo(category, locale, locinfo); + data->locale_flags = locale_flags; if(!newlocinfo) { WARN("%d %s failed\n", category, locale); return NULL;

1 0

Alexandre Julliard : Release 9.0-rc5.
by Alexandre Julliard 12 Jan '24

12 Jan '24

Module: wine Branch: master Commit: ff1642f32cfcd2efd8d60be1a8cb432d393587c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff1642f32cfcd2efd8d60be1a8cb43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 12 21:59:55 2024 +0100 Release 9.0-rc5. --- ANNOUNCE.md | 160 ++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +++---- 3 files changed, 91 insertions(+), 89 deletions(-)

1 0