marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

amstream: Don't duplicate IMediaStream method implementations. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Zebediah Figura 2020-05-25 14:17:32 -05:00 committed by Alexandre Julliard
parent ba920246e5
commit f5aaca10af
2 changed files with 32 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
dlls/amstream/audiostream.c
View File

@ -605,76 +605,45 @@ static ULONG WINAPI audio_IAudioMediaStream_Release(IAudioMediaStream *iface)
return IAMMediaStream_Release(&This->IAMMediaStream_iface);
}
/*** IMediaStream methods ***/
static HRESULT WINAPI audio_IAudioMediaStream_GetMultiMediaStream(IAudioMediaStream *iface,
IMultiMediaStream **multi_media_stream)
IMultiMediaStream **mmstream)
{
struct audio_stream *This = impl_from_IAudioMediaStream(iface);
TRACE("(%p/%p)->(%p)\n", iface, This, multi_media_stream);
if (!multi_media_stream)
return E_POINTER;
IMultiMediaStream_AddRef(This->parent);
*multi_media_stream = This->parent;
return S_OK;
struct audio_stream *stream = impl_from_IAudioMediaStream(iface);
return IAMMediaStream_GetMultiMediaStream(&stream->IAMMediaStream_iface, mmstream);
}
static HRESULT WINAPI audio_IAudioMediaStream_GetInformation(IAudioMediaStream *iface,
MSPID *purpose_id, STREAM_TYPE *type)
{
struct audio_stream *This = impl_from_IAudioMediaStream(iface);
TRACE("(%p/%p)->(%p,%p)\n", iface, This, purpose_id, type);
if (purpose_id)
*purpose_id = This->purpose_id;
if (type)
*type = This->stream_type;
return S_OK;
struct audio_stream *stream = impl_from_IAudioMediaStream(iface);
return IAMMediaStream_GetInformation(&stream->IAMMediaStream_iface, purpose_id, type);
}
static HRESULT WINAPI audio_IAudioMediaStream_SetSameFormat(IAudioMediaStream *iface,
IMediaStream *stream_format, DWORD flags)
IMediaStream *other, DWORD flags)
{
struct audio_stream *This = impl_from_IAudioMediaStream(iface);
FIXME("(%p/%p)->(%p,%x) stub!\n", iface, This, stream_format, flags);
return S_FALSE;
struct audio_stream *stream = impl_from_IAudioMediaStream(iface);
return IAMMediaStream_SetSameFormat(&stream->IAMMediaStream_iface, other, flags);
}
static HRESULT WINAPI audio_IAudioMediaStream_AllocateSample(IAudioMediaStream *iface,
DWORD flags, IStreamSample **sample)
{
struct audio_stream *This = impl_from_IAudioMediaStream(iface);
FIXME("(%p/%p)->(%x,%p) stub!\n", iface, This, flags, sample);
return S_FALSE;
struct audio_stream *stream = impl_from_IAudioMediaStream(iface);
return IAMMediaStream_AllocateSample(&stream->IAMMediaStream_iface, flags, sample);
}
static HRESULT WINAPI audio_IAudioMediaStream_CreateSharedSample(IAudioMediaStream *iface,
IStreamSample *existing_sample, DWORD flags, IStreamSample **sample)
{
struct audio_stream *This = impl_from_IAudioMediaStream(iface);
FIXME("(%p/%p)->(%p,%x,%p) stub!\n", iface, This, existing_sample, flags, sample);
return S_FALSE;
struct audio_stream *stream = impl_from_IAudioMediaStream(iface);
return IAMMediaStream_CreateSharedSample(&stream->IAMMediaStream_iface, existing_sample, flags, sample);
}
static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream *iface,
DWORD flags)
static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream *iface, DWORD flags)
{
struct audio_stream *This = impl_from_IAudioMediaStream(iface);
FIXME("(%p/%p)->(%x) stub!\n", iface, This, flags);
return S_FALSE;
struct audio_stream *stream = impl_from_IAudioMediaStream(iface);
return IAMMediaStream_SendEndOfStream(&stream->IAMMediaStream_iface, flags);
}
/*** IAudioMediaStream methods ***/

65
dlls/amstream/ddrawstream.c
View File

@ -292,76 +292,45 @@ static ULONG WINAPI ddraw_IDirectDrawMediaStream_Release(IDirectDrawMediaStream
return IAMMediaStream_Release(&This->IAMMediaStream_iface);
}
/*** IMediaStream methods ***/
static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetMultiMediaStream(IDirectDrawMediaStream *iface,
IMultiMediaStream **multi_media_stream)
IMultiMediaStream **mmstream)
{
struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface);
TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream);
if (!multi_media_stream)
return E_POINTER;
IMultiMediaStream_AddRef(This->parent);
*multi_media_stream = This->parent;
return S_OK;
struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface);
return IAMMediaStream_GetMultiMediaStream(&stream->IAMMediaStream_iface, mmstream);
}
static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface,
MSPID *purpose_id, STREAM_TYPE *type)
{
struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface);
TRACE("(%p/%p)->(%p,%p)\n", This, iface, purpose_id, type);
if (purpose_id)
*purpose_id = This->purpose_id;
if (type)
*type = This->stream_type;
return S_OK;
struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface);
return IAMMediaStream_GetInformation(&stream->IAMMediaStream_iface, purpose_id, type);
}
static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetSameFormat(IDirectDrawMediaStream *iface,
IMediaStream *pStreamThatHasDesiredFormat, DWORD dwFlags)
IMediaStream *other, DWORD flags)
{
struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface);
FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, dwFlags);
return S_FALSE;
struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface);
return IAMMediaStream_SetSameFormat(&stream->IAMMediaStream_iface, other, flags);
}
static HRESULT WINAPI ddraw_IDirectDrawMediaStream_AllocateSample(IDirectDrawMediaStream *iface,
DWORD dwFlags, IStreamSample **ppSample)
DWORD flags, IStreamSample **sample)
{
struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface);
FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, dwFlags, ppSample);
return S_FALSE;
struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface);
return IAMMediaStream_AllocateSample(&stream->IAMMediaStream_iface, flags, sample);
}
static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSharedSample(IDirectDrawMediaStream *iface,
IStreamSample *pExistingSample, DWORD dwFlags, IStreamSample **ppSample)
IStreamSample *existing_sample, DWORD flags, IStreamSample **sample)
{
struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface);
FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pExistingSample, dwFlags, ppSample);
return S_FALSE;
struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface);
return IAMMediaStream_CreateSharedSample(&stream->IAMMediaStream_iface, existing_sample, flags, sample);
}
static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SendEndOfStream(IDirectDrawMediaStream *iface,
DWORD dwFlags)
static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SendEndOfStream(IDirectDrawMediaStream *iface, DWORD flags)
{
struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface);
FIXME("(%p/%p)->(%x) stub!\n", This, iface, dwFlags);
return S_FALSE;
struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface);
return IAMMediaStream_SendEndOfStream(&stream->IAMMediaStream_iface, flags);
}
/*** IDirectDrawMediaStream methods ***/