- Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/tpf: Write register index addressing.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 617a20bffc28111f9d9942e312d377646d15d78b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/617a20bffc28111f9d9942e312d37… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 4 22:10:06 2023 -0300 vkd3d-shader/tpf: Write register index addressing. --- libs/vkd3d-shader/tpf.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 74dad536..79ea39d3 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3841,6 +3841,20 @@ static void sm4_src_from_node(const struct tpf_writer *tpf, struct vkd3d_shader_ } } +static unsigned int sm4_get_index_addressing_from_reg(const struct vkd3d_shader_register *reg, + unsigned int i) +{ + if (reg->idx[i].rel_addr) + { + if (reg->idx[i].offset == 0) + return VKD3D_SM4_ADDRESSING_RELATIVE; + else + return VKD3D_SM4_ADDRESSING_RELATIVE | VKD3D_SM4_ADDRESSING_OFFSET; + } + + return 0; +} + static uint32_t sm4_encode_register(const struct tpf_writer *tpf, const struct vkd3d_shader_register *reg, enum vkd3d_sm4_swizzle_type sm4_swizzle_type, uint32_t sm4_swizzle) { @@ -3867,6 +3881,12 @@ static uint32_t sm4_encode_register(const struct tpf_writer *tpf, const struct v token |= sm4_reg_type << VKD3D_SM4_REGISTER_TYPE_SHIFT; token |= reg->idx_count << VKD3D_SM4_REGISTER_ORDER_SHIFT; token |= sm4_reg_dim << VKD3D_SM4_DIMENSION_SHIFT; + if (reg->idx_count > 0) + token |= sm4_get_index_addressing_from_reg(reg, 0) << VKD3D_SM4_ADDRESSING_SHIFT0; + if (reg->idx_count > 1) + token |= sm4_get_index_addressing_from_reg(reg, 1) << VKD3D_SM4_ADDRESSING_SHIFT1; + if (reg->idx_count > 2) + token |= sm4_get_index_addressing_from_reg(reg, 2) << VKD3D_SM4_ADDRESSING_SHIFT2; if (sm4_reg_dim == VKD3D_SM4_DIMENSION_VEC4) {

1 0

Francisco Casas : tests: Rename array-index-expr.shader_test as non-const-indexing.shader_test.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 3deb3b5a211b1468937a1469d2b55084e5746389 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3deb3b5a211b1468937a1469d2b55… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Nov 3 13:02:38 2023 -0300 tests: Rename array-index-expr.shader_test as non-const-indexing.shader_test. --- Makefile.am | 2 +- .../{array-index-expr.shader_test => non-const-indexing.shader_test} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 531a2705..14b5cf09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,6 @@ vkd3d_shader_tests = \ tests/hlsl/arithmetic-int.shader_test \ tests/hlsl/arithmetic-uint.shader_test \ tests/hlsl/array-dimension.shader_test \ - tests/hlsl/array-index-expr.shader_test \ tests/hlsl/array-parameters.shader_test \ tests/hlsl/array-size-expr.shader_test \ tests/hlsl/asfloat.shader_test \ @@ -134,6 +133,7 @@ vkd3d_shader_tests = \ tests/hlsl/multiple-rt.shader_test \ tests/hlsl/nested-arrays.shader_test \ tests/hlsl/nointerpolation.shader_test \ + tests/hlsl/non-const-indexing.shader_test \ tests/hlsl/normalize.shader_test \ tests/hlsl/numeric-constructor-truncation.shader_test \ tests/hlsl/numeric-types.shader_test \ diff --git a/tests/hlsl/array-index-expr.shader_test b/tests/hlsl/non-const-indexing.shader_test similarity index 100% rename from tests/hlsl/array-index-expr.shader_test rename to tests/hlsl/non-const-indexing.shader_test

1 0

Francisco Casas : tests: Add aditional relative addressing tests.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 915f9f1373035fc9db788bd35aa1cf1d29d315a9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/915f9f1373035fc9db788bd35aa1c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 11 19:50:05 2023 -0300 tests: Add aditional relative addressing tests. --- tests/hlsl/non-const-indexing.shader_test | 78 +++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index b7d91ea0..9f79f610 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -49,6 +49,22 @@ todo(sm>=6) draw quad probe all rgba (14.0, 14.0, 14.0, 14.0) +[pixel shader todo] +float i; + +float4 main() : sv_target +{ + float a[4] = {1, 2, 3, 4}; + + return a[i]; +} + +[test] +uniform 0 float 2.3 +todo draw quad +todo probe all rgba (3, 3, 3, 3) + + [pixel shader] uniform float i; @@ -116,3 +132,65 @@ float4 main() : sv_target uniform 0 float4 0 0 2.4 0 todo draw quad probe all rgba (1.0, 120.0, 90.0, 4.0) + + +% SM1 doesn't support relative addressing if it is used in a l-value. +[require] +shader model >= 4.0 + +[pixel shader todo] +int i, j; + +float4 main() : sv_target +{ + float mut1[4] = {1, 2, 3, 4}; + float mut2[4] = {5, 6, 7, 8}; + + mut1[i] = 100; + mut2[j] = mut1[j]; + + return float4(mut2[0], mut2[1], mut2[2], mut2[3]); +} + +[test] +uniform 0 int 0 +uniform 1 int 0 +todo draw quad +todo probe all rgba (100, 6, 7, 8) +uniform 0 int 2 +uniform 1 int 2 +todo draw quad +todo probe all rgba (5, 6, 100, 8) +uniform 0 int 1 +uniform 1 int 3 +todo draw quad +todo probe all rgba (5, 6, 7, 4) + + +[pixel shader todo] +float a, b, c, d; +float e, f, g, h; +int i, j; + +float4 main() : sv_target +{ + + float arr1[8] = {a, a, b, b, c, c, d, d}; + float arr2[8] = {e, e, f, f, g, g, h, h}; + + arr1[i] = arr2[i]; + arr2[j] = arr1[j]; + + return 1000 * float4(arr1[0], arr1[4], arr2[0], arr2[4]) + + 100 * float4(arr1[1], arr1[5], arr2[1], arr2[5]) + + 10 * float4(arr1[2], arr1[6], arr2[2], arr2[6]) + + 1 * float4(arr1[3], arr1[7], arr2[3], arr2[7]); +} + +[test] +uniform 0 float4 1 2 3 4 +uniform 4 float4 5 6 7 8 +uniform 8 int 3 +uniform 9 int 4 +todo draw quad +todo probe all rgba (1126, 3344, 5566, 3788)

1 0

Francisco Casas : vkd3d-shader/tpf: Encode dst and src registers using the same function.
by Alexandre Julliard Nov. 7, 2023

Nov. 7, 2023

Module: vkd3d Branch: master Commit: 043526a9f7e4eb6fe9f73a8436aef48ba6292140 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/043526a9f7e4eb6fe9f73a8436aef… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 4 22:10:06 2023 -0300 vkd3d-shader/tpf: Encode dst and src registers using the same function. This function will also be required to encode rel_addr registers. --- libs/vkd3d-shader/tpf.c | 96 +++++++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index fbc04f61..74dad536 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -146,6 +146,9 @@ STATIC_ASSERT(SM4_MAX_SRC_COUNT <= SPIRV_MAX_SRC_COUNT); #define VKD3D_SM4_SWIZZLE_SHIFT 4 #define VKD3D_SM4_SWIZZLE_MASK (0xffu << VKD3D_SM4_SWIZZLE_SHIFT) +#define VKD3D_SM4_SCALAR_DIM_SHIFT 4 +#define VKD3D_SM4_SCALAR_DIM_MASK (0x3u << VKD3D_SM4_SCALAR_DIM_SHIFT) + #define VKD3D_SM4_VERSION_MAJOR(version) (((version) >> 4) & 0xf) #define VKD3D_SM4_VERSION_MINOR(version) (((version) >> 0) & 0xf) @@ -513,7 +516,8 @@ enum vkd3d_sm4_swizzle_type VKD3D_SM4_SWIZZLE_VEC4 = 0x1, VKD3D_SM4_SWIZZLE_SCALAR = 0x2, - VKD3D_SM4_SWIZZLE_INVALID = ~0u, + VKD3D_SM4_SWIZZLE_DEFAULT = ~0u - 1, + VKD3D_SM4_SWIZZLE_INVALID = ~0u, }; enum vkd3d_sm4_dimension @@ -3837,32 +3841,67 @@ static void sm4_src_from_node(const struct tpf_writer *tpf, struct vkd3d_shader_ } } -static void sm4_write_dst_register(const struct tpf_writer *tpf, const struct vkd3d_shader_dst_param *dst) +static uint32_t sm4_encode_register(const struct tpf_writer *tpf, const struct vkd3d_shader_register *reg, + enum vkd3d_sm4_swizzle_type sm4_swizzle_type, uint32_t sm4_swizzle) { const struct vkd3d_sm4_register_type_info *register_type_info; - struct vkd3d_bytecode_buffer *buffer = tpf->buffer; - uint32_t sm4_reg_type, reg_dim; + uint32_t sm4_reg_type, sm4_reg_dim; uint32_t token = 0; - unsigned int j; - register_type_info = get_info_from_vkd3d_register_type(&tpf->lookup, dst->reg.type); + register_type_info = get_info_from_vkd3d_register_type(&tpf->lookup, reg->type); if (!register_type_info) { - FIXME("Unhandled vkd3d-shader register type %#x.\n", dst->reg.type); + FIXME("Unhandled vkd3d-shader register type %#x.\n", reg->type); sm4_reg_type = VKD3D_SM4_RT_TEMP; + if (sm4_swizzle_type == VKD3D_SM4_SWIZZLE_DEFAULT) + sm4_swizzle_type = VKD3D_SM4_SWIZZLE_VEC4; } else { sm4_reg_type = register_type_info->sm4_type; + if (sm4_swizzle_type == VKD3D_SM4_SWIZZLE_DEFAULT) + sm4_swizzle_type = register_type_info->default_src_swizzle_type; } - - reg_dim = sm4_dimension_from_vsir_dimension(dst->reg.dimension); + sm4_reg_dim = sm4_dimension_from_vsir_dimension(reg->dimension); token |= sm4_reg_type << VKD3D_SM4_REGISTER_TYPE_SHIFT; - token |= dst->reg.idx_count << VKD3D_SM4_REGISTER_ORDER_SHIFT; - token |= reg_dim << VKD3D_SM4_DIMENSION_SHIFT; - if (reg_dim == VKD3D_SM4_DIMENSION_VEC4) - token |= dst->write_mask << VKD3D_SM4_WRITEMASK_SHIFT; + token |= reg->idx_count << VKD3D_SM4_REGISTER_ORDER_SHIFT; + token |= sm4_reg_dim << VKD3D_SM4_DIMENSION_SHIFT; + + if (sm4_reg_dim == VKD3D_SM4_DIMENSION_VEC4) + { + token |= (uint32_t)sm4_swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; + + switch (sm4_swizzle_type) + { + case VKD3D_SM4_SWIZZLE_NONE: + assert(sm4_swizzle || register_is_constant(reg)); + token |= (sm4_swizzle << VKD3D_SM4_WRITEMASK_SHIFT) & VKD3D_SM4_WRITEMASK_MASK; + break; + + case VKD3D_SM4_SWIZZLE_VEC4: + token |= (sm4_swizzle << VKD3D_SM4_SWIZZLE_SHIFT) & VKD3D_SM4_SWIZZLE_MASK; + break; + + case VKD3D_SM4_SWIZZLE_SCALAR: + token |= (sm4_swizzle << VKD3D_SM4_SCALAR_DIM_SHIFT) & VKD3D_SM4_SCALAR_DIM_MASK; + break; + + default: + vkd3d_unreachable(); + } + } + + return token; +} + +static void sm4_write_dst_register(const struct tpf_writer *tpf, const struct vkd3d_shader_dst_param *dst) +{ + struct vkd3d_bytecode_buffer *buffer = tpf->buffer; + uint32_t token = 0; + unsigned int j; + + token = sm4_encode_register(tpf, &dst->reg, VKD3D_SM4_SWIZZLE_NONE, dst->write_mask); put_u32(buffer, token); for (j = 0; j < dst->reg.idx_count; ++j) @@ -3874,38 +3913,11 @@ static void sm4_write_dst_register(const struct tpf_writer *tpf, const struct vk static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vkd3d_shader_src_param *src) { - const struct vkd3d_sm4_register_type_info *register_type_info; struct vkd3d_bytecode_buffer *buffer = tpf->buffer; - uint32_t sm4_reg_type, reg_dim; uint32_t token = 0, mod_token = 0; unsigned int j; - register_type_info = get_info_from_vkd3d_register_type(&tpf->lookup, src->reg.type); - if (!register_type_info) - { - FIXME("Unhandled vkd3d-shader register type %#x.\n", src->reg.type); - sm4_reg_type = VKD3D_SM4_RT_TEMP; - } - else - { - sm4_reg_type = register_type_info->sm4_type; - } - - reg_dim = sm4_dimension_from_vsir_dimension(src->reg.dimension); - - token |= sm4_reg_type << VKD3D_SM4_REGISTER_TYPE_SHIFT; - token |= src->reg.idx_count << VKD3D_SM4_REGISTER_ORDER_SHIFT; - token |= reg_dim << VKD3D_SM4_DIMENSION_SHIFT; - if (reg_dim == VKD3D_SM4_DIMENSION_VEC4) - { - uint32_t swizzle_type = (uint32_t)register_type_info->default_src_swizzle_type; - - token |= swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; - if (swizzle_type == VKD3D_SM4_SWIZZLE_SCALAR) - token |= (swizzle_to_sm4(src->swizzle) & 0x3) << VKD3D_SM4_SWIZZLE_SHIFT; - else - token |= swizzle_to_sm4(src->swizzle) << VKD3D_SM4_SWIZZLE_SHIFT; - } + token = sm4_encode_register(tpf, &src->reg, VKD3D_SM4_SWIZZLE_DEFAULT, swizzle_to_sm4(src->swizzle)); switch (src->modifiers) { @@ -3954,7 +3966,7 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct vk if (src->reg.type == VKD3DSPR_IMMCONST) { put_u32(buffer, src->reg.u.immconst_uint[0]); - if (reg_dim == VKD3D_SM4_DIMENSION_VEC4) + if (src->reg.dimension == VSIR_DIMENSION_VEC4) { put_u32(buffer, src->reg.u.immconst_uint[1]); put_u32(buffer, src->reg.u.immconst_uint[2]);

1 0

Paul Gofman : ntdll: Fix pending free block validation in heap_validate() for LFH blocks.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: ae010a1a95934233246d93aea66374f9012d6c93 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae010a1a95934233246d93aea66374… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 30 19:43:51 2023 -0600 ntdll: Fix pending free block validation in heap_validate() for LFH blocks. --- dlls/ntdll/heap.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 93ad5c73ba1..e3388e1bc8a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1343,15 +1343,11 @@ static BOOL heap_validate( const struct heap *heap ) { if (!(block = heap->pending_free[i])) break; - subheap = find_subheap( heap, block, FALSE ); - if (!subheap) + if (!validate_used_block( heap, find_subheap( heap, block, FALSE ), block, BLOCK_TYPE_DEAD )) { - ERR( "heap %p: cannot find valid subheap for delayed freed block %p\n", heap, block ); - if (TRACE_ON(heap)) heap_dump( heap ); + ERR( "heap %p: failed to to validate delayed free block %p\n", heap, block ); return FALSE; } - - if (!validate_used_block( heap, subheap, block, BLOCK_TYPE_DEAD )) return FALSE; } for (; i < MAX_FREE_PENDING; i++)

1 0

Rémi Bernon : dmime/tests: Add a track and longer segment to notifications tests.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: a429a3fb4b1e8d5c04accd1e56c30f2138f03cf4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a429a3fb4b1e8d5c04accd1e56c30f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 24 10:09:23 2023 +0200 dmime/tests: Add a track and longer segment to notifications tests. --- dlls/dmime/tests/dmime.c | 105 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 78 insertions(+), 27 deletions(-)

1 0

Rémi Bernon : dmime: Send DMUS_NOTIFICATION_SEGALMOSTEND before DMUS_NOTIFICATION_SEGEND.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: a66b6f96b625f40c62f39a1876dad0673af74a29 URL: https://gitlab.winehq.org/wine/wine/-/commit/a66b6f96b625f40c62f39a1876dad0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 10:04:00 2023 +0200 dmime: Send DMUS_NOTIFICATION_SEGALMOSTEND before DMUS_NOTIFICATION_SEGEND. --- dlls/dmime/performance.c | 6 +++--- dlls/dmime/tests/dmime.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 3fc5df80b58..83c2401c083 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1237,11 +1237,11 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = segment_state_play(state, iface); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, music_time + length, This->notification_segment, - GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, (IUnknown *)state); + hr = performance_send_notification_pmsg(This, music_time + length - 1450, This->notification_segment, + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) hr = performance_send_notification_pmsg(This, music_time + length, This->notification_segment, - GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, (IUnknown *)state); if (SUCCEEDED(hr)) hr = performance_send_pmsg(This, music_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 35a6fbc98f4..dc9e98aab0f 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3019,8 +3019,6 @@ static void check_dmus_notification_pmsg_(int line, DMUS_NOTIFICATION_PMSG *msg, "got dwType %#lx\n", msg->dwType); ok_(__FILE__, line)(IsEqualGUID(&msg->guidNotificationType, type), "got guidNotificationType %s\n", debugstr_guid(&msg->guidNotificationType)); - todo_wine_if(IsEqualGUID(type, &GUID_NOTIFICATION_SEGMENT) && - (option == DMUS_NOTIFICATION_SEGALMOSTEND || option == DMUS_NOTIFICATION_SEGEND)) ok_(__FILE__, line)(msg->dwNotificationOption == option, "got dwNotificationOption %#lx\n", msg->dwNotificationOption); ok_(__FILE__, line)(!msg->dwField1, "got dwField1 %lu\n", msg->dwField1);

1 0

Rémi Bernon : dmime: Use the current time if PlaySegmentEx start_time is 0.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 60538c57cd8c6082244cafa3045671b75a26f49a URL: https://gitlab.winehq.org/wine/wine/-/commit/60538c57cd8c6082244cafa3045671… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 24 10:09:23 2023 +0200 dmime: Use the current time if PlaySegmentEx start_time is 0. --- dlls/dmime/performance.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b58a7d9cd18..3fc5df80b58 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1203,8 +1203,8 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, { struct performance *This = impl_from_IDirectMusicPerformance8(iface); IDirectMusicSegmentState *state; + MUSIC_TIME length, music_time; IDirectMusicSegment *segment; - MUSIC_TIME length; HRESULT hr; FIXME("(%p, %p, %s, %p, %#lx, %I64d, %p, %p, %p): stub\n", This, source, debugstr_w(segment_name), @@ -1216,7 +1216,8 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, if (FAILED(hr = IUnknown_QueryInterface(source, &IID_IDirectMusicSegment, (void **)&segment))) return hr; - if (FAILED(hr = segment_state_create(segment, start_time, iface, &state))) + if ((!(music_time = start_time) && FAILED(hr = IDirectMusicPerformance8_GetTime(iface, NULL, &music_time))) + || FAILED(hr = segment_state_create(segment, music_time, iface, &state))) { IDirectMusicSegment_Release(segment); return hr; @@ -1224,27 +1225,27 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = IDirectMusicSegment_GetLength(segment, &length); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, start_time, This->notification_performance, + hr = performance_send_notification_pmsg(This, music_time, This->notification_performance, GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTARTED, NULL); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, start_time, This->notification_segment, + hr = performance_send_notification_pmsg(This, music_time, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_pmsg(This, start_time, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); + hr = performance_send_pmsg(This, music_time, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) hr = segment_state_play(state, iface); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, + hr = performance_send_notification_pmsg(This, music_time + length, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, + hr = performance_send_notification_pmsg(This, music_time + length, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_pmsg(This, start_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); + hr = performance_send_pmsg(This, music_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, start_time + length, This->notification_performance, + hr = performance_send_notification_pmsg(This, music_time + length, This->notification_performance, GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED, NULL); if (SUCCEEDED(hr) && segment_state)

1 0

Rémi Bernon : dmime/tests: Check more notification / dirty messages fields.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: b1bd72343e49f68e42b4493055b1f5de9796d335 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1bd72343e49f68e42b4493055b1f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 24 10:09:23 2023 +0200 dmime/tests: Check more notification / dirty messages fields. --- dlls/dmime/tests/dmime.c | 91 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 70 insertions(+), 21 deletions(-)

1 0

Rémi Bernon : dmime: Send notification messages with DMUS_PMSGF_TOOL_IMMEDIATE.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 87dba38469cd65c8aca9d8c6e093587641d41e9d URL: https://gitlab.winehq.org/wine/wine/-/commit/87dba38469cd65c8aca9d8c6e09358… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 10:13:17 2023 +0200 dmime: Send notification messages with DMUS_PMSGF_TOOL_IMMEDIATE. Then send them again with DMUS_PMSGF_TOOL_ATTIME for the notification queue. --- dlls/dmime/performance.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 942452d353e..b58a7d9cd18 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -199,7 +199,7 @@ static HRESULT performance_send_notification_pmsg(struct performance *This, MUSI return hr; msg->mtTime = music_time; - msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE; + msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE; msg->dwType = DMUS_PMSGT_NOTIFICATION; if ((msg->punkUser = object)) IUnknown_AddRef(object); msg->guidNotificationType = type; @@ -1230,7 +1230,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = performance_send_notification_pmsg(This, start_time, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_pmsg(This, start_time, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGT_DIRTY, NULL); + hr = performance_send_pmsg(This, start_time, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) hr = segment_state_play(state, iface); @@ -1242,7 +1242,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_pmsg(This, start_time + length, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGT_DIRTY, NULL); + hr = performance_send_pmsg(This, start_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) hr = performance_send_notification_pmsg(This, start_time + length, This->notification_performance, GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED, NULL); @@ -1790,6 +1790,21 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, enabled = This->notification_segment; if (!enabled) return DMUS_S_FREE; + if (msg->dwFlags & DMUS_PMSGF_TOOL_IMMEDIATE) + { + /* re-send the message for queueing at the expected time */ + msg->dwFlags &= ~DMUS_PMSGF_TOOL_IMMEDIATE; + msg->dwFlags |= DMUS_PMSGF_TOOL_ATTIME; + + if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)msg))) + { + ERR("Failed to send notification message, hr %#lx\n", hr); + return DMUS_S_FREE; + } + + return S_OK; + } + list_add_tail(&This->notifications, &message->entry); /* discard old notification messages */

1 0