Zebediah Figura : quartz/filtergraph: Don' t require IAMFilterMiscFlags in IFilterGraph::SetDefaultSyncSource().

Alexandre Julliard julliard at winehq.org
Tue May 21 16:45:22 CDT 2019


Module: wine
Branch: master
Commit: 8e302b83ad35a512a2a8eefc958b9c44b63af35e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8e302b83ad35a512a2a8eefc958b9c44b63af35e

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Mon May 20 17:44:03 2019 -0500

quartz/filtergraph: Don't require IAMFilterMiscFlags in IFilterGraph::SetDefaultSyncSource().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 60cc368..9606a49 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -918,16 +918,7 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface)
 
     LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry)
     {
-        DWORD miscflags;
-        IAMFilterMiscFlags *flags = NULL;
-        IBaseFilter_QueryInterface(filter->filter, &IID_IAMFilterMiscFlags, (void **)&flags);
-        if (!flags)
-            continue;
-        miscflags = IAMFilterMiscFlags_GetMiscFlags(flags);
-        IAMFilterMiscFlags_Release(flags);
-        if (miscflags == AM_FILTER_MISC_FLAGS_IS_RENDERER)
-            IBaseFilter_QueryInterface(filter->filter, &IID_IReferenceClock, (void **)&pClock);
-        if (pClock)
+        if (IBaseFilter_QueryInterface(filter->filter, &IID_IReferenceClock, (void **)&pClock) == S_OK)
             break;
     }
 
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 0842029..e6f2afa 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -3737,7 +3737,7 @@ static void test_default_sync_source(void)
 
     hr = IMediaFilter_GetSyncSource(filter, &clock);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
-    todo_wine ok(clock == &source.IReferenceClock_iface, "Got unexpected clock.\n");
+    ok(clock == &source.IReferenceClock_iface, "Got unexpected clock.\n");
     IReferenceClock_Release(clock);
 
     /* The documentation says that connected filters are preferred, but this




More information about the wine-cvs mailing list