Christian Costa : amstream: Add stream to the media stream filter in IAMMultiMediaStreamImpl_AddMediaStream .

[Alexandre Julliard]

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

Author: Christian Costa 
Date:   Tue Mar 27 23:46:03 2012 +0200

amstream: Add stream to the media stream filter in IAMMultiMediaStreamImpl_AddMediaStream.

---

dlls/amstream/amstream.c       |    8 +++++++-
 dlls/amstream/tests/amstream.c |    8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c
index b599bb6..89ea46b 100644
--- a/dlls/amstream/amstream.c
+++ b/dlls/amstream/amstream.c
@@ -333,7 +333,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream
     IMediaStream* pStream;
     IMediaStream** pNewStreams;

-    FIXME("(%p/%p)->(%p,%s,%x,%p) partial stub!\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream);
+    TRACE("(%p/%p)->(%p,%s,%x,%p)\n", This, iface, pStreamObject, debugstr_guid(PurposeId), dwFlags, ppNewStream);

if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio))
         return MS_E_PURPOSEID;
@@ -379,6 +379,12 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream
             *ppNewStream = pStream;
     }

+    if (SUCCEEDED(hr))
+    {
+        /* Add stream to the media stream filter */
+        IMediaStreamFilter_AddMediaStream((IMediaStreamFilter*)This->media_stream_filter, (IAMMediaStream*)pStream);
+    }
+
     return hr;
 }

diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index 81a7565..dce8c7d 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -215,8 +215,8 @@ static void test_media_streams(void)
     if (media_stream_filter)
     {
         hr = IMediaStreamFilter_GetMediaStream(media_stream_filter, &MSPID_PrimaryVideo, &dummy_stream);
-        todo_wine ok(hr == S_OK, "IMediaStreamFilter_GetMediaStream returned: %x\n", hr);
-        todo_wine ok(dummy_stream == video_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, video_stream);
+        ok(hr == S_OK, "IMediaStreamFilter_GetMediaStream returned: %x\n", hr);
+        ok(dummy_stream == video_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, video_stream);
         if (SUCCEEDED(hr))
             IMediaStream_Release(dummy_stream);
     }
@@ -241,8 +241,8 @@ static void test_media_streams(void)
     if (media_stream_filter)
     {
         hr = IMediaStreamFilter_GetMediaStream(media_stream_filter, &MSPID_PrimaryAudio, &dummy_stream);
-        todo_wine ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr);
-        todo_wine ok(dummy_stream == audio_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, audio_stream);
+        ok(hr == S_OK, "IAMMultiMediaStream_GetMediaStream returned: %x\n", hr);
+        ok(dummy_stream == audio_stream, "Got wrong returned pointer %p, expected %p\n", dummy_stream, audio_stream);
         if (SUCCEEDED(hr))
             IMediaStream_Release(dummy_stream);
     }