From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Sat, 6 Mar 2010 11:10:27 +0000 (+0000)
Subject: [QEDIT]
X-Git-Tag: backups/header-work@57446~208^2~84
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=4a6951f8705b2f2124f3f93e9737696ebe74bc3a

[QEDIT]
sync qedit to wine 1.1.40

svn path=/trunk/; revision=45913
---

diff --git a/reactos/dll/directx/qedit/samplegrabber.c b/reactos/dll/directx/qedit/samplegrabber.c
index b4912eb63de..d09d5546b19 100644
--- a/reactos/dll/directx/qedit/samplegrabber.c
+++ b/reactos/dll/directx/qedit/samplegrabber.c
@@ -1014,6 +1014,10 @@ SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE
     }
     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;
@@ -1054,6 +1058,10 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M
 	    !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);
         This->sg->mtype = *type;