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

[Alexandre Julliard]

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

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

amstream: Implement IAudioMediaStream::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 0e22537..0ba9eb8 100644
--- a/dlls/amstream/mediastream.c
+++ b/dlls/amstream/mediastream.c
@@ -686,13 +686,19 @@ static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_Release(IAudioMediaSt
 
 /*** IMediaStream methods ***/
 static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream(IAudioMediaStream *iface,
-        IMultiMediaStream** multimedia_stream)
+        IMultiMediaStream **multi_media_stream)
 {
     AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
 
-    FIXME("(%p/%p)->(%p) stub!\n", iface, This, multimedia_stream);
+    TRACE("(%p/%p)->(%p)\n", iface, This, 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_IAudioMediaStream_GetInformation(IAudioMediaStream *iface,
diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index e026e80..1db88c2 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -408,16 +408,13 @@ static void test_media_streams(void)
             ok(hr == S_OK, "IAudioMediaStream_CreateSample returned: %x\n", hr);
 
             hr = IAudioMediaStream_GetMultiMediaStream(audio_media_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 = IAudioMediaStream_GetMultiMediaStream(audio_media_stream, &multi_media_stream);
-            todo_wine ok(hr == S_OK, "IAudioMediaStream_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, "IAudioMediaStream_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 (audio_data)
                 IAudioData_Release(audio_data);