[ros-diffs] [akhaldi] 68526: [QUARTZ] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Tue Jul 21 23:29:47 2015
New Revision: 68526

URL: http://svn.reactos.org/svn/reactos?rev=68526&view=rev
Log:
[QUARTZ] Sync with Wine Staging 1.7.47. CORE-9924

Modified:
    trunk/reactos/dll/directx/wine/quartz/acmwrapper.c
    trunk/reactos/dll/directx/wine/quartz/avidec.c
    trunk/reactos/dll/directx/wine/quartz/filesource.c
    trunk/reactos/dll/directx/wine/quartz/filtergraph.c
    trunk/reactos/dll/directx/wine/quartz/main.c
    trunk/reactos/dll/directx/wine/quartz/memallocator.c
    trunk/reactos/dll/directx/wine/quartz/systemclock.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/quartz/acmwrapper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ac…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/acmwrapper.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/acmwrapper.c	[iso-8859-1] Tue Jul 21 23:29:47
2015
@@ -375,7 +375,7 @@
     if (FAILED(hr))
         return hr;
 
-    *ppv = This;
+    *ppv = &This->tf.filter.IBaseFilter_iface;
     This->lasttime_real = This->lasttime_sent = -1;
 
     return hr;

Modified: trunk/reactos/dll/directx/wine/quartz/avidec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/avidec.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/avidec.c	[iso-8859-1] Tue Jul 21 23:29:47 2015
@@ -396,7 +396,7 @@
     This->pBihIn = NULL;
     This->pBihOut = NULL;
 
-    *ppv = This;
+    *ppv = &This->tf.filter.IBaseFilter_iface;
 
     return hr;
 }

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 Jul 21 23:29:47
2015
@@ -437,13 +437,13 @@
     *ppv = NULL;
 
     if (IsEqualIID(riid, &IID_IUnknown))
-        *ppv = This;
+        *ppv = &This->filter.IBaseFilter_iface;
     else if (IsEqualIID(riid, &IID_IPersist))
-        *ppv = This;
+        *ppv = &This->filter.IBaseFilter_iface;
     else if (IsEqualIID(riid, &IID_IMediaFilter))
-        *ppv = This;
+        *ppv = &This->filter.IBaseFilter_iface;
     else if (IsEqualIID(riid, &IID_IBaseFilter))
-        *ppv = This;
+        *ppv = &This->filter.IBaseFilter_iface;
     else if (IsEqualIID(riid, &IID_IFileSourceFilter))
         *ppv = &This->IFileSourceFilter_iface;
     else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags))

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 Jul 21 23:29:47
2015
@@ -2432,8 +2432,16 @@
 {
     IFilterGraphImpl *This = impl_from_IMediaSeeking(iface);
 
-    FIXME("(%p/%p)->(%p, %p, 0x%s, %p): stub !!!\n", This, iface, pTarget,
-        pTargetFormat, wine_dbgstr_longlong(Source), pSourceFormat);
+    TRACE("(%p/%p)->(%p, %s, 0x%s, %s)\n", This, iface, pTarget,
+        debugstr_guid(pTargetFormat), wine_dbgstr_longlong(Source),
debugstr_guid(pSourceFormat));
+
+    if (!pSourceFormat)
+        pSourceFormat = &This->timeformatseek;
+
+    if (IsEqualGUID(pTargetFormat, pSourceFormat))
+        *pTarget = Source;
+    else
+        FIXME("conversion %s->%s not supported\n",
debugstr_guid(pSourceFormat), debugstr_guid(pTargetFormat));
 
     return S_OK;
 }

Modified: trunk/reactos/dll/directx/wine/quartz/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ma…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/main.c	[iso-8859-1] Tue Jul 21 23:29:47 2015
@@ -22,8 +22,6 @@
 extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *)
DECLSPEC_HIDDEN;
 extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN;
 extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
-
-static DWORD dll_ref = 0;
 
 /* For the moment, do nothing here. */
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
@@ -200,7 +198,6 @@
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-    if (dll_ref) return S_FALSE;
     return QUARTZ_DllCanUnloadNow();
 }
 

Modified: trunk/reactos/dll/directx/wine/quartz/memallocator.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/me…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/memallocator.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/memallocator.c	[iso-8859-1] Tue Jul 21 23:29:47
2015
@@ -107,9 +107,9 @@
     *ppv = NULL;
 
     if (IsEqualIID(riid, &IID_IUnknown))
-        *ppv = This;
+        *ppv = &This->IMemAllocator_iface;
     else if (IsEqualIID(riid, &IID_IMemAllocator))
-        *ppv = This;
+        *ppv = &This->IMemAllocator_iface;
 
     if (*ppv)
     {

Modified: trunk/reactos/dll/directx/wine/quartz/systemclock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/sy…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/systemclock.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/systemclock.c	[iso-8859-1] Tue Jul 21 23:29:47
2015
@@ -121,6 +121,7 @@
       it = nextit;
     }
     if (NULL != it) timeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) -
curTime) / (REFERENCE_TIME)10000;
+    else timeOut = INFINITE;
 
     /** Now Periodics Advice: semi sorted list (sort cannot be used) */
     for (it = This->pPeriodicAdvise; NULL != it; it = it->next) {

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 Jul 21 23:29:47 2015
@@ -40,7 +40,7 @@
 reactos/dll/directx/wine/dxgi           # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/msdmo          # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/qedit          # Synced to WineStaging-1.7.37
-reactos/dll/directx/wine/quartz         # Synced to WineStaging-1.7.37
+reactos/dll/directx/wine/quartz         # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/wined3d        # Synced to WineStaging-1.7.37
 
 reactos/dll/win32/activeds            # Synced to WineStaging-1.7.37