Module: wine Branch: stable Commit: 1530fcbaf4c82fbae2f0fb43b71f1fa660c1e654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1530fcbaf4c82fbae2f0fb43b7...
Author: Michael Müller michael@fds-team.de Date: Sat Apr 30 03:57:50 2016 +0200
amstream: Implement IDirectDrawMediaStream::GetMultiMediaStream.
Signed-off-by: Michael Müller michael@fds-team.de Signed-off-by: Sebastian Lackner sebastian@fds-team.de Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit c88f4b85bc6f95f621c2185b766eb5997230329a) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/amstream/mediastream.c | 12 +++++++++--- dlls/amstream/tests/amstream.c | 11 ++++------- 2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 79f9822..51349ab 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -267,13 +267,19 @@ 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);
- FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream); + 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 DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 353ba01..eb9c5f9 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -295,16 +295,13 @@ static void test_media_streams(void) ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr);
hr = IDirectDrawMediaStream_GetMultiMediaStream(ddraw_stream, NULL); - todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr); + ok(hr == E_POINTER, "Expected E_POINTER, got %x\n", hr);
multi_media_stream = (void *)0xdeadbeef; hr = IDirectDrawMediaStream_GetMultiMediaStream(ddraw_stream, &multi_media_stream); - todo_wine ok(hr == S_OK, "IDirectDrawMediaStream_GetMultiMediaStream returned: %x\n", hr); - if (hr == S_OK) - { - ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); - IMultiMediaStream_Release(multi_media_stream); - } + ok(hr == S_OK, "IDirectDrawMediaStream_GetMultiMediaStream returned: %x\n", hr); + ok((void *)multi_media_stream == (void *)pams, "Expected %p, got %p\n", pams, multi_media_stream); + IMultiMediaStream_Release(multi_media_stream); }
if (ddraw_sample)