Author: akhaldi Date: Sat Jul 2 13:35:40 2016 New Revision: 71745
URL: http://svn.reactos.org/svn/reactos?rev=71745&view=rev Log: [AMSTREAM] Sync with Wine Staging 1.9.11. CORE-11368
Modified: trunk/reactos/dll/directx/wine/amstream/mediastream.c trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/directx/wine/amstream/mediastream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/m... ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/mediastream.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/mediastream.c [iso-8859-1] Sat Jul 2 13:35:40 2016 @@ -102,7 +102,7 @@ { DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface);
- TRACE("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); + TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream);
if (!multi_media_stream) return E_POINTER; @@ -265,17 +265,17 @@
/*** IMediaStream methods ***/ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetMultiMediaStream(IDirectDrawMediaStream *iface, - IMultiMediaStream** ppMultiMediaStream) + IMultiMediaStream **multi_media_stream) { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
- TRACE("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream); - - if (!ppMultiMediaStream) + TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + + if (!multi_media_stream) return E_POINTER;
IMultiMediaStream_AddRef(This->parent); - *ppMultiMediaStream = This->parent; + *multi_media_stream = This->parent;
return S_OK; } @@ -678,17 +678,17 @@
/*** IMediaStream methods ***/ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream(IAudioMediaStream *iface, - IMultiMediaStream** multimedia_stream) + IMultiMediaStream **multi_media_stream) { AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
- TRACE("(%p/%p)->(%p)\n", iface, This, multimedia_stream); - - if (!multimedia_stream) + TRACE("(%p/%p)->(%p)\n", iface, This, multi_media_stream); + + if (!multi_media_stream) return E_POINTER;
IMultiMediaStream_AddRef(This->parent); - *multimedia_stream = This->parent; + *multi_media_stream = This->parent;
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] Sat Jul 2 13:35:40 2016 @@ -58,7 +58,7 @@
static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) { - return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter); + return CONTAINING_RECORD((IBaseFilter *)iface, IMediaStreamFilterImpl, filter.IBaseFilter_iface); }
static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_TYPE *pmt)
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] Sat Jul 2 13:35:40 2016 @@ -21,7 +21,7 @@
The following libraries are shared with Wine.
-reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.11 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