Author: akhaldi Date: Thu Nov 17 21:43:18 2016 New Revision: 73249
URL: http://svn.reactos.org/svn/reactos?rev=73249&view=rev Log: [AMSTREAM] Sync with Wine Staging 1.9.23. CORE-12409
Modified: trunk/reactos/dll/directx/wine/amstream/amstream.c trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/directx/wine/amstream/amstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/a... ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/amstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/amstream.c [iso-8859-1] Thu Nov 17 21:43:18 2016 @@ -58,7 +58,7 @@ object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; object->ref = 1;
- *ppObj = object; + *ppObj = &object->IAMMultiMediaStream_iface;
return S_OK; }
Modified: trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/m... ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c [iso-8859-1] Thu Nov 17 21:43:18 2016 @@ -348,7 +348,7 @@ 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 @@ 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 @@
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; }
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 17 21:43:18 2016 @@ -21,7 +21,7 @@
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