Zebediah Figura : quartz/filtergraph: Don't check for cyclic connections in IFilterGraph2::Connect().

Alexandre Julliard julliard at winehq.org
Thu Feb 20 18:26:13 CST 2020


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Wed Feb 19 20:44:57 2020 -0600

quartz/filtergraph: Don't check for cyclic connections in IFilterGraph2::Connect().

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

---

 dlls/quartz/filtergraph.c       | 4 ----
 dlls/quartz/tests/filtergraph.c | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 9e56822480..1e87f81858 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -1200,10 +1200,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut,
         ppinOut = temp;
     }
 
-    hr = CheckCircularConnection(This, ppinOut, ppinIn);
-    if (FAILED(hr))
-        goto out;
-
     /* Try direct connection first */
     hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinIn, NULL);
 
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index fd73a9ad83..65fa4dac3b 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -2318,7 +2318,7 @@ todo_wine
     IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface);
 
     hr = IFilterGraph2_Connect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface);
-    todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr);
+    ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr);
 
     parser1_pins[0].QueryInternalConnections_hr = S_OK;
     hr = IFilterGraph2_Connect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface);




More information about the wine-cvs mailing list