Zebediah Figura : quartz/filtergraph: Try other output pins if one shouldn 't be rendered.

Alexandre Julliard julliard at winehq.org
Fri Sep 21 17:04:31 CDT 2018


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Sep 20 23:34:12 2018 -0500

quartz/filtergraph: Try other output pins if one shouldn't be rendered.

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

---

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

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index c4ba644..c1b7e5b 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -1059,8 +1059,7 @@ static HRESULT connect_output_pin(IFilterGraphImpl *graph, IBaseFilter *filter,
             {
                 TRACE("Skipping non-rendered pin %s.\n", debugstr_w(info.achName));
                 IPin_Release(pin);
-                IEnumPins_Release(enumpins);
-                return E_FAIL;
+                continue;
             }
 
             if (SUCCEEDED(IFilterGraph2_Connect(&graph->IFilterGraph2_iface, pin, sink)))
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 9ef229f..30bf0cc 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -1783,11 +1783,9 @@ todo_wine
 
     parser1.pin_count = 3;
     hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface);
-todo_wine {
     ok(hr == S_OK, "Got hr %#x.\n", hr);
     ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer);
     ok(sink_pin.peer == &parser1_pins[2].IPin_iface, "Got peer %p.\n", sink_pin.peer);
-}
     IFilterGraph2_Disconnect(graph, source_pin.peer);
     IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface);
     IFilterGraph2_Disconnect(graph, sink_pin.peer);




More information about the wine-cvs mailing list