[ros-diffs] [akhaldi] 67127: [STRMBASE] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Fri Apr 10 09:44:40 2015
New Revision: 67127

URL: http://svn.reactos.org/svn/reactos?rev=67127&view=rev
Log:
[STRMBASE] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/lib/3rdparty/strmbase/dllfunc.c
    trunk/reactos/lib/3rdparty/strmbase/enumpins.c
    trunk/reactos/lib/3rdparty/strmbase/pospass.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] Fri Apr 10 09:44:40 2015
@@ -154,7 +154,7 @@
     if (bRegister)
         hr = SetupRegisterAllClasses(g_Templates, g_cTemplates, szFileName, TRUE );
 
-    hr = CoInitialize(NULL);
+    CoInitialize(NULL);
 
     TRACE("Getting IFilterMapper2\r\n");
     hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER,

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] Fri Apr 10 09:44:40 2015
@@ -119,7 +119,6 @@
 static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins,
ULONG * pcFetched)
 {
     IEnumPinsImpl *This = impl_from_IEnumPins(iface);
-    HRESULT hr = S_OK;
     ULONG i = 0;
 
     TRACE("(%p)->(%u, %p, %p)\n", iface, cPins, ppPins, pcFetched);
@@ -136,7 +135,7 @@
     if (This->Version != This->receive_version(This->base))
         return VFW_E_ENUM_OUT_OF_SYNC;
 
-    while (i < cPins && hr == S_OK)
+    while (i < cPins)
     {
        IPin *pin;
        pin = This->receive_pin(This->base, This->uIndex + i);

Modified: trunk/reactos/lib/3rdparty/strmbase/pospass.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/posp…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/pospass.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/pospass.c	[iso-8859-1] Fri Apr 10 09:44:40 2015
@@ -226,6 +226,8 @@
     ISeekingPassThru *passthru;
 
     hr = CoCreateInstance(&CLSID_SeekingPassThru, pUnkOuter, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)ppPassThru);
+    if (FAILED(hr))
+        return hr;
 
     IUnknown_QueryInterface(*ppPassThru, &IID_ISeekingPassThru,
(void**)&passthru);
     hr = ISeekingPassThru_Init(passthru, bRenderer, pPin);

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] Fri Apr 10 09:44:40 2015
@@ -258,7 +258,7 @@
 from Winehq CVS. If you are looking to update something in these files
 check Wine current sources first as it may already be fixed.
 
-reactos/lib/3rdparty/strmbase               # Synced to Wine-1.7.27
+reactos/lib/3rdparty/strmbase               # Synced to WineStaging-1.7.37
 
 reactos/lib/rtl/actctx.c                    # Partly synced with WineStaging-1.7.37