January 2024 - Wine-commits

Giovanni Mascellani : vkd3d: Specify the aspect when creating NULL UAVs.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: vkd3d Branch: master Commit: 5e7f9d4d0d3d2ac3c69162cadbec86fddf8af541 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5e7f9d4d0d3d2ac3c69162cadbec8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 26 11:46:48 2023 +0100 vkd3d: Specify the aspect when creating NULL UAVs. This fixes a crash on MoltenVK. --- libs/vkd3d/resource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 609c6710..356c2f09 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3444,6 +3444,7 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_count = 1; vkd3d_desc.layer_idx = 0; vkd3d_desc.layer_count = 1; + vkd3d_desc.vk_image_aspect = VK_IMAGE_ASPECT_COLOR_BIT; vkd3d_desc.components.r = VK_COMPONENT_SWIZZLE_R; vkd3d_desc.components.g = VK_COMPONENT_SWIZZLE_G; vkd3d_desc.components.b = VK_COMPONENT_SWIZZLE_B;

1 0

Giovanni Mascellani : tests: Use a uint target for rendering uint data.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: vkd3d Branch: master Commit: 9c9b1fadbd0ca6c61b30b37eb00c1e9c7a428036 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c9b1fadbd0ca6c61b30b37eb00c1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Oct 28 01:10:55 2023 +0200 tests: Use a uint target for rendering uint data. This fixes a failure in MoltenVK. --- tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1126d974..3324eef8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -35376,7 +35376,7 @@ static void test_bufinfo_instruction(void) memset(&desc, 0, sizeof(desc)); desc.rt_width = desc.rt_height = 64; - desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.rt_format = DXGI_FORMAT_R32G32B32A32_UINT; desc.no_root_signature = true; desc.no_pipeline = true; if (!init_test_context(&context, &desc))

1 0

Giovanni Mascellani : vkd3d-shader/spirv: Specify behavior for bit field instructions.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: vkd3d Branch: master Commit: 7f9803620ff38a797c6ccc6e8cb1f353347db97d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7f9803620ff38a797c6ccc6e8cb1f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 26 19:03:07 2023 +0100 vkd3d-shader/spirv: Specify behavior for bit field instructions. Bit field instructions in SPIR-V do not specify what happens when offset + count exceeds the type bit width. After this commit we refine the emitted code's behavior to match TPF. This fixes a few failures on MoltenVK. --- libs/vkd3d-shader/spirv.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index aa8ceaa6..8a4704e5 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1764,6 +1764,15 @@ static uint32_t vkd3d_spirv_build_op_glsl_std450_max(struct vkd3d_spirv_builder GLSLstd450NMax, operands, ARRAY_SIZE(operands)); } +static uint32_t vkd3d_spirv_build_op_glsl_std450_umin(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t x, uint32_t y) +{ + uint32_t glsl_std450_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); + uint32_t operands[] = {x, y}; + return vkd3d_spirv_build_op_ext_inst(builder, result_type, glsl_std450_id, + GLSLstd450UMin, operands, ARRAY_SIZE(operands)); +} + static uint32_t vkd3d_spirv_build_op_glsl_std450_nclamp(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t x, uint32_t min, uint32_t max) { @@ -7355,7 +7364,7 @@ static void spirv_compiler_emit_ftou(struct spirv_compiler *compiler, static void spirv_compiler_emit_bitfield_instruction(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - uint32_t src_ids[4], constituents[VKD3D_VEC4_SIZE], type_id, mask_id; + uint32_t src_ids[4], constituents[VKD3D_VEC4_SIZE], type_id, mask_id, size_id, max_count_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; @@ -7370,6 +7379,7 @@ static void spirv_compiler_emit_bitfield_instruction(struct spirv_compiler *comp component_type = vkd3d_component_type_from_data_type(dst->reg.data_type); type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); mask_id = spirv_compiler_get_constant_uint(compiler, 0x1f); + size_id = spirv_compiler_get_constant_uint(compiler, 0x20); switch (instruction->handler_idx) { @@ -7398,6 +7408,9 @@ static void spirv_compiler_emit_bitfield_instruction(struct spirv_compiler *comp { src_ids[j] = vkd3d_spirv_build_op_and(builder, type_id, src_ids[j], mask_id); } + max_count_id = vkd3d_spirv_build_op_isub(builder, type_id, size_id, src_ids[src_count - 2]); + src_ids[src_count - 1] = vkd3d_spirv_build_op_glsl_std450_umin(builder, type_id, + src_ids[src_count - 1], max_count_id); constituents[k++] = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, src_ids, src_count);

1 0

Zebediah Figura : wined3d: Set fixed_function_usage_map to 0 for an sm4 draw without a PS.
by Alexandre Julliard 05 Jan '24

05 Jan '24

Module: wine Branch: master Commit: a79db19fdc20afc9820a9311c76e55d7a4e73b77 URL: https://gitlab.winehq.org/wine/wine/-/commit/a79db19fdc20afc9820a9311c76e55… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 1 12:16:45 2024 -0600 wined3d: Set fixed_function_usage_map to 0 for an sm4 draw without a PS. Fixes: 5b60f4649b15efb9ef10b63da3ef2c42f8665078 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56113 --- dlls/wined3d/context_gl.c | 71 ++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 55546130d35..2c319132164 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3735,40 +3735,55 @@ static void context_invalidate_texture_stage(struct wined3d_context *context, DW context_invalidate_state(context, STATE_TEXTURESTAGE(stage, i)); } +static bool use_ffp_ps(const struct wined3d_state *state) +{ + struct wined3d_shader *vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; + + if (!use_vs(state)) + return true; + if (vs && vs->reg_maps.shader_version.major >= 4) + return false; + return true; +} + static void context_update_fixed_function_usage_map(struct wined3d_context *context, const struct wined3d_state *state) { - UINT i, start, end; + UINT i = 0, start, end; context->fixed_function_usage_map = 0; - for (i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) - { - enum wined3d_texture_op color_op = state->texture_states[i][WINED3D_TSS_COLOR_OP]; - enum wined3d_texture_op alpha_op = state->texture_states[i][WINED3D_TSS_ALPHA_OP]; - DWORD color_arg1 = state->texture_states[i][WINED3D_TSS_COLOR_ARG1] & WINED3DTA_SELECTMASK; - DWORD color_arg2 = state->texture_states[i][WINED3D_TSS_COLOR_ARG2] & WINED3DTA_SELECTMASK; - DWORD color_arg3 = state->texture_states[i][WINED3D_TSS_COLOR_ARG0] & WINED3DTA_SELECTMASK; - DWORD alpha_arg1 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG1] & WINED3DTA_SELECTMASK; - DWORD alpha_arg2 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG2] & WINED3DTA_SELECTMASK; - DWORD alpha_arg3 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] & WINED3DTA_SELECTMASK; - - /* Not used, and disable higher stages. */ - if (color_op == WINED3D_TOP_DISABLE) - break; - if (((color_arg1 == WINED3DTA_TEXTURE) && color_op != WINED3D_TOP_SELECT_ARG2) - || ((color_arg2 == WINED3DTA_TEXTURE) && color_op != WINED3D_TOP_SELECT_ARG1) - || ((color_arg3 == WINED3DTA_TEXTURE) - && (color_op == WINED3D_TOP_MULTIPLY_ADD || color_op == WINED3D_TOP_LERP)) - || ((alpha_arg1 == WINED3DTA_TEXTURE) && alpha_op != WINED3D_TOP_SELECT_ARG2) - || ((alpha_arg2 == WINED3DTA_TEXTURE) && alpha_op != WINED3D_TOP_SELECT_ARG1) - || ((alpha_arg3 == WINED3DTA_TEXTURE) - && (alpha_op == WINED3D_TOP_MULTIPLY_ADD || alpha_op == WINED3D_TOP_LERP))) - context->fixed_function_usage_map |= (1u << i); - - if ((color_op == WINED3D_TOP_BUMPENVMAP || color_op == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - && i < WINED3D_MAX_FFP_TEXTURES - 1) - context->fixed_function_usage_map |= (1u << (i + 1)); + if (use_ffp_ps(state)) + { + for (i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) + { + enum wined3d_texture_op color_op = state->texture_states[i][WINED3D_TSS_COLOR_OP]; + enum wined3d_texture_op alpha_op = state->texture_states[i][WINED3D_TSS_ALPHA_OP]; + DWORD color_arg1 = state->texture_states[i][WINED3D_TSS_COLOR_ARG1] & WINED3DTA_SELECTMASK; + DWORD color_arg2 = state->texture_states[i][WINED3D_TSS_COLOR_ARG2] & WINED3DTA_SELECTMASK; + DWORD color_arg3 = state->texture_states[i][WINED3D_TSS_COLOR_ARG0] & WINED3DTA_SELECTMASK; + DWORD alpha_arg1 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG1] & WINED3DTA_SELECTMASK; + DWORD alpha_arg2 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG2] & WINED3DTA_SELECTMASK; + DWORD alpha_arg3 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] & WINED3DTA_SELECTMASK; + + /* Not used, and disable higher stages. */ + if (color_op == WINED3D_TOP_DISABLE) + break; + + if (((color_arg1 == WINED3DTA_TEXTURE) && color_op != WINED3D_TOP_SELECT_ARG2) + || ((color_arg2 == WINED3DTA_TEXTURE) && color_op != WINED3D_TOP_SELECT_ARG1) + || ((color_arg3 == WINED3DTA_TEXTURE) + && (color_op == WINED3D_TOP_MULTIPLY_ADD || color_op == WINED3D_TOP_LERP)) + || ((alpha_arg1 == WINED3DTA_TEXTURE) && alpha_op != WINED3D_TOP_SELECT_ARG2) + || ((alpha_arg2 == WINED3DTA_TEXTURE) && alpha_op != WINED3D_TOP_SELECT_ARG1) + || ((alpha_arg3 == WINED3DTA_TEXTURE) + && (alpha_op == WINED3D_TOP_MULTIPLY_ADD || alpha_op == WINED3D_TOP_LERP))) + context->fixed_function_usage_map |= (1u << i); + + if ((color_op == WINED3D_TOP_BUMPENVMAP || color_op == WINED3D_TOP_BUMPENVMAP_LUMINANCE) + && i < WINED3D_MAX_FFP_TEXTURES - 1) + context->fixed_function_usage_map |= (1u << (i + 1)); + } } if (i < context->lowest_disabled_stage)

1 0

Zsolt Vadasz : msvcrt: Compare environment variable names case insensitively.
by Alexandre Julliard 05 Jan '24

05 Jan '24

Module: wine Branch: master Commit: 1f01dd123000796b8ea92fc80abbf07c3202c981 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f01dd123000796b8ea92fc80abbf0… Author: Zsolt Vadasz <zsolt_vadasz(a)protonmail.com> Date: Tue Jan 2 16:09:19 2024 +0100 msvcrt: Compare environment variable names case insensitively. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56134 --- dlls/msvcrt/environ.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 063a9254c67..aa857afa615 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -125,7 +125,7 @@ static int env_get_index(const char *name) len = strlen(name); for (i = 0; MSVCRT__environ[i]; i++) { - if (!strncmp(name, MSVCRT__environ[i], len) && MSVCRT__environ[i][len] == '=') + if (!strnicmp(name, MSVCRT__environ[i], len) && MSVCRT__environ[i][len] == '=') return i; } return i; @@ -138,7 +138,7 @@ static int wenv_get_index(const wchar_t *name) len = wcslen(name); for (i = 0; MSVCRT__wenviron[i]; i++) { - if (!wcsncmp(name, MSVCRT__wenviron[i], len) && MSVCRT__wenviron[i][len] == '=') + if (!wcsnicmp(name, MSVCRT__wenviron[i], len) && MSVCRT__wenviron[i][len] == '=') return i; } return i;

1 0

Zsolt Vadasz : msvcrt/tests: Test case insensitivity of getenv() and _wgetenv().
by Alexandre Julliard 05 Jan '24

05 Jan '24

Module: wine Branch: master Commit: 56a666d563be840913f2f3855c36312e5d2a2890 URL: https://gitlab.winehq.org/wine/wine/-/commit/56a666d563be840913f2f3855c3631… Author: Zsolt Vadasz <zsolt_vadasz(a)protonmail.com> Date: Tue Jan 2 18:17:08 2024 +0100 msvcrt/tests: Test case insensitivity of getenv() and _wgetenv(). --- dlls/msvcrt/tests/environ.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index aab14a422b3..1d1bfd2f504 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -421,6 +421,29 @@ static void test_child_env(char** argv) free( env ); } +static void test_case_insensitive(void) +{ + const char *uppercase_env = getenv("APPDATA"); + const char *lowercase_env = getenv("appdata"); + const wchar_t *uppercase_wenv = _wgetenv(L"APPDATA"); + const wchar_t *lowercase_wenv = _wgetenv(L"appdata"); + + ok( uppercase_env == lowercase_env, "getenv() must be case insensitive, %p should be %p\n", + lowercase_env, uppercase_env ); + ok( uppercase_wenv == lowercase_wenv, "_wgetenv() must be case insensitive, %p should be %p\n", + lowercase_wenv, uppercase_wenv ); + + ok( !_putenv("cAt=bar"), "Failed to set CAT=bar\n" ); + ok( !_putenv("CAT=BAR"), "Failed to set CAT=BAR\n" ); + ok( !strcmp(getenv("cAt"), "BAR"), "_putenv() must be case insensitive\n" ); + + ok( !_wputenv(L"cAt=bar"), "Failed to set CAT=bar\n" ); + ok( !_wputenv(L"CAT=BAR"), "Failed to set CAT=BAR\n" ); + ok( !wcscmp(_wgetenv(L"cAt"), L"BAR"), "_wputenv() must be case insensitive\n" ); + + _putenv("cat="); +} + START_TEST(environ) { char **argv; @@ -443,4 +466,5 @@ START_TEST(environ) test_environment_manipulation(); test_child_env(argv); test_system(); + test_case_insensitive(); }

1 0

André Zwing : mscoree/tests: Don't test function directly when reporting GetLastError().
by Alexandre Julliard 05 Jan '24

05 Jan '24

Module: wine Branch: master Commit: 2ce7cee4fc35338da4f9de41d88604f538734cd7 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ce7cee4fc35338da4f9de41d88604… Author: André Zwing <nerv(a)dawncrow.de> Date: Wed Dec 27 16:13:15 2023 +0100 mscoree/tests: Don't test function directly when reporting GetLastError(). --- dlls/mscoree/tests/mscoree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 33f5bfa905b..36594972866 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -633,8 +633,8 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, DWORD exit_code = 0xdeadbeef, err; BOOL ret; - ok(create_new_dir(tmpdir, L"loadpaths"), - "failed to create a new dir %lu\n", GetLastError()); + ret = create_new_dir(tmpdir, L"loadpaths"); + ok(ret, "failed to create a new dir %lu\n", GetLastError()); end = tmpdir + wcslen(tmpdir); wcscpy(tmpexe, tmpdir);

1 0

André Zwing : ntoskrnl/tests: Use RtlNtStatusToDosErrorNoTeb() for stateless conversion.
by Alexandre Julliard 05 Jan '24

05 Jan '24

Module: wine Branch: master Commit: 532418b091342701eeed825d0155ad07e6c16795 URL: https://gitlab.winehq.org/wine/wine/-/commit/532418b091342701eeed825d0155ad… Author: André Zwing <nerv(a)dawncrow.de> Date: Wed Dec 27 16:35:02 2023 +0100 ntoskrnl/tests: Use RtlNtStatusToDosErrorNoTeb() for stateless conversion. --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 13258b05291..5a47523cf71 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -672,7 +672,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) } else { - ok(GetLastError() == RtlNtStatusToDosError(expect_status), "got error %lu\n", GetLastError()); + ok(GetLastError() == RtlNtStatusToDosErrorNoTeb(expect_status), "got error %lu\n", GetLastError()); } if (NT_ERROR(expect_status)) ok(size == 0xdeadf00d, "got size %lu\n", size);

1 0

Alexandre Julliard : Release 9.0-rc4.
by Alexandre Julliard 05 Jan '24

05 Jan '24

Module: wine Branch: master Commit: d56fc6d318d96bb80495f015e271d485ac41b9d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d56fc6d318d96bb80495f015e271d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 22:20:29 2024 +0100 Release 9.0-rc4. --- ANNOUNCE.md | 198 ++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +++--- 4 files changed, 90 insertions(+), 129 deletions(-)

1 0

Tag wine-9.0-rc4 : Alexandre Julliard : Release 9.0-rc4
by Alexandre Julliard 05 Jan '24

05 Jan '24

Module: wine Branch: refs/tags/wine-9.0-rc4 Tag: 1944955dd7efd33202c4da5f77da443d3d0bfa60 URL: https://gitlab.winehq.org/wine/wine/-/tags/1944955dd7efd33202c4da5f77da443d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 22:20:29 2024 +0100 Release 9.0-rc4

1 0