Ziqing Hui : qasf/dmowrapper: Return failure in dmo_wrapper_sink_Receive if samples allocating fails.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5396e722d5a979a0f219bdb0abc9f69c2287f1ff
URL:    https://gitlab.winehq.org/wine/wine/-/commit/5396e722d5a979a0f219bdb0abc9f69...

Author: Ziqing Hui <zhui(a)codeweavers.com>
Date:   Tue Jun  4 11:18:06 2024 +0800

qasf/dmowrapper: Return failure in dmo_wrapper_sink_Receive if samples allocating fails.

---

 dlls/qasf/dmowrapper.c       | 11 +++++++----
 dlls/qasf/tests/dmowrapper.c |  3 ---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c
index 1d4ad7f75e6..2caf59c746d 100644
--- a/dlls/qasf/dmowrapper.c
+++ b/dlls/qasf/dmowrapper.c
@@ -249,9 +249,6 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo)
     BOOL more_data;
     HRESULT hr;
 
-    if (FAILED(hr = get_output_samples(filter)))
-        return hr;
-
     do
     {
         more_data = FALSE;
@@ -325,6 +322,8 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
         /* Calling Discontinuity() might change the DMO's mind about whether it
          * has more data to process. The DirectX documentation explicitly
          * states that we should call ProcessOutput() again in this case. */
+        if (FAILED(hr = get_output_samples(filter)))
+            goto out;
         process_output(filter, dmo);
     }
 
@@ -346,6 +345,8 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed
         goto out;
     }
 
+    if (FAILED(hr = get_output_samples(filter)))
+        goto out;
     process_output(filter, dmo);
 
 out:
@@ -366,7 +367,9 @@ static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface)
     if (FAILED(hr = IMediaObject_Discontinuity(dmo, index)))
         ERR("Discontinuity() failed, hr %#lx.\n", hr);
 
-    process_output(filter, dmo);
+    if (SUCCEEDED(get_output_samples(filter)))
+        process_output(filter, dmo);
+
     if (FAILED(hr = IMediaObject_Flush(dmo)))
         ERR("Flush() failed, hr %#lx.\n", hr);
 
diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c
index 632b7e2e558..ada45c447b1 100644
--- a/dlls/qasf/tests/dmowrapper.c
+++ b/dlls/qasf/tests/dmowrapper.c
@@ -1703,9 +1703,7 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input,
     hr = IMemAllocator_Decommit(testsink->sink.pAllocator);
     ok(hr == S_OK, "Decommit returned %#lx.\n", hr);
     hr = IMemInputPin_Receive(input, sample);
-    todo_wine
     ok(hr == VFW_E_NOT_COMMITTED, "Receive returned %#lx.\n", hr);
-    todo_wine
     ok(got_ProcessInput == 0, "Got %u calls to ProcessInput().\n", got_ProcessInput);
     ok(got_ProcessOutput == 0, "Got %u calls to ProcessOutput().\n", got_ProcessOutput);
     ok(got_Receive == 0, "Got %u calls to Receive().\n", got_Receive);
@@ -1720,7 +1718,6 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input,
     hr = IMemInputPin_Receive(input, sample);
     todo_wine
     ok(hr == VFW_E_WRONG_STATE, "Receive returned %#lx.\n", hr);
-    todo_wine
     ok(got_ProcessInput == 0, "Got %u calls to ProcessInput().\n", got_ProcessInput);
     ok(got_ProcessOutput == 0, "Got %u calls to ProcessOutput().\n", got_ProcessOutput);
     ok(got_Receive == 0, "Got %u calls to Receive().\n", got_Receive);