Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-19 20:19:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[STRMBASE] Sync with Wine Staging 1.7.55. CORE-10536

Browse source 
svn path=/trunk/; revision=70126
This commit is contained in:
Amine Khaldi 2015-11-26 22:53:27 +00:00
parent bd175c8bd9
commit c194453d62
14 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/lib/3rdparty/strmbase/CMakeLists.txt vendored
View file

@ -1,4 +1,7 @@
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__)

2
reactos/lib/3rdparty/strmbase/audio.c vendored
View file

@ -62,8 +62,8 @@ HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPO
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))

4
reactos/lib/3rdparty/strmbase/dispatch.c vendored
View file

@ -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;

3
reactos/lib/3rdparty/strmbase/dllfunc.c vendored
View file

@ -36,7 +36,6 @@ static LONG server_locks = 0;
/*
* 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 @@ static HRESULT SetupRegisterAllClasses(const FactoryTemplate * pList, int num,
pList->m_Name, szFileName,
ips32_keyname, tmodel_both);
else
hr = SHDeleteKeyW(hkey, szCLSID);
hr = RegDeleteTreeW(hkey, szCLSID);
}
}
RegCloseKey(hkey);

3
reactos/lib/3rdparty/strmbase/filter.c vendored
View file

@ -149,7 +149,6 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *
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 @@ HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph
}
LeaveCriticalSection(&This->csFilter);
return hr;
return S_OK;
}
HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo)

5
reactos/lib/3rdparty/strmbase/outputqueue.c vendored
View file

@ -59,7 +59,6 @@ HRESULT WINAPI OutputQueue_Construct(
OutputQueue **ppOutputQueue )
{
HRESULT hr = S_OK;
BOOL threaded = FALSE;
DWORD tid;
@ -92,7 +91,7 @@ HRESULT WINAPI OutputQueue_Construct(
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 @@ HRESULT WINAPI OutputQueue_Construct(
}
LeaveCriticalSection(&This->csQueue);
return hr;
return S_OK;
}
HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue)

13
reactos/lib/3rdparty/strmbase/pin.c vendored
View file

@ -565,9 +565,9 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa
/* 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 @@ HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin *This, IMediaSample * pSa
/* replaces OutputPin_CommitAllocator */
HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This)
{
HRESULT hr = S_OK;
HRESULT hr;
TRACE("(%p)->()\n", This);
@ -625,7 +625,7 @@ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This)
/* replaces OutputPin_DecommitAllocator */
HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This)
{
HRESULT hr = S_OK;
HRESULT hr;
TRACE("(%p)->()\n", This);
@ -865,12 +865,9 @@ ULONG WINAPI BaseInputPinImpl_Release(IPin * iface)
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)

4
reactos/lib/3rdparty/strmbase/qualitycontrol.c vendored
View file

@ -38,9 +38,9 @@ HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControl
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) {

8
reactos/lib/3rdparty/strmbase/renderer.c vendored
View file

@ -50,7 +50,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin * iface, IPin
{
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_Disconnect(IPin * iface)
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 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface)
{
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 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface)
{
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);

2
reactos/lib/3rdparty/strmbase/strmbase_private.h vendored
View file

@ -63,7 +63,7 @@ typedef struct QualityControlImpl {
} 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);

2
reactos/lib/3rdparty/strmbase/transform.c vendored
View file

@ -75,7 +75,7 @@ static HRESULT WINAPI TransformFilter_Input_CheckMediaType(BasePin *iface, const
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);

2
reactos/lib/3rdparty/strmbase/video.c vendored
View file

@ -67,8 +67,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID rii
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))

2
reactos/lib/3rdparty/strmbase/window.c vendored
View file

@ -240,8 +240,8 @@ HRESULT WINAPI BaseControlWindowImpl_GetIDsOfNames(IVideoWindow *iface, REFIID r
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))

2
reactos/media/doc/README.WINE
View file

@ -250,7 +250,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 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