[ros-diffs] [akhaldi] 70840: [QUARTZ] Sync with Wine Staging 1.9.4. CORE-10912

Author: akhaldi
Date: Tue Mar  1 18:25:44 2016
New Revision: 70840

URL: http://svn.reactos.org/svn/reactos?rev=70840&view=rev
Log:
[QUARTZ] Sync with Wine Staging 1.9.4. CORE-10912

Modified:
    trunk/reactos/dll/directx/wine/quartz/enumfilters.c
    trunk/reactos/dll/directx/wine/quartz/filesource.c
    trunk/reactos/dll/directx/wine/quartz/filtergraph.c
    trunk/reactos/dll/directx/wine/quartz/parser.c
    trunk/reactos/dll/directx/wine/quartz/pin.c
    trunk/reactos/dll/directx/wine/quartz/regsvr.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/quartz/enumfilters.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/enumfilters.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/enumfilters.c	[iso-8859-1] Tue Mar  1 18:25:44
2016
@@ -181,7 +181,7 @@
 
     This->uIndex = 0;
     hr = IGraphVersion_QueryVersion(This->pVersionSource, &currentVersion);
-    if (!hr)
+    if (hr == S_OK)
         This->Version = currentVersion;
     return S_OK;
 }

Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filesource.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filesource.c	[iso-8859-1] Tue Mar  1 18:25:44
2016
@@ -637,8 +637,9 @@
             hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype,
&This->pmt->subtype, NULL);
             if (FAILED(hr))
             {
-                CoTaskMemFree(This->pmt);
-                This->pmt = NULL;
+                memcpy(&This->pmt->majortype, &MEDIATYPE_Stream,
sizeof(GUID));
+                memcpy(&This->pmt->subtype,   &MEDIASUBTYPE_NULL,
sizeof(GUID));
+                hr = S_OK;
             }
         }
         else

Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filtergraph.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c	[iso-8859-1] Tue Mar  1 18:25:44
2016
@@ -1596,7 +1596,7 @@
     /* Try to find a match without reading the file first */
     hr = GetClassMediaFile(NULL, pszFileName, NULL, NULL, &clsid);
 
-    if (!hr)
+    if (hr == S_OK)
         return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter);
 
     /* Now create a AyncReader instance, to check for signature bytes in the file */
@@ -1638,7 +1638,7 @@
     hr = GetClassMediaFile(pReader, pszFileName, NULL, NULL, &clsid);
     IAsyncReader_Release(pReader);
 
-    if (!hr)
+    if (hr == S_OK)
     {
         /* Release the AsyncReader filter and create the matching one */
         IBaseFilter_Release(*filter);
@@ -2462,6 +2462,9 @@
     if (!pSourceFormat)
         pSourceFormat = &This->timeformatseek;
 
+    if (!pTargetFormat)
+        pTargetFormat = &This->timeformatseek;
+
     if (IsEqualGUID(pTargetFormat, pSourceFormat))
         *pTarget = Source;
     else
@@ -2607,6 +2610,11 @@
     IFilterGraphImpl *This = impl_from_IMediaSeeking(iface);
 
     FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pdRate);
+
+    if (!pdRate)
+        return E_POINTER;
+
+    *pdRate = 1.0;
 
     return S_OK;
 }

Modified: trunk/reactos/dll/directx/wine/quartz/parser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/parser.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/parser.c	[iso-8859-1] Tue Mar  1 18:25:44 2016
@@ -141,8 +141,12 @@
         return S_OK;
     }
 
-    if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid,
&IID_IVideoWindow))
+    if (!IsEqualIID(riid, &IID_IPin) &&
+        !IsEqualIID(riid, &IID_IVideoWindow) &&
+        !IsEqualIID(riid, &IID_IAMFilterMiscFlags))
+    {
         FIXME("No interface for %s!\n", qzdebugstr_guid(riid));
+    }
 
     return E_NOINTERFACE;
 }

Modified: trunk/reactos/dll/directx/wine/quartz/pin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/pin.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/pin.c	[iso-8859-1] Tue Mar  1 18:25:44 2016
@@ -835,25 +835,3 @@
 
     return SendFurther( iface, deliver_newsegment, &args, NULL );
 }
-
-static const IPinVtbl PullPin_Vtbl = 
-{
-    PullPin_QueryInterface,
-    BasePinImpl_AddRef,
-    PullPin_Release,
-    BaseInputPinImpl_Connect,
-    PullPin_ReceiveConnection,
-    PullPin_Disconnect,
-    BasePinImpl_ConnectedTo,
-    BasePinImpl_ConnectionMediaType,
-    BasePinImpl_QueryPinInfo,
-    BasePinImpl_QueryDirection,
-    BasePinImpl_QueryId,
-    PullPin_QueryAccept,
-    BasePinImpl_EnumMediaTypes,
-    BasePinImpl_QueryInternalConnections,
-    PullPin_EndOfStream,
-    PullPin_BeginFlush,
-    PullPin_EndFlush,
-    PullPin_NewSegment
-};

Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/regsvr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/regsvr.c	[iso-8859-1] Tue Mar  1 18:25:44 2016
@@ -19,6 +19,8 @@
  */
 
 #include "quartz_private.h"
+
+#include <uuids.h>
 
 /*
  * Near the bottom of this file are the exported DllRegisterServer and
@@ -798,6 +800,11 @@
             "0, 10, FFFFFF00000080808080, 494433000000000000",
 	    NULL }
     },
+    {   &MEDIATYPE_Stream,
+        &MEDIASUBTYPE_MPEG2_PROGRAM,
+        {   "0, 5, FFFFFFFFC0, 000001BA40",
+            NULL }
+    },
     {	&MEDIATYPE_Stream,
 	&MEDIASUBTYPE_QTMovie,
 	{   "4, 4, , 6d646174",

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Tue Mar  1 18:25:44 2016
@@ -39,7 +39,7 @@
 reactos/dll/directx/wine/dxdiagn        # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/msdmo          # Synced to WineStaging-1.7.55
 reactos/dll/directx/wine/qedit          # Synced to WineStaging-1.7.55
-reactos/dll/directx/wine/quartz         # Synced to WineStaging-1.7.55
+reactos/dll/directx/wine/quartz         # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/wined3d        # Synced to WineStaging-1.9.4
 
 reactos/dll/win32/activeds            # Synced to WineStaging-1.7.55