[ros-diffs] [akhaldi] 60548: [STRMBASE] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sat Oct  5 20:55:09 2013
New Revision: 60548

URL: http://svn.reactos.org/svn/reactos?rev=60548&view=rev
Log:
[STRMBASE]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/lib/3rdparty/strmbase/dllfunc.c
    trunk/reactos/lib/3rdparty/strmbase/enumpins.c
    trunk/reactos/lib/3rdparty/strmbase/transform.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/lib/3rdparty/strmbase/dllfunc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/dllf…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/dllfunc.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/dllfunc.c	[iso-8859-1] Sat Oct  5 20:55:09 2013
@@ -24,6 +24,8 @@
 #include <assert.h>
 
 #define COBJMACROS
+#define NONAMELESSSTRUCT
+#define NONAMELESSUNION
 
 #include "windef.h"
 #include "winbase.h"
@@ -211,8 +213,8 @@
             REGFILTER2 rf2;
             rf2.dwVersion = 1;
             rf2.dwMerit = pFilter->merit;
-            rf2.cPins = pFilter->pins;
-            rf2.rgPins = pFilter->pPin;
+            rf2.u.s1.cPins = pFilter->pins;
+            rf2.u.s1.rgPins = pFilter->pPin;
 
             return IFilterMapper2_RegisterFilter(pIFM2, pFilter->clsid,
pFilter->name, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rf2);
         }

Modified: trunk/reactos/lib/3rdparty/strmbase/enumpins.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/enum…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/enumpins.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/enumpins.c	[iso-8859-1] Sat Oct  5 20:55:09 2013
@@ -76,7 +76,7 @@
 
 static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID riid, LPVOID
* ppv)
 {
-    TRACE("(%s, %p)\n", debugstr_guid(riid), ppv);
+    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
 
     *ppv = NULL;
 
@@ -99,28 +99,27 @@
 static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface)
 {
     IEnumPinsImpl *This = impl_from_IEnumPins(iface);
-    ULONG refCount = InterlockedIncrement(&This->refCount);
-
-    TRACE("(%p)->() AddRef from %d\n", This, refCount - 1);
-
-    return refCount;
+    ULONG ref = InterlockedIncrement(&This->refCount);
+
+    TRACE("(%p)->(): new ref =  %u\n", iface, ref);
+
+    return ref;
 }
 
 static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface)
 {
     IEnumPinsImpl *This = impl_from_IEnumPins(iface);
-    ULONG refCount = InterlockedDecrement(&This->refCount);
-
-    TRACE("(%p)->() Release from %d\n", This, refCount + 1);
-
-    if (!refCount)
+    ULONG ref = InterlockedDecrement(&This->refCount);
+
+    TRACE("(%p)->(): new ref = %u\n", iface, ref);
+
+    if (!ref)
     {
         IBaseFilter_Release(&This->base->IBaseFilter_iface);
         CoTaskMemFree(This);
-        return 0;
-    }
-    else
-        return refCount;
+    }
+
+    return ref;
 }
 
 static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins,
ULONG * pcFetched)
@@ -129,7 +128,7 @@
     HRESULT hr = S_OK;
     ULONG i = 0;
 
-    TRACE("(%u, %p, %p)\n", cPins, ppPins, pcFetched);
+    TRACE("(%p)->(%u, %p, %p)\n", iface, cPins, ppPins, pcFetched);
 
     if (!ppPins)
         return E_POINTER;
@@ -168,7 +167,7 @@
 {
     IEnumPinsImpl *This = impl_from_IEnumPins(iface);
 
-    TRACE("(%u)\n", cPins);
+    TRACE("(%p)->(%u)\n", iface, cPins);
 
     if (This->Version != This->receive_version(This->base))
         return VFW_E_ENUM_OUT_OF_SYNC;
@@ -184,7 +183,8 @@
 {
     IEnumPinsImpl *This = impl_from_IEnumPins(iface);
 
-    TRACE("IEnumPinsImpl::Reset()\n");
+    TRACE("(%p)->()\n", iface);
+
     This->Version = This->receive_version(This->base);
 
     This->uIndex = 0;
@@ -196,7 +196,7 @@
     HRESULT hr;
     IEnumPinsImpl *This = impl_from_IEnumPins(iface);
 
-    TRACE("(%p)\n", ppEnum);
+    TRACE("(%p)->(%p)\n", iface, ppEnum);
 
     hr = EnumPins_Construct(This->base, This->receive_pin,
This->receive_pincount, This->receive_version, ppEnum);
     if (FAILED(hr))

Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/tran…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/transform.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/transform.c	[iso-8859-1] Sat Oct  5 20:55:09 2013
@@ -343,8 +343,8 @@
         DeleteCriticalSection(&This->csReceive);
         FreeMediaType(&This->pmt);
         QualityControlImpl_Destroy(This->qcimpl);
+        IUnknown_Release(This->seekthru_unk);
         CoTaskMemFree(This);
-        IUnknown_Release(This->seekthru_unk);
 
         return 0;
     }

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] Sat Oct  5 20:55:09 2013
@@ -242,7 +242,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.5.26
+reactos/lib/3rdparty/strmbase             # Synced to Wine-1.7.11
 reactos/lib/sdk/uuid                      # Synced to Wine-1.1.42
 
 advapi32 -