[ros-diffs] [cwittich] 45913: [QEDIT] sync qedit to wine 1.1.40

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sat Mar  6 12:10:27 2010
New Revision: 45913

URL: http://svn.reactos.org/svn/reactos?rev=45913&view=rev
Log:
[QEDIT]
sync qedit to wine 1.1.40

Modified:
    trunk/reactos/dll/directx/qedit/samplegrabber.c

Modified: trunk/reactos/dll/directx/qedit/samplegrabber.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/samplegrabber.c?rev=45913&r1=45912&r2=45913&view=diff
==============================================================================
--- trunk/reactos/dll/directx/qedit/samplegrabber.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/qedit/samplegrabber.c [iso-8859-1] Sat Mar  6 12:10:27 2010
@@ -1014,6 +1014,10 @@
     }
     else
 	type = &This->sg->mtype;
+    if (!IsEqualGUID(&type->formattype, &FORMAT_None) &&
+	!IsEqualGUID(&type->formattype, &GUID_NULL) &&
+	!type->pbFormat)
+	return VFW_E_TYPE_NOT_ACCEPTED;
     hr = IPin_ReceiveConnection(receiver,(IPin*)&This->lpVtbl,type);
     if (FAILED(hr))
 	return hr;
@@ -1053,6 +1057,10 @@
 	if (!IsEqualGUID(&This->sg->mtype.formattype,&GUID_NULL) &&
 	    !IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) &&
 	    !IsEqualGUID(&This->sg->mtype.formattype,&type->formattype))
+	    return VFW_E_TYPE_NOT_ACCEPTED;
+	if (!IsEqualGUID(&type->formattype, &FORMAT_None) &&
+	    !IsEqualGUID(&type->formattype, &GUID_NULL) &&
+	    !type->pbFormat)
 	    return VFW_E_TYPE_NOT_ACCEPTED;
         if (This->sg->mtype.pbFormat)
             CoTaskMemFree(This->sg->mtype.pbFormat);