Zebediah Figura : winegstreamer: Implement IWMReader::SetOutputProps().
Alexandre Julliard
julliard at winehq.org
Fri Nov 5 17:15:52 CDT 2021
Module: wine
Branch: master
Commit: d7175e265537ffd24dbf8fd3bcaaa1764db03e13
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7175e265537ffd24dbf8fd3bcaaa1764db03e13
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Nov 4 15:46:26 2021 -0500
winegstreamer: Implement IWMReader::SetOutputProps().
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winegstreamer/wm_asyncreader.c | 10 ++++++----
dlls/wmvcore/tests/wmvcore.c | 11 ++---------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index e7bf667bf90..860ec1cdd5e 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -123,11 +123,13 @@ static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output, IW
return wm_reader_get_output_props(&reader->reader, output, props);
}
-static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output)
+static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output, IWMOutputMediaProps *props)
{
- struct async_reader *This = impl_from_IWMReader(iface);
- FIXME("(%p)->(%u %p)\n", This, output_num, output);
- return E_NOTIMPL;
+ struct async_reader *reader = impl_from_IWMReader(iface);
+
+ TRACE("reader %p, output %u, props %p.\n", reader, output, props);
+
+ return wm_reader_set_output_props(&reader->reader, output, props);
}
static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output, DWORD *count)
diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c
index 666cf65a462..c1972b29eb9 100644
--- a/dlls/wmvcore/tests/wmvcore.c
+++ b/dlls/wmvcore/tests/wmvcore.c
@@ -1483,14 +1483,7 @@ static void test_async_reader_types(void)
check_video_type(mt);
hr = IWMReader_SetOutputProps(reader, output_number, output_props);
- todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
- if (hr != S_OK)
- {
- ref = IWMOutputMediaProps_Release(output_props);
- ok(!ref, "Got outstanding refcount %d.\n", ref);
- winetest_pop_context();
- continue;
- }
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IWMReader_SetOutputProps(reader, 1 - output_number, output_props);
if (!i)
ok(hr == NS_E_INCOMPATIBLE_FORMAT /* win < 8, win10 1507-1809 */
@@ -1498,7 +1491,7 @@ static void test_async_reader_types(void)
else
todo_wine ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr);
hr = IWMReader_SetOutputProps(reader, 2, output_props);
- todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+ ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
hr = IWMReader_GetOutputProps(reader, output_number, &output_props2);
ok(hr == S_OK, "Got hr %#x.\n", hr);
More information about the wine-cvs
mailing list