From e5a3cf92da102df1128668cac28ab0238e5cd2a4 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 17 Nov 2016 21:43:18 +0000 Subject: [PATCH] [AMSTREAM] Sync with Wine Staging 1.9.23. CORE-12409 svn path=/trunk/; revision=73249 --- reactos/dll/directx/wine/amstream/amstream.c | 2 +- reactos/dll/directx/wine/amstream/mediastreamfilter.c | 8 ++++---- reactos/media/doc/README.WINE | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reactos/dll/directx/wine/amstream/amstream.c b/reactos/dll/directx/wine/amstream/amstream.c index c715feb0f77..13be22fbc56 100644 --- a/reactos/dll/directx/wine/amstream/amstream.c +++ b/reactos/dll/directx/wine/amstream/amstream.c @@ -58,7 +58,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; object->ref = 1; - *ppObj = object; + *ppObj = &object->IAMMultiMediaStream_iface; return S_OK; } diff --git a/reactos/dll/directx/wine/amstream/mediastreamfilter.c b/reactos/dll/directx/wine/amstream/mediastreamfilter.c index 7b868608088..0ba9a7033b2 100644 --- a/reactos/dll/directx/wine/amstream/mediastreamfilter.c +++ b/reactos/dll/directx/wine/amstream/mediastreamfilter.c @@ -348,7 +348,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i if (!pins) return E_OUTOFMEMORY; This->pins = pins; - info.pFilter = (IBaseFilter*)&This->filter; + info.pFilter = &This->filter.IBaseFilter_iface; info.dir = PINDIR_INPUT; hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL); if (FAILED(hr)) @@ -362,11 +362,11 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i return hr; pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams]; - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; + pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream; This->nb_streams++; - IMediaStream_AddRef((IMediaStream*)pAMMediaStream); + IAMMediaStream_AddRef(pAMMediaStream); return S_OK; } @@ -510,7 +510,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) BaseFilter_Init(&object->filter, (IBaseFilterVtbl*)&MediaStreamFilter_Vtbl, &CLSID_MediaStreamFilter, (DWORD_PTR)(__FILE__ ": MediaStreamFilterImpl.csFilter"), &BaseFuncTable); - *ppObj = object; + *ppObj = &object->filter.IBaseFilter_iface; return S_OK; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 73e676c0f77..4da50776071 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -21,7 +21,7 @@ reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11 The following libraries are shared with Wine. -reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.16 +reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4