Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-01 23:53:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[AMSTREAM] Sync with Wine Staging 1.9.11. CORE-11368

Browse source 
svn path=/trunk/; revision=71745
This commit is contained in:
Amine Khaldi 2016-07-02 13:35:40 +00:00
parent 76c1345b9d
commit 2f09a8e360
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
reactos/dll/directx/wine/amstream/mediastream.c
View file

@ -102,7 +102,7 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetMultiMediaStre
{
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 @@ static ULONG WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Release(IDi
/*** 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);
TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream);
if (!ppMultiMediaStream)
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 @@ static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_Release(IAudioMediaSt
/*** 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);
TRACE("(%p/%p)->(%p)\n", iface, This, multi_media_stream);
if (!multimedia_stream)
if (!multi_media_stream)
return E_POINTER;
IMultiMediaStream_AddRef(This->parent);
*multimedia_stream = This->parent;
*multi_media_stream = This->parent;
return S_OK;
}

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

@ -58,7 +58,7 @@ typedef struct {
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)

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

@ -21,7 +21,7 @@ reactos/tools/wpp # Synced to WineStaging-1.9.4
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