Zebediah Figura : winegstreamer: Implement IWMStreamConfig::GetStreamNumber().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 250f86b02389b2148471ad67bcc0775ff3b2c6ba
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=250f86b02389b2148471ad67b...

Author: Zebediah Figura 
Date:   Tue Oct 26 22:22:06 2021 -0500

winegstreamer: Implement IWMStreamConfig::GetStreamNumber().

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/winegstreamer/gst_private.h |  1 +
 dlls/winegstreamer/wm_reader.c   |  9 +++++++--
 dlls/wmvcore/tests/wmvcore.c     | 10 +++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 063f01e5524..8b5183a95ee 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -117,6 +117,7 @@ struct wm_stream
 {
     struct wm_reader *reader;
     struct wg_parser_stream *wg_stream;
+    WORD index;
 };

struct wm_reader
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index f649a5cc518..682f9a2ae50 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -86,8 +86,12 @@ static HRESULT WINAPI stream_config_GetStreamType(IWMStreamConfig *iface, GUID *

static HRESULT WINAPI stream_config_GetStreamNumber(IWMStreamConfig *iface, WORD *number)
 {
-    FIXME("iface %p, number %p, stub!\n", iface, number);
-    return E_NOTIMPL;
+    struct stream_config *config = impl_from_IWMStreamConfig(iface);
+
+    TRACE("config %p, number %p.\n", config, number);
+
+    *number = config->stream->index + 1;
+    return S_OK;
 }

static HRESULT WINAPI stream_config_SetStreamNumber(IWMStreamConfig *iface, WORD number)
@@ -1042,6 +1046,7 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream)

stream->wg_stream = wg_parser_get_stream(reader->wg_parser, i);
         stream->reader = reader;
+        stream->index = i;
     }

LeaveCriticalSection(&reader->cs);
diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c
index 8bd477dba65..247b03564f1 100644
--- a/dlls/wmvcore/tests/wmvcore.c
+++ b/dlls/wmvcore/tests/wmvcore.c
@@ -479,8 +479,8 @@ static void test_sync_reader_streaming(void)

stream_numbers[i] = 0xdead;
         hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]);
-        todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
-        todo_wine ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]);
+        ok(hr == S_OK, "Got hr %#x.\n", hr);
+        ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]);

ref = IWMStreamConfig_Release(config);
         ok(!ref, "Got outstanding refcount %d.\n", ref);
@@ -700,8 +700,8 @@ static void test_sync_reader_types(void)

stream_number = 0xdead;
         hr = IWMStreamConfig_GetStreamNumber(config, &stream_number);
-        todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
-        todo_wine ok(stream_number == i + 1, "Got stream number %u.\n", stream_number);
+        ok(hr == S_OK, "Got hr %#x.\n", hr);
+        ok(stream_number == i + 1, "Got stream number %u.\n", stream_number);

hr = IWMStreamConfig_GetStreamType(config, &majortype);
         todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -721,7 +721,7 @@ static void test_sync_reader_types(void)
         stream_number2 = 0xdead;
         hr = IWMSyncReader_GetStreamNumberForOutput(reader, output_number, &stream_number2);
         ok(hr == S_OK, "Got hr %#x.\n", hr);
-        ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2);
+        todo_wine ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2);

hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props);
         todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);