Commit 7c35fccb authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

strmbase: Don't check the subtype when determining if a media type is partial.

parent 4f1df524
...@@ -1200,12 +1200,7 @@ static void test_connect_pin(void) ...@@ -1200,12 +1200,7 @@ static void test_connect_pin(void)
ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
req_mt.subtype = GUID_NULL; req_mt.subtype = GUID_NULL;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt);
todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
if (hr == S_OK)
{
IFilterGraph2_Disconnect(graph, source);
IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
}
req_mt.subtype = MEDIASUBTYPE_I420; req_mt.subtype = MEDIASUBTYPE_I420;
/* Connection with wildcards. */ /* Connection with wildcards. */
......
...@@ -1435,12 +1435,7 @@ static void test_connect_pin(void) ...@@ -1435,12 +1435,7 @@ static void test_connect_pin(void)
ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
req_mt.subtype = GUID_NULL; req_mt.subtype = GUID_NULL;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt);
todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
if (hr == S_OK)
{
IFilterGraph2_Disconnect(graph, source);
IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
}
req_mt.subtype = MEDIASUBTYPE_MPEG1AudioPayload; req_mt.subtype = MEDIASUBTYPE_MPEG1AudioPayload;
/* Connection with wildcards. */ /* Connection with wildcards. */
......
...@@ -482,8 +482,10 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP ...@@ -482,8 +482,10 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP
return VFW_E_NOT_STOPPED; return VFW_E_NOT_STOPPED;
} }
/* We don't check the subtype here. The rationale (as given by the DirectX
* documentation) is that the format type is supposed to provide at least
* as much information as the subtype. */
if (mt && !IsEqualGUID(&mt->majortype, &GUID_NULL) if (mt && !IsEqualGUID(&mt->majortype, &GUID_NULL)
&& !IsEqualGUID(&mt->subtype, &GUID_NULL)
&& !IsEqualGUID(&mt->formattype, &GUID_NULL)) && !IsEqualGUID(&mt->formattype, &GUID_NULL))
{ {
hr = pin->pFuncsTable->pfnAttemptConnection(pin, peer, mt); hr = pin->pFuncsTable->pfnAttemptConnection(pin, peer, mt);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment