Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[AMSTREAM] Sync with Wine Staging 1.7.55. CORE-10536

Browse source 
svn path=/trunk/; revision=70027
This commit is contained in:
Amine Khaldi 2015-11-22 15:31:10 +00:00
parent 99821fd255
commit 4dc5d956b9
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,9 +102,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetMultiMediaStre
{ {
DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface); DirectDrawMediaStreamImpl *This = impl_from_DirectDrawMediaStream_IAMMediaStream(iface);
FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); TRACE("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream);
return S_FALSE; if (!multi_media_stream)
return E_POINTER;
IMultiMediaStream_AddRef(This->parent);
*multi_media_stream = This->parent;
return S_OK;
} }
static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface, static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
@ -263,9 +269,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetMultiM
{ {
DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream); TRACE("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
return S_FALSE; if (!ppMultiMediaStream)
return E_POINTER;
IMultiMediaStream_AddRef(This->parent);
*ppMultiMediaStream = This->parent;
return S_OK;
} }
static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface, static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface,
@ -503,9 +515,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA
{ {
AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface); AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface);
FIXME("(%p/%p)->(%p) stub!\n", This, iface, multi_media_stream); TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream);
return S_FALSE; if (!multi_media_stream)
return E_POINTER;
IMultiMediaStream_AddRef(This->parent);
*multi_media_stream = This->parent;
return S_OK;
} }
static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface, static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
@ -664,9 +682,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream
{ {
AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
FIXME("(%p/%p)->(%p) stub!\n", iface, This, multimedia_stream); TRACE("(%p/%p)->(%p)\n", iface, This, multimedia_stream);
return S_FALSE; if (!multimedia_stream)
return E_POINTER;
IMultiMediaStream_AddRef(This->parent);
*multimedia_stream = This->parent;
return S_OK;
} }
static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface, static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface,
@ -995,6 +1019,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD
desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; desc.ddpfPixelFormat.dwBBitMask = 0x0000ff;
desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0; desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0;
desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN;
desc.lpSurface = NULL;
hr = IDirectDraw_CreateSurface(ddraw, &desc, &object->surface, NULL); hr = IDirectDraw_CreateSurface(ddraw, &desc, &object->surface, NULL);
IDirectDraw_Release(ddraw); IDirectDraw_Release(ddraw);

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

@ -21,7 +21,7 @@ reactos/tools/wpp # Synced to WineStaging-1.7.47
The following libraries are shared with Wine. The following libraries are shared with Wine.
reactos/dll/directx/wine/amstream # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/amstream # Synced to WineStaging-1.7.55
reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.7.47
reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.7.47
reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.47