[PATCH v2 0/3] MR8567: winegstreamer: Return S_OK from AllocateStreamingResources().

[Elizabeth Figura (＠zfigura)]

--
  v2: winegstreamer: Return S_OK from AllocateStreamingResources().

https://gitlab.winehq.org/wine/wine/-/merge_requests/8567

[PATCH v2 1/3] qasf/tests: Test AllocateStreamingResources() error propagation.

[Elizabeth Figura]

From: Elizabeth Figura

---
 dlls/qasf/tests/dmowrapper.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c
index 7c3a069bfd1..b8d033d7a8f 100644
--- a/dlls/qasf/tests/dmowrapper.c
+++ b/dlls/qasf/tests/dmowrapper.c
@@ -75,6 +75,7 @@ static BOOL testdmo_input_mt_set, testdmo_output_mt_set;

static HRESULT testdmo_GetInputSizeInfo_hr = E_NOTIMPL;
 static HRESULT testdmo_GetOutputSizeInfo_hr = S_OK;
+static HRESULT testdmo_AllocateStreamingResources_hr = S_OK;
 static DWORD testdmo_output_size = 123;
 static DWORD testdmo_output_alignment = 1;

@@ -274,14 +275,14 @@ static HRESULT WINAPI dmo_AllocateStreamingResources(IMediaObject *iface)
 {
     if (winetest_debug > 1) trace("AllocateStreamingResources()\n");
     ++got_AllocateStreamingResources;
-    return S_OK;
+    return testdmo_AllocateStreamingResources_hr;
 }

static HRESULT WINAPI dmo_FreeStreamingResources(IMediaObject *iface)
 {
     if (winetest_debug > 1) trace("FreeStreamingResources()\n");
     ++got_FreeStreamingResources;
-    return S_OK;
+    return 0xdeadbeef;
 }

static HRESULT WINAPI dmo_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags)
@@ -1825,11 +1826,30 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control,
     IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface);
 }

-static void test_filter_state(IMediaControl *control)
+static void test_filter_state(IMediaControl *control, IBaseFilter *filter)
 {
+    FILTER_STATE base_state;
     OAFilterState state;
     HRESULT hr;

+    testdmo_AllocateStreamingResources_hr = 0xdeadbeef;
+    hr = IBaseFilter_Pause(filter);
+    ok(hr == 0xdeadbeef, "Got hr %#lx.\n", hr);
+    hr = IBaseFilter_GetState(filter, 0, &base_state);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    ok(base_state == State_Stopped, "Got state %#x.\n", base_state);
+
+    testdmo_AllocateStreamingResources_hr = 0xbeef;
+    hr = IBaseFilter_Pause(filter);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    hr = IBaseFilter_GetState(filter, 0, &base_state);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    ok(base_state == State_Paused, "Got state %#x.\n", base_state);
+    hr = IBaseFilter_Stop(filter);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+
+    testdmo_AllocateStreamingResources_hr = S_OK;
+
     got_Flush = 0;

hr = IMediaControl_GetState(control, 0, &state);
@@ -2389,7 +2409,7 @@ static void test_connect_pin(void)
     hr = IMediaControl_Stop(control);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);

-    test_filter_state(control);
+    test_filter_state(control, filter);
     test_sample_processing(control, meminput, &testsink, filter);

/* Streaming event tests are more interesting if multiple source pins are

[PATCH v2 2/3] mf/tests: Test IMediaObject::AllocateStreamingResources().

[Elizabeth Figura]

From: Elizabeth Figura

---
 dlls/mf/tests/transform.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index 34d4c1b6a98..28ee280f6ce 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -8112,6 +8112,11 @@ static void test_wmv_decoder_media_object(void)
     diff = check_dmo_output_data_buffer(&output_data_buffer, &output_buffer_desc_nv12, L"nv12frame.bmp", 0, 300000);
     ok(diff == 0, "Got %lu%% diff.\n", diff);

+    hr = IMediaObject_AllocateStreamingResources(media_object);
+    todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    hr = IMediaObject_FreeStreamingResources(media_object);
+    todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
+
     ret = IMediaBuffer_Release(&output_media_buffer->IMediaBuffer_iface);
     ok(ret == 0, "Release returned %lu\n", ret);
     ret = IMediaBuffer_Release(&input_media_buffer->IMediaBuffer_iface);

[PATCH v2 3/3] winegstreamer: Return S_OK from AllocateStreamingResources().

[Elizabeth Figura]

From: Elizabeth Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58403
---
 dlls/mf/tests/transform.c          | 2 +-
 dlls/winegstreamer/video_decoder.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index 28ee280f6ce..28b746f1622 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -8113,7 +8113,7 @@ static void test_wmv_decoder_media_object(void)
     ok(diff == 0, "Got %lu%% diff.\n", diff);

hr = IMediaObject_AllocateStreamingResources(media_object);
-    todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
     hr = IMediaObject_FreeStreamingResources(media_object);
     todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);

diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c
index d571ef728ee..ba8b2d545f7 100644
--- a/dlls/winegstreamer/video_decoder.c
+++ b/dlls/winegstreamer/video_decoder.c
@@ -1411,8 +1411,8 @@ static HRESULT WINAPI media_object_Discontinuity(IMediaObject *iface, DWORD inde

static HRESULT WINAPI media_object_AllocateStreamingResources(IMediaObject *iface)
 {
-    FIXME("iface %p stub!\n", iface);
-    return E_NOTIMPL;
+    TRACE("iface %p.\n", iface);
+    return S_OK;
 }

static HRESULT WINAPI media_object_FreeStreamingResources(IMediaObject *iface)

[PATCH v2 0/3] MR8567: winegstreamer: Return S_OK from AllocateStreamingResources(). - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.