[ros-diffs] [cwittich] 45914: [QUARTZ] sync quartz to wine 1.1.40

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sat Mar  6 12:12:11 2010
New Revision: 45914

URL: http://svn.reactos.org/svn/reactos?rev=45914&view=rev
Log:
[QUARTZ]
sync quartz to wine 1.1.40

Modified:
    trunk/reactos/dll/directx/quartz/filesource.c
    trunk/reactos/dll/directx/quartz/pin.c

Modified: trunk/reactos/dll/directx/quartz/filesource.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/filesource.c?rev=45914&r1=45913&r2=45914&view=diff
==============================================================================
--- trunk/reactos/dll/directx/quartz/filesource.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/quartz/filesource.c [iso-8859-1] Sat Mar  6 12:12:11 2010
@@ -395,7 +395,8 @@
         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;

Modified: trunk/reactos/dll/directx/quartz/pin.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/pin.c?rev=45914&r1=45913&r2=45914&view=diff
==============================================================================
--- trunk/reactos/dll/directx/quartz/pin.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/quartz/pin.c [iso-8859-1] Sat Mar  6 12:12:11 2010
@@ -765,9 +765,6 @@
                 {
                     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))
                     {