Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/amstream/audiostream.c | 61 +++++++++------------------------- dlls/amstream/ddrawstream.c | 65 ++++++++++--------------------------- 2 files changed, 32 insertions(+), 94 deletions(-)
diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 4e82d76da0d..d620abc6ecf 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -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 ***/ diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 9c552f1a03f..6ef74eb7de0 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -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 ***/
From: Anton Baskanov baskanov@gmail.com
Signed-off-by: Anton Baskanov baskanov@gmail.com Signed-off-by: Zebediah Figura z.figura12@gmail.com --- v2: Also clean up the function a bit while we're touching it.
dlls/amstream/audiostream.c | 14 +++++++------- dlls/amstream/ddrawstream.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index d620abc6ecf..265c3bf9f20 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -429,18 +429,18 @@ static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface)
/*** IMediaStream methods ***/ static HRESULT WINAPI audio_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface);
- TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream);
- if (!multi_media_stream) + if (!mmstream) return E_POINTER;
- IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; }
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 6ef74eb7de0..a4bfe948d2d 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -125,18 +125,18 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface)
/*** IMediaStream methods ***/ static HRESULT WINAPI ddraw_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface);
- TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream);
- if (!multi_media_stream) + if (!mmstream) return E_POINTER;
- IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; }
-
Zebediah Figura