ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qcap/capturegraph: Return BOOL from pin_matches(). 

It is not interesting to account for IPin::QueryDirection failing.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-03-05 20:04:33 -06:00 committed by Alexandre Julliard
parent fea96a5739
commit e09be148f2
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/qcap/capturegraph.c
View File

@ -580,25 +580,24 @@ fnCaptureGraphBuilder2_CopyCaptureFile(ICaptureGraphBuilder2 * iface,
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, const GUID *type, BOOL unconnected) static BOOL pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, const GUID *type, BOOL unconnected)
{ {
IPin *partner; IPin *partner;
PIN_DIRECTION pindir; PIN_DIRECTION pindir;
HRESULT hr; HRESULT hr;
hr = IPin_QueryDirection(pin, &pindir); if (FAILED(hr = IPin_QueryDirection(pin, &pindir)))
ERR("Failed to query direction, hr %#x.\n", hr);
if (unconnected && IPin_ConnectedTo(pin, &partner) == S_OK && partner!=NULL) if (unconnected && IPin_ConnectedTo(pin, &partner) == S_OK && partner!=NULL)
{ {
IPin_Release(partner); IPin_Release(partner);
TRACE("No match, %p already connected to %p\n", pin, partner); TRACE("No match, %p already connected to %p\n", pin, partner);
return FAILED(hr) ? hr : S_FALSE; return FALSE;
} }
if (FAILED(hr)) if (pindir != direction)
return hr; return FALSE;
if (SUCCEEDED(hr) && pindir != direction)
return S_FALSE;
if (cat) if (cat)
{ {
@ -608,13 +607,13 @@ static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat,
hr = IPin_QueryInterface(pin, &IID_IKsPropertySet, (void**)&props); hr = IPin_QueryInterface(pin, &IID_IKsPropertySet, (void**)&props);
if (FAILED(hr)) if (FAILED(hr))
return S_FALSE; return FALSE;
hr = IKsPropertySet_Get(props, &AMPROPSETID_Pin, 0, NULL, hr = IKsPropertySet_Get(props, &AMPROPSETID_Pin, 0, NULL,
0, &category, sizeof(category), &fetched); 0, &category, sizeof(category), &fetched);
IKsPropertySet_Release(props); IKsPropertySet_Release(props);
if (FAILED(hr) || !IsEqualIID(&category, cat)) if (FAILED(hr) || !IsEqualIID(&category, cat))
return S_FALSE; return FALSE;
} }
if (type) if (type)
@ -625,14 +624,14 @@ static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat,
hr = IPin_EnumMediaTypes(pin, &types); hr = IPin_EnumMediaTypes(pin, &types);
if (FAILED(hr)) if (FAILED(hr))
return S_FALSE; return FALSE;
IEnumMediaTypes_Reset(types); IEnumMediaTypes_Reset(types);
while (1) { while (1) {
if (IEnumMediaTypes_Next(types, 1, &media_type, &fetched) != S_OK || fetched != 1) if (IEnumMediaTypes_Next(types, 1, &media_type, &fetched) != S_OK || fetched != 1)
{ {
IEnumMediaTypes_Release(types); IEnumMediaTypes_Release(types);
return S_FALSE; return FALSE;
} }
if (IsEqualIID(&media_type->majortype, type)) if (IsEqualIID(&media_type->majortype, type))
@ -646,7 +645,7 @@ static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat,
} }
TRACE("Pin matched\n"); TRACE("Pin matched\n");
return S_OK; return TRUE;
} }
static HRESULT WINAPI static HRESULT WINAPI
@ -712,13 +711,10 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface,
} }
TRACE("Testing match\n"); TRACE("Testing match\n");
hr = pin_matches(pin, pindir, pCategory, pType, fUnconnected); if (pin_matches(pin, pindir, pCategory, pType, fUnconnected) && numcurrent++ == num)
if (hr == S_OK && numcurrent++ == num)
break; break;
IPin_Release(pin); IPin_Release(pin);
pin = NULL; pin = NULL;
if (FAILED(hr))
break;
} }
IEnumPins_Release(enumpins); IEnumPins_Release(enumpins);
IBaseFilter_Release(filter); IBaseFilter_Release(filter);
@ -729,7 +725,7 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface,
return E_FAIL; return E_FAIL;
} }
} }
else if (pin_matches(pin, pindir, pCategory, pType, fUnconnected) != S_OK) else if (!pin_matches(pin, pindir, pCategory, pType, fUnconnected))
{ {
IPin_Release(pin); IPin_Release(pin);
return E_FAIL; return E_FAIL;