June 2024 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Don't set the TEB ExceptionList to -1 on 64-bit.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 6e82d33eb70d88a72eed03c2fc99ff4402a50a54 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e82d33eb70d88a72eed03c2fc99ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 16:23:25 2024 +0200 ntdll: Don't set the TEB ExceptionList to -1 on 64-bit. The tests show that it should be zero. --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 4b23d9954df..3981905bcd3 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3621,6 +3621,7 @@ static TEB *init_teb( void *ptr, BOOL is_wow ) if (is_wow) teb64->WowTebOffset = teb_offset; #else teb = (TEB *)teb32; + teb32->Tib.ExceptionList = ~0u; teb64->Peb = PtrToUlong( (char *)peb - page_size ); teb64->Tib.Self = PtrToUlong( teb64 ); teb64->Tib.ExceptionList = PtrToUlong( teb32 ); @@ -3639,7 +3640,6 @@ static TEB *init_teb( void *ptr, BOOL is_wow ) #endif teb->Peb = peb; teb->Tib.Self = &teb->Tib; - teb->Tib.ExceptionList = (void *)~0ul; teb->Tib.StackBase = (void *)~0ul; teb->ActivationContextStackPointer = &teb->ActivationContextStack; InitializeListHead( &teb->ActivationContextStack.FrameListCache );

1 0

Ziqing Hui : winegstreamer: Implement stubs for h264 encoder.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 417b4cb45331b11cb1d7dee8c4398ea36ea1c906 URL: https://gitlab.winehq.org/wine/wine/-/commit/417b4cb45331b11cb1d7dee8c4398e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 18 11:46:27 2024 +0800 winegstreamer: Implement stubs for h264 encoder. --- dlls/mf/tests/transform.c | 3 + dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 2 + dlls/winegstreamer/mfplat.c | 23 ++ dlls/winegstreamer/video_encoder.c | 338 +++++++++++++++++++++++++++ dlls/winegstreamer/winegstreamer_classes.idl | 6 + include/wmcodecdsp.idl | 6 + 7 files changed, 379 insertions(+)

1 0

Alexandre Julliard : ntdll: Add helper macros to define syscalls on ARM64EC.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 9f8d4d0b0a1b559a2c5dc79b73f63c0359020148 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f8d4d0b0a1b559a2c5dc79b73f63c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 15:38:36 2024 +0200 ntdll: Add helper macros to define syscalls on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 1635 +++++++------------------------------------ 1 file changed, 258 insertions(+), 1377 deletions(-)

1 0

Alex Henrie : ntdll: Fix handling of non-string types with RTL_QUERY_REGISTRY_DIRECT.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 867af68b17c588e65fb7f53b9da70c35e4481267 URL: https://gitlab.winehq.org/wine/wine/-/commit/867af68b17c588e65fb7f53b9da70c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 19 22:09:58 2024 -0600 ntdll: Fix handling of non-string types with RTL_QUERY_REGISTRY_DIRECT. --- dlls/ntdll/reg.c | 19 ++++---- dlls/ntdll/tests/reg.c | 126 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 117 insertions(+), 28 deletions(-)

1 0

Elizabeth Figura : maintainers: Remove myself as a winegstreamer maintainer.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 85fd5e283afdca3c99d5373b2dc109b41932b339 URL: https://gitlab.winehq.org/wine/wine/-/commit/85fd5e283afdca3c99d5373b2dc109… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Jun 19 15:23:48 2024 -0500 maintainers: Remove myself as a winegstreamer maintainer. --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index d6631b1d69c..29fa77c0404 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -158,7 +158,7 @@ M: Marcus Meissner <marcus(a)jet.franken.de> F: dlls/gphoto2.ds/ GStreamer multimedia backend -M: Elizabeth Figura <zfigura(a)codeweavers.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/winegstreamer/

1 0

Brendan Shanks : ntdll: Make __wine_syscall_dispatcher_return a separate function to fix Xcode 16 build errors.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: wine Branch: master Commit: 802a52cb1b9825a8baa63276b0e6620d7f4edc83 URL: https://gitlab.winehq.org/wine/wine/-/commit/802a52cb1b9825a8baa63276b0e662… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jun 19 15:36:27 2024 -0700 ntdll: Make __wine_syscall_dispatcher_return a separate function to fix Xcode 16 build errors. LLVM no longer allows non-private labels to appear between .cfi_startproc/endproc when targeting Mach-O. For consistency, also modify ARM and i386. --- dlls/ntdll/unix/signal_arm.c | 6 +++--- dlls/ntdll/unix/signal_arm64.c | 6 +++--- dlls/ntdll/unix/signal_i386.c | 5 ++--- dlls/ntdll/unix/signal_x86_64.c | 6 +++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a477d8d2ed8..77d66909135 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1252,9 +1252,9 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "5:\tmovw r0, #0x000d\n\t" /* STATUS_INVALID_PARAMETER */ "movt r0, #0xc000\n\t" - "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" - ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" - __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" + "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) + +__ASM_GLOBAL_FUNC( __wine_syscall_dispatcher_return, "mov r8, r0\n\t" "mov r0, r1\n\t" "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 58911d9b1f2..667bc1108cf 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1607,9 +1607,9 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "ret x16\n" "4:\tmov x0, #0xc0000000\n\t" /* STATUS_INVALID_PARAMETER */ "movk x0, #0x000d\n\t" - "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" - ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" - __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" + "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) + +__ASM_GLOBAL_FUNC( __wine_syscall_dispatcher_return, "mov sp, x0\n\t" "mov x0, x1\n\t" "b " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6457f0221bd..61d41ec3589 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2768,10 +2768,9 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI("\t.cfi_restore_state\n") "6:\tmovl $0xc000000d,%eax\n\t" /* STATUS_INVALID_PARAMETER */ - "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" + "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) - ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" - __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" +__ASM_GLOBAL_FUNC( __wine_syscall_dispatcher_return, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%esp\n\t" "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index a163d5d0b33..e84044fa805 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2876,9 +2876,9 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI("\t.cfi_restore_state\n") "5:\tmovl $0xc000000d,%eax\n\t" /* STATUS_INVALID_PARAMETER */ "movq %rsp,%rcx\n\t" - "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" - ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" - __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" + "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) + +__ASM_GLOBAL_FUNC( __wine_syscall_dispatcher_return, "movq %rdi,%rcx\n\t" "movl 0xb0(%rcx),%r14d\n\t" /* frame->syscall_flags */ "movq %rsi,%rax\n\t"

1 0

Yuxuan Shui : vkd3d-shader/hlsl: Implement storing to a swizzled matrix.
by Alexandre Julliard June 20, 2024

June 20, 2024

Module: vkd3d Branch: master Commit: ccb6150aabc7cce9e26a39366c611f5a7da789e4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ccb6150aabc7cce9e26a39366c611… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed May 29 16:22:41 2024 +0100 vkd3d-shader/hlsl: Implement storing to a swizzled matrix. --- libs/vkd3d-shader/hlsl.y | 110 ++++++++++++++++++++++++++++++++-- tests/hlsl/swizzle-matrix.shader_test | 14 ++--- 2 files changed, 111 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a2c89b15..9c75c87d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1878,12 +1878,57 @@ static bool invert_swizzle(uint32_t *swizzle, unsigned int *writemask, unsigned return true; } +static bool invert_swizzle_matrix(uint32_t *swizzle, unsigned int *writemask, unsigned int *ret_width) +{ + /* swizzle is 8 bits per component, each component is (from LSB) 4 bits X, then 4 bits Y. + * components are indexed by their sources. i.e. the first component comes from the first + * component of the rhs. */ + unsigned int i, j, bit = 0, inverted = 0, width, new_writemask = 0, new_swizzle = 0; + + /* First, we filter the swizzle to remove components that aren't enabled by writemask. */ + for (i = 0; i < 4; ++i) + { + if (*writemask & (1 << i)) + { + unsigned int s = (*swizzle >> (i * 8)) & 0xff; + unsigned int x = s & 0xf, y = (s >> 4) & 0xf; + unsigned int idx = x + y * 4; + new_swizzle |= s << (bit++ * 8); + if (new_writemask & (1 << idx)) + return false; + new_writemask |= 1 << idx; + } + } + width = bit; + + /* Then we invert the swizzle. The resulting swizzle has 2 bits per component, because it's for the + * incoming vector. */ + bit = 0; + for (i = 0; i < 16; ++i) + { + for (j = 0; j < width; ++j) + { + unsigned int s = (new_swizzle >> (j * 8)) & 0xff; + unsigned int x = s & 0xf, y = (s >> 4) & 0xf; + unsigned int idx = x + y * 4; + if (idx == i) + inverted |= j << (bit++ * 2); + } + } + + *swizzle = inverted; + *writemask = new_writemask; + *ret_width = width; + return true; +} + static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) { struct hlsl_type *lhs_type = lhs->data_type; struct hlsl_ir_node *copy; - unsigned int writemask = 0; + unsigned int writemask = 0, width = 0; + bool matrix_writemask = false; if (assign_op == ASSIGN_OP_SUB) { @@ -1901,7 +1946,10 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct hlsl_blo } if (hlsl_is_numeric_type(lhs_type)) + { writemask = (1 << lhs_type->dimx) - 1; + width = lhs_type->dimx; + } if (!(rhs = add_implicit_conversion(ctx, block, rhs, lhs_type, &rhs->loc))) return NULL; @@ -1918,12 +1966,24 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct hlsl_blo struct hlsl_ir_swizzle *swizzle = hlsl_ir_swizzle(lhs); struct hlsl_ir_node *new_swizzle; uint32_t s = swizzle->swizzle; - unsigned int width; - if (lhs->data_type->class == HLSL_CLASS_MATRIX) - hlsl_fixme(ctx, &lhs->loc, "Matrix assignment with a writemask."); + assert(!matrix_writemask); - if (!invert_swizzle(&s, &writemask, &width)) + if (swizzle->val.node->data_type->class == HLSL_CLASS_MATRIX) + { + if (swizzle->val.node->type != HLSL_IR_LOAD && swizzle->val.node->type != HLSL_IR_INDEX) + { + hlsl_fixme(ctx, &lhs->loc, "Unhandled source of matrix swizzle."); + return NULL; + } + if (!invert_swizzle_matrix(&s, &writemask, &width)) + { + hlsl_error(ctx, &lhs->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_WRITEMASK, "Invalid writemask for matrix."); + return NULL; + } + matrix_writemask = true; + } + else if (!invert_swizzle(&s, &writemask, &width)) { hlsl_error(ctx, &lhs->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_WRITEMASK, "Invalid writemask."); return NULL; @@ -1971,7 +2031,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct hlsl_blo dim_count = hlsl_sampler_dim_count(resource_type->sampler_dim); - if (writemask != ((1u << resource_type->e.resource.format->dimx) - 1)) + if (width != resource_type->e.resource.format->dimx * resource_type->e.resource.format->dimy) hlsl_error(ctx, &lhs->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_WRITEMASK, "Resource store expressions must write to all components."); @@ -1987,12 +2047,50 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct hlsl_blo hlsl_block_add_instr(block, store); hlsl_cleanup_deref(&resource_deref); } + else if (matrix_writemask) + { + struct hlsl_deref deref; + unsigned int i, j, k = 0; + + hlsl_init_deref_from_index_chain(ctx, &deref, lhs); + + for (i = 0; i < lhs->data_type->dimy; ++i) + { + for (j = 0; j < lhs->data_type->dimx; ++j) + { + struct hlsl_ir_node *load; + struct hlsl_block store_block; + const unsigned int idx = i * 4 + j; + const unsigned int component = i * lhs->data_type->dimx + j; + + if (!(writemask & (1 << idx))) + continue; + + if (!(load = hlsl_add_load_component(ctx, block, rhs, k++, &rhs->loc))) + { + hlsl_cleanup_deref(&deref); + return NULL; + } + + if (!hlsl_new_store_component(ctx, &store_block, &deref, component, load)) + { + hlsl_cleanup_deref(&deref); + return NULL; + } + hlsl_block_add_block(block, &store_block); + } + } + + hlsl_cleanup_deref(&deref); + } else if (lhs->type == HLSL_IR_INDEX && hlsl_index_is_noncontiguous(hlsl_ir_index(lhs))) { struct hlsl_ir_index *row = hlsl_ir_index(lhs); struct hlsl_ir_node *mat = row->val.node; unsigned int i, k = 0; + assert(!matrix_writemask); + for (i = 0; i < mat->data_type->dimx; ++i) { struct hlsl_ir_node *cell, *load, *store, *c; diff --git a/tests/hlsl/swizzle-matrix.shader_test b/tests/hlsl/swizzle-matrix.shader_test index 7be73a08..070322fe 100644 --- a/tests/hlsl/swizzle-matrix.shader_test +++ b/tests/hlsl/swizzle-matrix.shader_test @@ -155,7 +155,7 @@ todo(glsl) draw quad probe (0, 0) rgba (40.0, 40.0, 40.0, 40.0) -[pixel shader todo] +[pixel shader] float3 a; float4 main() : sv_target @@ -169,11 +169,11 @@ float4 main() : sv_target [test] uniform 0 float4 20 30 40 -1 -todo(sm<6) draw quad -todo(sm<6) probe (0,0) rgba (10.0, 20.0, 30.0, 40.0) +todo(glsl) draw quad +probe (0,0) rgba (10.0, 20.0, 30.0, 40.0) -[pixel shader todo] +[pixel shader] float3 a; float4 main() : sv_target @@ -187,12 +187,12 @@ float4 main() : sv_target [test] uniform 0 float4 20 30 80 -1 -todo(sm<6) draw quad -todo(sm<6) probe (0,0) rgba (80.0, 30.0, 20.0, 10.0) +todo(glsl) draw quad +probe (0,0) rgba (80.0, 30.0, 20.0, 10.0) % Cannot repeat components when assigning to a swizzle. -[pixel shader fail todo] +[pixel shader fail] float4 main() : sv_target { float2x2 mat = {1, 2, 3, 4};

1 0

Alfred Agrell : winegstreamer: Recalculate alignment and bytes per second, instead of copying from input.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: wine Branch: master Commit: 1b702aea3c28a71c92feba5817ab34c61c0ad8e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b702aea3c28a71c92feba5817ab34… Author: Alfred Agrell <floating(a)muncher.se> Date: Wed Jun 19 17:09:42 2024 +0200 winegstreamer: Recalculate alignment and bytes per second, instead of copying from input. --- dlls/winegstreamer/wma_decoder.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 14a48db9ae2..c141b7e26fe 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -661,8 +661,8 @@ static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD inde DMO_MEDIA_TYPE *type) { struct wma_decoder *decoder = impl_from_IMediaObject(iface); + UINT32 depth, channels, rate; IMFMediaType *media_type; - UINT32 depth; HRESULT hr; TRACE("iface %p, index %lu, type_index %lu, type %p\n", iface, index, type_index, type); @@ -686,6 +686,16 @@ static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD inde else hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + if (SUCCEEDED(hr)) + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_NUM_CHANNELS, &channels); + if (SUCCEEDED(hr)) + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, depth * channels / 8); + + if (SUCCEEDED(hr)) + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate); + if (SUCCEEDED(hr)) + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, depth * channels / 8 * rate); + if (SUCCEEDED(hr)) hr = IMFMediaType_DeleteItem(media_type, &MF_MT_USER_DATA); if (SUCCEEDED(hr))

1 0

Alfred Agrell : quartz/tests: Test that avi_decompressor_source_qc_Notify does not deadlock if called from a foreign thread during IMemInput_Receive.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: wine Branch: master Commit: 73f2e64fd43b8dc37457269d2ab60dda86eec74d URL: https://gitlab.winehq.org/wine/wine/-/commit/73f2e64fd43b8dc37457269d2ab60d… Author: Alfred Agrell <floating(a)muncher.se> Date: Wed Jun 5 19:36:32 2024 +0200 quartz/tests: Test that avi_decompressor_source_qc_Notify does not deadlock if called from a foreign thread during IMemInput_Receive. --- dlls/quartz/tests/avidec.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index ac3a9abf2b1..00e1f44fbd3 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -873,6 +873,20 @@ static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const A return S_OK; } +static DWORD WINAPI call_qc_notify(void *ptr) +{ + struct testfilter *filter = ptr; + IQualityControl *qc; + Quality q = { Famine, 2000, -10000000, 10000000 }; + + IPin_QueryInterface(filter->sink.pin.peer, &IID_IQualityControl, (void**)&qc); + /* don't worry too much about what it returns, just check that it doesn't deadlock */ + IQualityControl_Notify(qc, &filter->filter.IBaseFilter_iface, q); + IQualityControl_Release(qc); + + return 0; +} + static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); @@ -920,6 +934,13 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample hr = IMediaSample_IsSyncPoint(sample); todo_wine_if (testmode == 5 || testmode == 6) ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (testmode == 7) + { + HANDLE h = CreateThread(NULL, 0, call_qc_notify, filter, 0, NULL); + ok(WaitForSingleObject(h, 1000) == WAIT_OBJECT_0, "Didn't expect deadlock.\n"); + CloseHandle(h); + } + return S_OK; } @@ -1129,6 +1150,15 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, ok(hr == S_OK, "Got hr %#lx.\n", hr); todo_wine ok(!sink->got_sample, "Got %u calls to Receive().\n", sink->got_sample); + testmode = 7; + hr = IMediaSample_SetSyncPoint(sample, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + sink->got_sample = 0; + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(sink->got_sample == 1, "Got %u calls to Receive().\n", sink->got_sample); + sink->got_sample = 0; + hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1174,7 +1204,7 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, ok(!testsink->got_eos, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); hr = IPin_EndOfStream(sink); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(!testsink->got_sample, "Got %u calls to Receive().\n", testsink->got_sample); + ok(!testsink->got_sample, "Got %u calls to Receive().\n", testsink->got_sample); ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); testsink->got_eos = 0; @@ -1185,7 +1215,7 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, testmode = 0; hr = IMemInputPin_Receive(input, sample); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(testsink->got_sample == 1, "Got %u calls to Receive().\n", testsink->got_sample); + ok(testsink->got_sample == 1, "Got %u calls to Receive().\n", testsink->got_sample); testsink->got_sample = 0; ok(!testsink->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush);

1 0

Alfred Agrell : mf/tests: Clobber the alignment and bytes per second, to test if the DMO fixes it.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: wine Branch: master Commit: 1953d1e774d9cd79b7b7ac49159a3aef734cd8c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1953d1e774d9cd79b7b7ac49159a3a… Author: Alfred Agrell <floating(a)muncher.se> Date: Wed Jun 19 17:10:48 2024 +0200 mf/tests: Clobber the alignment and bytes per second, to test if the DMO fixes it. --- dlls/mf/tests/transform.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 38e31af97c1..6aff6838a80 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -3585,6 +3585,8 @@ static void test_wma_decoder_dmo_output_type(void) good_output_type = (void *)buffer_good_output; bad_output_type = (void *)buffer_bad_output; init_dmo_media_type_audio(input_type, input_subtype, channel_count, rate, 16); + ((WAVEFORMATEX *)(input_type + 1))->nBlockAlign = 640; + ((WAVEFORMATEX *)(input_type + 1))->nAvgBytesPerSec = 2000; init_dmo_media_type_audio(good_output_type, &MEDIASUBTYPE_PCM, channel_count, rate, bits_per_sample); memset(bad_output_type, 0, sizeof(buffer_bad_output));

1 0