- Wine-Commits - list.winehq.org

Daniel Lehman : msxml6/tests: Add tests for default namespace.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 6a7c53130f71d9c72a382b2da092304b6260ea60 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a7c53130f71d9c72a382b2da09230… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Nov 15 23:21:59 2023 -0800 msxml6/tests: Add tests for default namespace. --- dlls/msxml6/tests/domdoc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c index 3aad799523d..0c156023b6b 100644 --- a/dlls/msxml6/tests/domdoc.c +++ b/dlls/msxml6/tests/domdoc.c @@ -67,6 +67,7 @@ static void test_namespaces_as_attributes(void) const WCHAR *uris[3]; const WCHAR *texts[3]; const WCHAR *xmls[3]; + BOOL todo; }; static const struct test tests[] = { @@ -99,6 +100,17 @@ static void test_namespaces_as_attributes(void) { L"nshref" }, /* text */ { L"xmlns:ns=\"nshref\"" }, /* xml */ }, + /* default namespace */ + { + L"<a xmlns=\"nshref\" />", 1, + { L"xmlns" }, /* nodeName */ + { NULL }, /* prefix */ + { L"xmlns" }, /* baseName */ + { L"http://www.w3.org/2000/xmlns/" }, /* namespaceURI */ + { L"nshref" }, /* text */ + { L"xmlns=\"nshref\"" }, /* xml */ + TRUE, /* todo */ + }, /* no properties or namespaces */ { L"<a />", 0, @@ -125,7 +137,7 @@ static void test_namespaces_as_attributes(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); node = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(L"a"), &node); + hr = IXMLDOMDocument2_get_firstChild(doc, &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXMLDOMNode_get_attributes(node, &map); @@ -145,7 +157,9 @@ static void test_namespaces_as_attributes(void) { item = NULL; hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + todo_wine_if(test->todo) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str);

1 0

Rémi Bernon : evr: Set last presented sample atomically.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 8ffebcf4ab869bf1067b23f3a67eead0213494c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ffebcf4ab869bf1067b23f3a67eea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 17 21:28:10 2023 +0100 evr: Set last presented sample atomically. Fixes a race condition and crashes in Secret of Mana. The queue critical section is held in video_presenter_sample_present while GetCurrentImage only locks the presenter CS. Double locking is tricky and atomic operation is appropriate to swap the sample pointer. --- dlls/evr/presenter.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 2dc01608caf..eed6a84c83d 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -530,12 +530,9 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM WARN("Failed to get a backbuffer, hr %#lx.\n", hr); } - EnterCriticalSection(&queue->cs); - if (queue->last_presented) - IMFSample_Release(queue->last_presented); - queue->last_presented = sample; - IMFSample_AddRef(queue->last_presented); - LeaveCriticalSection(&queue->cs); + IMFSample_AddRef(sample); + if ((sample = InterlockedExchangePointer((void **)&queue->last_presented, sample))) + IMFSample_Release(sample); IDirect3DSurface9_Release(surface); } @@ -752,6 +749,9 @@ static HRESULT video_presenter_start_streaming(struct video_presenter *presenter static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) { + struct sample_queue *queue = &presenter->thread.queue; + IMFSample *sample; + if (!presenter->thread.hthread) return S_OK; @@ -762,8 +762,9 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) TRACE("Terminated streaming thread tid %#lx.\n", presenter->thread.tid); - if (presenter->thread.queue.last_presented) - IMFSample_Release(presenter->thread.queue.last_presented); + if ((sample = InterlockedExchangePointer((void **)&queue->last_presented, NULL))) + IMFSample_Release(sample); + video_presenter_sample_queue_free(presenter); memset(&presenter->thread, 0, sizeof(presenter->thread)); video_presenter_set_allocator_callback(presenter, NULL); @@ -1488,6 +1489,7 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon BYTE **dib, DWORD *dib_size, LONGLONG *timestamp) { struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + struct sample_queue *queue = &presenter->thread.queue; IDirect3DSurface9 *readback = NULL, *surface; D3DSURFACE_DESC surface_desc; D3DLOCKED_RECT mapped_rect; @@ -1500,10 +1502,7 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon EnterCriticalSection(&presenter->cs); - sample = presenter->thread.queue.last_presented; - presenter->thread.queue.last_presented = NULL; - - if (!sample) + if (!(sample = InterlockedExchangePointer((void **)&queue->last_presented, NULL))) { hr = MF_E_INVALIDREQUEST; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Correctly compute the TEMP count after hull shader flattening.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: b1123ed35f48017b18fdc27540bb681414fc472f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b1123ed35f48017b18fdc27540bb6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 16 23:07:27 2023 +0100 vkd3d-shader/ir: Correctly compute the TEMP count after hull shader flattening. The previous computation was incorrect because the count was taken after resetting it to zero (as part of setting the instruction to NOP). --- libs/vkd3d-shader/ir.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 5c88946b..833f5084 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -207,10 +207,15 @@ static void flattener_eliminate_phase_related_dcls(struct hull_flattener *normal { /* Leave only the first temp declaration and set it to the max count later. */ if (!normaliser->max_temp_count) + { + normaliser->max_temp_count = ins->declaration.count; normaliser->temp_dcl_idx = index; + } else + { + normaliser->max_temp_count = max(normaliser->max_temp_count, ins->declaration.count); vkd3d_shader_instruction_make_nop(ins); - normaliser->max_temp_count = max(normaliser->max_temp_count, ins->declaration.count); + } return; }

1 0

Jacek Caban : include: Use GCC-style attributes and builtins on Clang MSVC target.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: 616bf939314e6c50a73932f742dfb779e807ef4c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/616bf939314e6c50a73932f742dfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 17:52:53 2023 +0100 include: Use GCC-style attributes and builtins on Clang MSVC target. --- include/private/vkd3d_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 619665ad..5557df41 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -75,7 +75,7 @@ static inline size_t align(size_t addr, size_t alignment) return (addr + (alignment - 1)) & ~(alignment - 1); } -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) # define VKD3D_NORETURN __attribute__((noreturn)) # ifdef __MINGW_PRINTF_FORMAT # define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(__MINGW_PRINTF_FORMAT, fmt, args)))

1 0

Jacek Caban : vkd3d-shader/dxbc: Use return type to return result from read_u32 and read_float.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: 078cf6a240f0bfb740402b41cda43b35557f0d06 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/078cf6a240f0bfb740402b41cda43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 12:52:19 2023 +0100 vkd3d-shader/dxbc: Use return type to return result from read_u32 and read_float. Avoid implicit casts from enum pointers. --- libs/vkd3d-shader/dxbc.c | 158 +++++++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 75 deletions(-)

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate IFC instructions.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: 5cb17cfd1c957a46fbe1d1053d2bd3f5502eb130 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5cb17cfd1c957a46fbe1d1053d2bd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 16 22:32:13 2023 +0100 vkd3d-shader/ir: Validate IFC instructions. --- libs/vkd3d-shader/ir.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index b8cb6a41..5c88946b 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1696,6 +1696,14 @@ static void vsir_validate_instruction(struct validation_context *ctx) ctx->blocks[ctx->depth++] = instruction->handler_idx; break; + case VKD3DSIH_IFC: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 2); + if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) + return; + ctx->blocks[ctx->depth++] = VKD3DSIH_IF; + break; + case VKD3DSIH_ELSE: vsir_validate_dst_count(ctx, instruction, 0); vsir_validate_src_count(ctx, instruction, 0);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Expect two sources for LOOP in SM1-3.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: 849a8f3addcdda4c9cf59e5898ad1e7ead321ad6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/849a8f3addcdda4c9cf59e5898ad1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Nov 16 22:30:12 2023 +0100 vkd3d-shader/ir: Expect two sources for LOOP in SM1-3. --- libs/vkd3d-shader/ir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 2a334399..b8cb6a41 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1716,7 +1716,7 @@ static void vsir_validate_instruction(struct validation_context *ctx) case VKD3DSIH_LOOP: vsir_validate_dst_count(ctx, instruction, 0); - vsir_validate_src_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, ctx->parser->shader_version.major <= 3 ? 2 : 0); if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks))) return; ctx->blocks[ctx->depth++] = instruction->handler_idx;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: e55b6a7fa1cc93e4e53bf758d231c477e9c766c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e55b6a7fa1cc93e4e53bf758d231c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 16 01:14:09 2023 +0100 vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins. --- libs/vkd3d-shader/hlsl.y | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 242e8307..c25b101a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3171,6 +3171,7 @@ static bool intrinsic_log(struct hlsl_ctx *ctx, /* ln(2) */ if (!(coeff = hlsl_new_float_constant(ctx, 0.69314718055f, loc))) return false; + hlsl_block_add_instr(params->instrs, coeff); return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, coeff, loc); } @@ -3189,6 +3190,7 @@ static bool intrinsic_log10(struct hlsl_ctx *ctx, /* 1 / log2(10) */ if (!(coeff = hlsl_new_float_constant(ctx, 0.301029996f, loc))) return false; + hlsl_block_add_instr(params->instrs, coeff); return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, coeff, loc); }

1 0

Henri Verbeet : vkd3d-shader/d3dbc: Adjust the token count for DEF and DEFI instructions in shader_sm1_skip_opcode().
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: 73c563ffb7f07d43f8fd768768558c3b280ce3dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/73c563ffb7f07d43f8fd768768558… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 16 17:57:58 2023 +0100 vkd3d-shader/d3dbc: Adjust the token count for DEF and DEFI instructions in shader_sm1_skip_opcode(). This was broken by commit e390bc35e2c9b0a2110370f916033eea2366317e; that commit fixed the source count for these instructions, but didn't adjust shader_sm1_skip_opcode(). Note that this only affects shader model 1; later versions have a token count embedded in the initial opcode token. --- libs/vkd3d-shader/d3dbc.c | 8 ++++++++ tests/vkd3d_shader_api.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 7e0eac6c..3d139416 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -855,6 +855,14 @@ static void shader_sm1_skip_opcode(const struct vkd3d_shader_sm1_parser *sm1, co { *ptr += 2; } + /* Somewhat similarly, DEF and DEFI have a single source, but need to read + * four tokens for that source. See shader_sm1_read_immconst(). + * Technically shader model 1 doesn't have integer registers or DEFI; we + * handle it here anyway because it's easy. */ + else if (opcode_info->vkd3d_opcode == VKD3DSIH_DEF || opcode_info->vkd3d_opcode == VKD3DSIH_DEFI) + { + *ptr += 3; + } *ptr += (opcode_info->dst_count + opcode_info->src_count); } diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 9fe5eec8..61c412c5 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -238,6 +238,13 @@ static void test_d3dbc(void) 0xfffe0100, /* vs_1_0 */ 0x0000ffff, /* end */ }; + static const uint32_t vs_dcl_def[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 1.0, 0.0, 0.0, 1.0 */ + 0x0000ffff, /* end */ + }; static const uint32_t invalid_type[] = { 0x00010100, /* <invalid>_1_0 */ @@ -255,6 +262,10 @@ static void test_d3dbc(void) 0x0000ffff, /* end */ }; static const char expected[] = "vs_1_0\n"; + static const char expected_dcl_def[] = + "vs_1_1\n" + "dcl_position0 v0\n" + "def c0 = 1.00000000e+00, 0.00000000e+00, 0.00000000e+00, 1.00000000e+00\n"; info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; @@ -291,6 +302,15 @@ static void test_d3dbc(void) rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); + info.source.code = vs_dcl_def; + info.source.size = sizeof(vs_dcl_def); + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + ok(d3d_asm.size == strlen(expected_dcl_def), "Got unexpected size %zu.\n", d3d_asm.size); + ok(!memcmp(d3d_asm.code, expected_dcl_def, d3d_asm.size), "Got unexpected code \"%.*s\"\n", + (int)d3d_asm.size, (char *)d3d_asm.code); + vkd3d_shader_free_shader_code(&d3d_asm); + info.source.code = invalid_type; info.source.size = sizeof(invalid_type); rc = vkd3d_shader_compile(&info, &d3d_asm, NULL);

1 0

Akihiro Sagawa : vkd3d-shader/hlsl: Add degrees() function.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: vkd3d Branch: master Commit: aed2d142cf345305bdf1b37679ce97a123f9b89f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aed2d142cf345305bdf1b37679ce9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 16 20:22:37 2023 +0900 vkd3d-shader/hlsl: Add degrees() function. --- libs/vkd3d-shader/hlsl.y | 17 +++++++++++++++++ tests/hlsl/angle-unit.shader_test | 14 ++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a9ff41aa..242e8307 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2878,6 +2878,22 @@ static bool intrinsic_ddy_coarse(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_DSY_COARSE, arg, loc); } +static bool intrinsic_degrees(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg, *deg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + /* 1 rad = 180/pi degree = 57.2957795 degree */ + if (!(deg = hlsl_new_float_constant(ctx, 57.2957795f, loc))) + return false; + hlsl_block_add_instr(params->instrs, deg); + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, arg, deg, loc); +} + static bool intrinsic_ddy_fine(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3865,6 +3881,7 @@ intrinsic_functions[] = {"ddy", 1, true, intrinsic_ddy}, {"ddy_coarse", 1, true, intrinsic_ddy_coarse}, {"ddy_fine", 1, true, intrinsic_ddy_fine}, + {"degrees", 1, true, intrinsic_degrees}, {"distance", 2, true, intrinsic_distance}, {"dot", 2, true, intrinsic_dot}, {"exp", 1, true, intrinsic_exp}, diff --git a/tests/hlsl/angle-unit.shader_test b/tests/hlsl/angle-unit.shader_test index 6e0538f9..407d2413 100644 --- a/tests/hlsl/angle-unit.shader_test +++ b/tests/hlsl/angle-unit.shader_test @@ -10,3 +10,17 @@ float4 main() : sv_target uniform 0 float4 0.0 30.0 150.0 180.0 draw quad probe all rgba (0.0, 0.52359877, 2.61799387, 3.14159265) + + +[pixel shader] +uniform float4 a; + +float4 main() : sv_target +{ + return degrees(a); +} + +[test] +uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 +draw quad +probe all rgba (0.0, 45.0, 90.0, 135.0)

1 0