[PATCH 0/1] MR2380: quartz: Set filter sync source in FilterGraph2_AddFilter.

[Shaun Ren (＠shaunren)]

This fixes a bug in the game "Nioh: The Complete Edition", where the videos after the first video are played too quickly.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2380

[PATCH 1/1] quartz: Set filter sync source in FilterGraph2_AddFilter.

[Shaun Ren]

From: Shaun Ren <sren(a)codeweavers.com>

---
 dlls/quartz/filtergraph.c       | 3 ++-
 dlls/quartz/tests/filtergraph.c | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 437691b5553..34f04365fc1 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -656,7 +656,8 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface,
         wcscpy(entry->name, name);
 
     if (FAILED(hr = IBaseFilter_JoinFilterGraph(filter,
-            (IFilterGraph *)&graph->IFilterGraph2_iface, entry->name)))
+            (IFilterGraph *)&graph->IFilterGraph2_iface, entry->name)) ||
+        FAILED(hr = IBaseFilter_SetSyncSource(filter, graph->refClock)))
     {
         CoTaskMemFree(entry->name);
         heap_free(entry);
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index d6ce9d31ce2..391f9777175 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -3314,7 +3314,7 @@ static void test_connect_direct(void)
 
 static void test_sync_source(void)
 {
-    struct testfilter filter1, filter2;
+    struct testfilter filter1, filter2, filter3;
 
     IFilterGraph2 *graph = create_graph();
     IReferenceClock *systemclock, *clock;
@@ -3326,6 +3326,7 @@ static void test_sync_source(void)
 
     testfilter_init(&filter1, NULL, 0);
     testfilter_init(&filter2, NULL, 0);
+    testfilter_init(&filter3, NULL, 0);
 
     IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL);
     IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL);
@@ -3346,10 +3347,14 @@ static void test_sync_source(void)
     ok(clock == systemclock, "Got clock %p.\n", clock);
     IReferenceClock_Release(clock);
 
+    IFilterGraph2_AddFilter(graph, &filter3.IBaseFilter_iface, NULL);
+    ok(filter3.clock == systemclock, "Got clock %p.\n", filter3.clock);
+
     hr = IMediaFilter_SetSyncSource(filter, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     ok(!filter1.clock, "Got clock %p.\n", filter1.clock);
     ok(!filter2.clock, "Got clock %p.\n", filter2.clock);
+    ok(!filter3.clock, "Got clock %p.\n", filter3.clock);
 
     hr = IMediaFilter_GetSyncSource(filter, &clock);
     todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
@@ -3361,6 +3366,7 @@ static void test_sync_source(void)
     ok(!ref, "Got outstanding refcount %ld\n", ref);
     ok(filter1.ref == 1, "Got outstanding refcount %ld.\n", filter1.ref);
     ok(filter2.ref == 1, "Got outstanding refcount %ld.\n", filter2.ref);
+    ok(filter3.ref == 1, "Got outstanding refcount %ld.\n", filter3.ref);
 }
 
 #define check_filter_state(a, b) check_filter_state_(__LINE__, a, b)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2380

[Zebediah Figura (＠zfigura)]

This patch will leave the filter in the graph but not tracked if SetSyncSource() fails. I don't think it's worth putting too much effort into testing the error handling, but currently it looks wrong, which would be confusing to the reader.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2380#note_27230