[PATCH 2/5] winegstreamer: Implement IWMReader::GetOutputFormatCount().
Zebediah Figura
zfigura at codeweavers.com
Thu Nov 4 15:46:25 CDT 2021
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
dlls/winegstreamer/wm_asyncreader.c | 10 ++++++----
dlls/wmvcore/tests/wmvcore.c | 8 ++++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index dd5b01b3e5c..e7bf667bf90 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -130,11 +130,13 @@ static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num
return E_NOTIMPL;
}
-static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats)
+static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output, DWORD *count)
{
- struct async_reader *This = impl_from_IWMReader(iface);
- FIXME("(%p)->(%u %p)\n", This, output_num, formats);
- return E_NOTIMPL;
+ struct async_reader *reader = impl_from_IWMReader(iface);
+
+ TRACE("reader %p, output %u, count %p.\n", reader, output, count);
+
+ return wm_reader_get_output_format_count(&reader->reader, output, count);
}
static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output,
diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c
index 6fbc2ed6a3e..666cf65a462 100644
--- a/dlls/wmvcore/tests/wmvcore.c
+++ b/dlls/wmvcore/tests/wmvcore.c
@@ -1441,8 +1441,8 @@ static void test_async_reader_types(void)
count = 0;
hr = IWMReader_GetOutputFormatCount(reader, output_number, &count);
- todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
- todo_wine ok(count > 0, "Got count %u.\n", count);
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(count > 0, "Got count %u.\n", count);
for (j = 0; j < count; ++j)
{
@@ -1518,7 +1518,7 @@ static void test_async_reader_types(void)
}
hr = IWMReader_GetOutputFormat(reader, output_number, count, &output_props);
- todo_wine ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr);
+ ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr);
hr = IWMReader_GetOutputProps(reader, output_number, &output_props);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -1540,7 +1540,7 @@ static void test_async_reader_types(void)
count = 0xdeadbeef;
hr = IWMReader_GetOutputFormatCount(reader, 2, &count);
- todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
ok(count == 0xdeadbeef, "Got count %#x.\n", count);
output_props = (void *)0xdeadbeef;
--
2.33.0
More information about the wine-devel
mailing list