[ros-diffs] [akhaldi] 64216: [STRMBASE] * Sync with Wine 1.7.27. CORE-8540

Author: akhaldi
Date: Sun Sep 21 17:18:11 2014
New Revision: 64216

URL: http://svn.reactos.org/svn/reactos?rev=64216&view=rev
Log:
[STRMBASE]
* Sync with Wine 1.7.27.
CORE-8540

Modified:
    trunk/reactos/lib/3rdparty/strmbase/pin.c
    trunk/reactos/lib/3rdparty/strmbase/renderer.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/lib/3rdparty/strmbase/pin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/pin.…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/pin.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/pin.c	[iso-8859-1] Sun Sep 21 17:18:11 2014
@@ -71,7 +71,6 @@
     hr = IPin_QueryInternalConnections( from, NULL, &amount );
     if (hr != E_NOTIMPL && amount)
         FIXME("Use QueryInternalConnections!\n");
-     hr = S_OK;
 
     pin_info.pFilter = NULL;
     hr = IPin_QueryPinInfo( from, &pin_info );
@@ -391,11 +390,7 @@
 
     if (!refCount)
     {
-        FreeMediaType(&This->pin.mtCurrent);
-        if (This->pAllocator)
-            IMemAllocator_Release(This->pAllocator);
-        This->pAllocator = NULL;
-        CoTaskMemFree(This);
+        BaseOutputPin_Destroy(This);
         return 0;
     }
     return refCount;
@@ -839,6 +834,16 @@
     return E_FAIL;
 }
 
+HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This)
+{
+    FreeMediaType(&This->pin.mtCurrent);
+    if (This->pAllocator)
+        IMemAllocator_Release(This->pAllocator);
+    This->pAllocator = NULL;
+    CoTaskMemFree(This);
+    return S_OK;
+}
+
 /*** Input Pin implementation ***/
 
 static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface )
@@ -890,12 +895,7 @@
 
     if (!refCount)
     {
-        FreeMediaType(&This->pin.mtCurrent);
-        if (This->pAllocator)
-            IMemAllocator_Release(This->pAllocator);
-        This->pAllocator = NULL;
-        This->pin.IPin_iface.lpVtbl = NULL;
-        CoTaskMemFree(This);
+        BaseInputPin_Destroy(This);
         return 0;
     }
     else
@@ -1263,3 +1263,14 @@
     CoTaskMemFree(pPinImpl);
     return E_FAIL;
 }
+
+HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This)
+{
+    FreeMediaType(&This->pin.mtCurrent);
+    if (This->pAllocator)
+        IMemAllocator_Release(This->pAllocator);
+    This->pAllocator = NULL;
+    This->pin.IPin_iface.lpVtbl = NULL;
+    CoTaskMemFree(This);
+    return S_OK;
+}

Modified: trunk/reactos/lib/3rdparty/strmbase/renderer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/rend…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/renderer.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/renderer.c	[iso-8859-1] Sun Sep 21 17:18:11 2014
@@ -95,8 +95,8 @@
 
     TRACE("(%p/%p)->()\n", This, pFilter);
 
+    EnterCriticalSection(&pFilter->csRenderLock);
     EnterCriticalSection(&pFilter->filter.csFilter);
-    EnterCriticalSection(&pFilter->csRenderLock);
     hr = BaseInputPinImpl_EndOfStream(iface);
     EnterCriticalSection(This->pin.pCritSec);
     if (SUCCEEDED(hr))
@@ -107,8 +107,8 @@
             hr = BaseRendererImpl_EndOfStream(pFilter);
     }
     LeaveCriticalSection(This->pin.pCritSec);
+    LeaveCriticalSection(&pFilter->filter.csFilter);
     LeaveCriticalSection(&pFilter->csRenderLock);
-    LeaveCriticalSection(&pFilter->filter.csFilter);
     return hr;
 }
 
@@ -120,8 +120,8 @@
 
     TRACE("(%p/%p)->()\n", This, iface);
 
+    EnterCriticalSection(&pFilter->csRenderLock);
     EnterCriticalSection(&pFilter->filter.csFilter);
-    EnterCriticalSection(&pFilter->csRenderLock);
     EnterCriticalSection(This->pin.pCritSec);
     hr = BaseInputPinImpl_BeginFlush(iface);
     if (SUCCEEDED(hr))
@@ -145,8 +145,8 @@
 
     TRACE("(%p/%p)->()\n", This, pFilter);
 
+    EnterCriticalSection(&pFilter->csRenderLock);
     EnterCriticalSection(&pFilter->filter.csFilter);
-    EnterCriticalSection(&pFilter->csRenderLock);
     EnterCriticalSection(This->pin.pCritSec);
     hr = BaseInputPinImpl_EndFlush(iface);
     if (SUCCEEDED(hr))
@@ -157,8 +157,8 @@
             hr = BaseRendererImpl_EndFlush(pFilter);
     }
     LeaveCriticalSection(This->pin.pCritSec);
+    LeaveCriticalSection(&pFilter->filter.csFilter);
     LeaveCriticalSection(&pFilter->csRenderLock);
-    LeaveCriticalSection(&pFilter->filter.csFilter);
     return hr;
 }
 

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] Sun Sep 21 17:18:11 2014
@@ -248,7 +248,7 @@
 from Winehq CVS. If you are looking to update something in these files
 check Wine current souces first as it may already be fixed.
 
-reactos/lib/3rdparty/strmbase               # Synced to Wine-1.7.17
+reactos/lib/3rdparty/strmbase               # Synced to Wine-1.7.27
 
 advapi32 -
   reactos/dll/win32/advapi32/crypt/*.c          # Synced to Wine-1.7.1