Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:32:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[AMSTREAM] Sync with Wine Staging 1.9.23. CORE-12409

Browse source 
svn path=/trunk/; revision=73249
This commit is contained in:
Amine Khaldi 2016-11-17 21:43:18 +00:00
parent e12ad8d673
commit e5a3cf92da
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/directx/wine/amstream/amstream.c
View file

@ -58,7 +58,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj)
object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl;
object->ref = 1; object->ref = 1;
*ppObj = object; *ppObj = &object->IAMMultiMediaStream_iface;
return S_OK; return S_OK;
} }

8
reactos/dll/directx/wine/amstream/mediastreamfilter.c
View file

@ -348,7 +348,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i
if (!pins) if (!pins)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
This->pins = pins; This->pins = pins;
info.pFilter = (IBaseFilter*)&This->filter; info.pFilter = &This->filter.IBaseFilter_iface;
info.dir = PINDIR_INPUT; info.dir = PINDIR_INPUT;
hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL); hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL);
if (FAILED(hr)) if (FAILED(hr))
@ -362,11 +362,11 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i
return hr; return hr;
pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams]; 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->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream;
This->nb_streams++; This->nb_streams++;
IMediaStream_AddRef((IMediaStream*)pAMMediaStream); IAMMediaStream_AddRef(pAMMediaStream);
return S_OK; 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); 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; return S_OK;
} }

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

@ -21,7 +21,7 @@ reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11
The following libraries are shared with Wine. 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/d3d8 # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/d3d9 # 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 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4