Rémi Bernon : winegstreamer: Use IWMSyncReader2_GetAllocateForOutput in the async reader.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 957ac08cd0b62c4f50672d20c0db25cf2ab79354
URL:    https://gitlab.winehq.org/wine/wine/-/commit/957ac08cd0b62c4f50672d20c0db25c...

Author: Rémi Bernon 
Date:   Mon Aug 22 15:44:48 2022 +0200

winegstreamer: Use IWMSyncReader2_GetAllocateForOutput in the async reader.

---

dlls/winegstreamer/wm_asyncreader.c | 14 +++++++++++---
 dlls/wmvcore/tests/wmvcore.c        | 32 +++++++++++++-------------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index fc0090f01c6..cd4979ee256 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -879,13 +879,21 @@ static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *
     return IWMSyncReader2_SetAllocateForOutput(reader->reader, output, allocate ? reader->allocator : NULL);
 }

-static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate)
+static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output, BOOL *allocate)
 {
     struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface);
+    IWMReaderAllocatorEx *allocator;
+    HRESULT hr;

-    FIXME("reader %p, output %lu, allocate %p, stub!\n", reader, output_num, allocate);
+    TRACE("reader %p, output %lu, allocate %p.\n", reader, output, allocate);

-    return E_NOTIMPL;
+    if (FAILED(hr = IWMSyncReader2_GetAllocateForOutput(reader->reader, output, &allocator)))
+        return hr;
+
+    if ((*allocate = allocator != NULL))
+        IWMReaderAllocatorEx_Release(allocator);
+
+    return hr;
 }

static HRESULT WINAPI WMReaderAdvanced_SetAllocateForStream(IWMReaderAdvanced6 *iface,
diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c
index 5ba280c3222..fc4b6ac390c 100644
--- a/dlls/wmvcore/tests/wmvcore.c
+++ b/dlls/wmvcore/tests/wmvcore.c
@@ -2505,15 +2505,13 @@ static void test_async_reader_allocate(IWMReader *reader,
     callback->allocated_samples = true;

hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 0, &allocate);
-    todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    if (hr == S_OK)
-        ok(!allocate, "Got allocate %d.\n", allocate);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    ok(!allocate, "Got allocate %d.\n", allocate);
     hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 1, &allocate);
-    todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    if (hr == S_OK)
-        ok(!allocate, "Got allocate %d.\n", allocate);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    ok(!allocate, "Got allocate %d.\n", allocate);
     hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 2, &allocate);
-    todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr);
+    ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr);

hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 0, &allocate);
     todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr);
@@ -2536,13 +2534,11 @@ static void test_async_reader_allocate(IWMReader *reader,
     ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr);

hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 0, &allocate);
-    todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    if (hr == S_OK)
-        ok(allocate == TRUE, "Got allocate %d.\n", allocate);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    ok(allocate == TRUE, "Got allocate %d.\n", allocate);
     hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 1, &allocate);
-    todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    if (hr == S_OK)
-        ok(allocate == TRUE, "Got allocate %d.\n", allocate);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    ok(allocate == TRUE, "Got allocate %d.\n", allocate);

hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 1, &allocate);
     todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -2572,13 +2568,11 @@ static void test_async_reader_allocate(IWMReader *reader,
     ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr);

hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 0, &allocate);
-    todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    if (hr == S_OK)
-        ok(!allocate, "Got allocate %d.\n", allocate);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    ok(!allocate, "Got allocate %d.\n", allocate);
     hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 1, &allocate);
-    todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    if (hr == S_OK)
-        ok(!allocate, "Got allocate %d.\n", allocate);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    ok(!allocate, "Got allocate %d.\n", allocate);

hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 1, &allocate);
     todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);