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

[QUARTZ]
sync quartz to wine 1.1.40

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

diff --git a/reactos/dll/directx/quartz/filesource.c b/reactos/dll/directx/quartz/filesource.c
index 5f6350fb99f..cb9282c8bb5 100644
--- a/reactos/dll/directx/quartz/filesource.c
+++ b/reactos/dll/directx/quartz/filesource.c
@@ -395,7 +395,8 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii
         return S_OK;
     }
 
-    if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking) && !IsEqualIID(riid, &IID_IVideoWindow))
+    if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking) &&
+        !IsEqualIID(riid, &IID_IVideoWindow) && !IsEqualIID(riid, &IID_IBasicAudio))
         FIXME("No interface for %s!\n", qzdebugstr_guid(riid));
 
     return E_NOINTERFACE;
diff --git a/reactos/dll/directx/quartz/pin.c b/reactos/dll/directx/quartz/pin.c
index 2e24d520667..ca34d9331c5 100644
--- a/reactos/dll/directx/quartz/pin.c
+++ b/reactos/dll/directx/quartz/pin.c
@@ -765,9 +765,6 @@ HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDI
                 {
                     assert(pmtCandidate);
                     dump_AM_MEDIA_TYPE(pmtCandidate);
-                    if (!IsEqualGUID(&FORMAT_None, &pmtCandidate->formattype)
-                        && !IsEqualGUID(&GUID_NULL, &pmtCandidate->formattype))
-                        assert(pmtCandidate->pbFormat);
                     if (( !pmt || CompareMediaTypes(pmt, pmtCandidate, TRUE) ) && 
                         (This->pConnectSpecific(iface, pReceivePin, pmtCandidate) == S_OK))
                     {