Author: akhaldi Date: Thu Nov 26 22:53:27 2015 New Revision: 70126
URL: http://svn.reactos.org/svn/reactos?rev=70126&view=rev Log: [STRMBASE] Sync with Wine Staging 1.7.55. CORE-10536
Modified: trunk/reactos/lib/3rdparty/strmbase/CMakeLists.txt trunk/reactos/lib/3rdparty/strmbase/audio.c trunk/reactos/lib/3rdparty/strmbase/dispatch.c trunk/reactos/lib/3rdparty/strmbase/dllfunc.c trunk/reactos/lib/3rdparty/strmbase/filter.c trunk/reactos/lib/3rdparty/strmbase/outputqueue.c trunk/reactos/lib/3rdparty/strmbase/pin.c trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c trunk/reactos/lib/3rdparty/strmbase/renderer.c trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h trunk/reactos/lib/3rdparty/strmbase/transform.c trunk/reactos/lib/3rdparty/strmbase/video.c trunk/reactos/lib/3rdparty/strmbase/window.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/lib/3rdparty/strmbase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/CMake... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/CMakeLists.txt [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -1,3 +1,6 @@ + +remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) +add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__)
Modified: trunk/reactos/lib/3rdparty/strmbase/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/audio... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/audio.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/audio.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -62,8 +62,8 @@ HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BasicAudio *This = impl_from_IBasicAudio(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr;
hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr))
Modified: trunk/reactos/lib/3rdparty/strmbase/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/dispa... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/dispatch.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -24,16 +24,14 @@
HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { - HRESULT hr = E_FAIL; ITypeLib *pTypeLib; + HRESULT hr;
This->pTypeInfo = NULL; hr = LoadRegTypeLib(&LIBID_QuartzTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &pTypeLib); if (SUCCEEDED(hr)) { hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, riid, &This->pTypeInfo); - - if (pTypeLib) ITypeLib_Release(pTypeLib); } return hr;
Modified: trunk/reactos/lib/3rdparty/strmbase/dllfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/dllfu... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/dllfunc.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/dllfunc.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -36,7 +36,6 @@ /* * defines and constants */ -#define MAX_KEY_LEN 260
static const WCHAR clsid_keyname[] = {'C','L','S','I','D',0 }; static const WCHAR ips32_keyname[] = {'I','n','P','r','o','c','S','e','r','v','e','r','3','2',0}; @@ -110,7 +109,7 @@ pList->m_Name, szFileName, ips32_keyname, tmodel_both); else - hr = SHDeleteKeyW(hkey, szCLSID); + hr = RegDeleteTreeW(hkey, szCLSID); } } RegCloseKey(hkey);
Modified: trunk/reactos/lib/3rdparty/strmbase/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/filte... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/filter.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/filter.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -149,7 +149,6 @@
HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName ) { - HRESULT hr = S_OK; BaseFilter *This = impl_from_IBaseFilter(iface);
TRACE("(%p)->(%p, %s)\n", This, pGraph, debugstr_w(pName)); @@ -164,7 +163,7 @@ } LeaveCriticalSection(&This->csFilter);
- return hr; + return S_OK; }
HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo)
Modified: trunk/reactos/lib/3rdparty/strmbase/outputqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/outpu... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/outputqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/outputqueue.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -59,7 +59,6 @@ OutputQueue **ppOutputQueue )
{ - HRESULT hr = S_OK; BOOL threaded = FALSE; DWORD tid;
@@ -92,7 +91,7 @@
EnterCriticalSection(&This->csQueue); if (bAuto && pInputPin->pMemInputPin) - threaded = IMemInputPin_ReceiveCanBlock(pInputPin->pMemInputPin); + threaded = IMemInputPin_ReceiveCanBlock(pInputPin->pMemInputPin) == S_OK; else threaded = bQueue;
@@ -107,7 +106,7 @@ } LeaveCriticalSection(&This->csQueue);
- return hr; + return S_OK; }
HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue)
Modified: trunk/reactos/lib/3rdparty/strmbase/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/pin.c... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/pin.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/pin.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -565,9 +565,9 @@ /* replaces OutputPin_SendSample */ HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin *This, IMediaSample * pSample) { - HRESULT hr = S_OK; IMemInputPin * pMemConnected = NULL; PIN_INFO pinInfo; + HRESULT hr;
EnterCriticalSection(This->pin.pCritSec); { @@ -605,7 +605,7 @@ /* replaces OutputPin_CommitAllocator */ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) { - HRESULT hr = S_OK; + HRESULT hr;
TRACE("(%p)->()\n", This);
@@ -625,7 +625,7 @@ /* replaces OutputPin_DecommitAllocator */ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) { - HRESULT hr = S_OK; + HRESULT hr;
TRACE("(%p)->()\n", This);
@@ -865,12 +865,9 @@ TRACE("(%p)->() Release from %d\n", iface, refCount + 1);
if (!refCount) - { BaseInputPin_Destroy(This); - return 0; - } - else - return refCount; + + return refCount; }
HRESULT WINAPI BaseInputPinImpl_Connect(IPin * iface, IPin * pConnector, const AM_MEDIA_TYPE * pmt)
Modified: trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/quali... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -38,9 +38,9 @@ return S_OK; }
-HRESULT QualityControlImpl_Destroy(QualityControlImpl *This) +void QualityControlImpl_Destroy(QualityControlImpl *This) { - return HeapFree(GetProcessHeap(),0,This); + HeapFree(GetProcessHeap(),0,This); }
HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) {
Modified: trunk/reactos/lib/3rdparty/strmbase/renderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/rende... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/renderer.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/renderer.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -50,7 +50,7 @@ { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *renderer = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr;
TRACE("(%p/%p)->(%p, %p)\n", This, renderer, pReceivePin, pmt);
@@ -89,7 +89,7 @@
static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) { - HRESULT hr = S_OK; + HRESULT hr; BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter);
@@ -116,7 +116,7 @@ { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr;
TRACE("(%p/%p)->()\n", This, iface);
@@ -141,7 +141,7 @@ { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr;
TRACE("(%p/%p)->()\n", This, pFilter);
Modified: trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/strmb... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -63,7 +63,7 @@ } QualityControlImpl;
HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv); -HRESULT QualityControlImpl_Destroy(QualityControlImpl *This); +void QualityControlImpl_Destroy(QualityControlImpl *This); HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv); ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface); ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface);
Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/trans... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -75,7 +75,7 @@
static HRESULT WINAPI TransformFilter_Input_Receive(BaseInputPin *This, IMediaSample *pInSample) { - HRESULT hr = S_FALSE; + HRESULT hr; TransformFilter * pTransform; TRACE("%p\n", This); pTransform = impl_from_IBaseFilter(This->pin.pinInfo.pFilter);
Modified: trunk/reactos/lib/3rdparty/strmbase/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/video... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/video.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/video.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -67,8 +67,8 @@ HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BaseControlVideo *This = impl_from_IBasicVideo(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr;
hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr))
Modified: trunk/reactos/lib/3rdparty/strmbase/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/windo... ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/window.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/window.c [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -240,8 +240,8 @@ HRESULT WINAPI BaseControlWindowImpl_Invoke(IVideoWindow *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BaseControlWindow* This = impl_from_IVideoWindow(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr;
hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr))
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Nov 26 22:53:27 2015 @@ -250,7 +250,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 WineStaging-1.7.47 +reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.55
reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37 reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55