Michael Müller : amstream: Implement IDirectDrawMediaStream::GetMultiMediaStream.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c88f4b85bc6f95f621c2185b766eb5997230329a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c88f4b85bc6f95f621c2185b76...

Author: Michael Müller <michael(a)fds-team.de>
Date:   Sat Apr 30 03:57:50 2016 +0200

amstream: Implement IDirectDrawMediaStream::GetMultiMediaStream.

Signed-off-by: Michael Müller <michael(a)fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de>
Signed-off-by: Alexandre Julliard <julliard(a)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 af7bdaf..586e00f 100644
--- a/dlls/amstream/mediastream.c
+++ b/dlls/amstream/mediastream.c
@@ -273,13 +273,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 1b41160..3cdb77f 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -292,16 +292,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)