[STRMBASE] Sync with Wine Staging 1.7.37. CORE-9246

svn path=/trunk/; revision=67127

diff --git a/reactos/lib/3rdparty/strmbase/dllfunc.c b/reactos/lib/3rdparty/strmbase/dllfunc.c
index eb7ab64..bb8316e 100644 (file)
--- a/reactos/lib/3rdparty/strmbase/dllfunc.c
+++ b/reactos/lib/3rdparty/strmbase/dllfunc.c
@@ -154,7 +154,7 @@ HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister)
     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,

diff --git a/reactos/lib/3rdparty/strmbase/enumpins.c b/reactos/lib/3rdparty/strmbase/enumpins.c
index 57f0a4f..c6ed446 100644 (file)
--- a/reactos/lib/3rdparty/strmbase/enumpins.c
+++ b/reactos/lib/3rdparty/strmbase/enumpins.c
@@ -119,7 +119,6 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface)
 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 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin **
     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);

diff --git a/reactos/lib/3rdparty/strmbase/pospass.c b/reactos/lib/3rdparty/strmbase/pospass.c
index 57a5999..c08702d 100644 (file)
--- a/reactos/lib/3rdparty/strmbase/pospass.c
+++ b/reactos/lib/3rdparty/strmbase/pospass.c
@@ -226,6 +226,8 @@ HRESULT WINAPI CreatePosPassThru(IUnknown* pUnkOuter, BOOL bRenderer, IPin *pPin
     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);

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index abc3185..eecdc0e 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -258,7 +258,7 @@ In addition the following libs, dlls and source files are mostly based on code p
 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