From: Brendan McGrath <bmcgrath@codeweavers.com> --- dlls/mf/sar.c | 7 ++++++- dlls/mf/tests/mf.c | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 62d158eef73..6ad1cd5e967 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -419,6 +419,7 @@ static void audio_renderer_set_presentation_clock(struct audio_renderer *rendere static HRESULT WINAPI audio_renderer_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); + IMFPresentationTimeSource *time_source = NULL; HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, clock); @@ -427,8 +428,12 @@ static HRESULT WINAPI audio_renderer_sink_SetPresentationClock(IMFMediaSink *ifa if (renderer->flags & SAR_SHUT_DOWN) hr = MF_E_SHUTDOWN; - else + else if (!clock || SUCCEEDED(hr = IMFPresentationClock_GetTimeSource(clock, &time_source))) + { + if (time_source) + IMFPresentationTimeSource_Release(time_source); audio_renderer_set_presentation_clock(renderer, clock); + } LeaveCriticalSection(&renderer->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b4660402dcf..cb766706c7a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6582,7 +6582,6 @@ static void test_sar(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSink_SetPresentationClock(sink, present_clock); - todo_wine ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#lx.\n", hr); hr = MFCreateSystemTimeSource(&time_source); @@ -7214,9 +7213,7 @@ if (time_source) SET_EXPECT(presentation_clock_GetTimeSource); hr = IMFMediaSink_SetPresentationClock(sink, clock); - todo_wine ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#lx.\n", hr); - todo_wine CHECK_CALLED(presentation_clock_GetTimeSource); IMFPresentationTimeSource_AddRef(presentation_clock->time_source = time_source); @@ -7225,7 +7222,6 @@ if (time_source) SET_EXPECT(presentation_clock_AddClockStateSink); hr = IMFMediaSink_SetPresentationClock(sink, clock); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine CHECK_CALLED(presentation_clock_GetTimeSource); CHECK_CALLED(presentation_clock_AddClockStateSink); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10126