[PATCH 4/4] quartz/filtergraph: Return VFW_E_CANNOT_CONNECT from FilterGraph2_Connect() on failure.
Zebediah Figura
z.figura12 at gmail.com
Thu Sep 20 23:34:15 CDT 2018
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/quartz/filtergraph.c | 2 +-
dlls/quartz/tests/filtergraph.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 0468cb5..8451e0d 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -1391,7 +1391,7 @@ out:
--This->recursioncount;
LeaveCriticalSection(&This->cs);
TRACE("--> %08x\n", hr);
- return SUCCEEDED(hr) ? S_OK : hr;
+ return SUCCEEDED(hr) ? S_OK : VFW_E_CANNOT_CONNECT;
}
/* Render all output pins of the given filter. Helper for FilterGraph2_Render(). */
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 6c8b9fa..db62ded 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -609,7 +609,6 @@ static void test_render_run(const WCHAR *file)
ok(!refs, "Graph has %u references\n", refs);
hr = test_graph_builder_connect_file(filename);
-todo_wine
ok(hr == VFW_E_CANNOT_CONNECT, "got %#x\n", hr);
}
else
@@ -1713,7 +1712,6 @@ static void test_graph_builder_connect(void)
sink_pin.accept_mt = &sink_type;
hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface);
-todo_wine
ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr);
ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
@@ -1805,7 +1803,6 @@ todo_wine
parser1_pins[1].name[0] = '~';
hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface);
-todo_wine
ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr);
ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
--
2.7.4
More information about the wine-devel
mailing list