Zebediah Figura : qcap: Use pin_matches() directly in find_unconnected_source_from_pin().
Alexandre Julliard
julliard at winehq.org
Thu Apr 9 16:04:44 CDT 2020
Module: wine
Branch: master
Commit: 952f194539263c059fcde6941b31f24da7086930
URL: https://source.winehq.org/git/wine.git/?a=commit;h=952f194539263c059fcde6941b31f24da7086930
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Apr 8 15:58:54 2020 -0500
qcap: Use pin_matches() directly in find_unconnected_source_from_pin().
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qcap/capturegraph.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c
index b49e45b9d6..6c20e727a2 100644
--- a/dlls/qcap/capturegraph.c
+++ b/dlls/qcap/capturegraph.c
@@ -511,12 +511,17 @@ static HRESULT find_unconnected_source_from_pin(CaptureGraphImpl *capture_graph,
if (category && (IsEqualGUID(category, &PIN_CATEGORY_CAPTURE)
|| IsEqualGUID(category, &PIN_CATEGORY_PREVIEW)))
- hr = match_smart_tee_pin(capture_graph, category, majortype, (IUnknown *)pin, &pin);
+ {
+ if (FAILED(hr = match_smart_tee_pin(capture_graph, category, majortype, (IUnknown *)pin, &pin)))
+ return hr;
+ }
+ else if (pin_matches(pin, PINDIR_OUTPUT, category, majortype, FALSE))
+ {
+ IPin_AddRef(pin);
+ hr = S_OK;
+ }
else
- hr = ICaptureGraphBuilder2_FindPin(&capture_graph->ICaptureGraphBuilder2_iface,
- (IUnknown *)pin, PINDIR_OUTPUT, category, majortype, FALSE, -1, &pin);
- if (FAILED(hr))
- return hr;
+ return E_FAIL;
if (FAILED(IPin_ConnectedTo(pin, &peer)))
{
More information about the wine-cvs
mailing list