[PATCH 4/4] evr: Add IMFTopologyServiceLookupClient stub for default mixer.
Nikolay Sivov
nsivov at codeweavers.com
Wed Jun 17 06:59:35 CDT 2020
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/evr/mixer.c | 54 ++++++++++++++++++++++++++++++++++++++++++++
dlls/evr/tests/evr.c | 4 +---
2 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c
index 97eaf976fc8..3101d17ffdb 100644
--- a/dlls/evr/mixer.c
+++ b/dlls/evr/mixer.c
@@ -30,6 +30,7 @@ struct video_mixer
{
IMFTransform IMFTransform_iface;
IMFVideoDeviceID IMFVideoDeviceID_iface;
+ IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface;
LONG refcount;
};
@@ -43,6 +44,11 @@ static struct video_mixer *impl_from_IMFVideoDeviceID(IMFVideoDeviceID *iface)
return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoDeviceID_iface);
}
+static struct video_mixer *impl_from_IMFTopologyServiceLookupClient(IMFTopologyServiceLookupClient *iface)
+{
+ return CONTAINING_RECORD(iface, struct video_mixer, IMFTopologyServiceLookupClient_iface);
+}
+
static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, REFIID riid, void **obj)
{
struct video_mixer *mixer = impl_from_IMFTransform(iface);
@@ -58,6 +64,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface,
{
*obj = &mixer->IMFVideoDeviceID_iface;
}
+ else if (IsEqualIID(riid, &IID_IMFTopologyServiceLookupClient))
+ {
+ *obj = &mixer->IMFTopologyServiceLookupClient_iface;
+ }
else
{
WARN("Unsupported interface %s.\n", debugstr_guid(riid));
@@ -328,6 +338,49 @@ static const IMFVideoDeviceIDVtbl video_mixer_device_id_vtbl =
video_mixer_device_id_GetDeviceID,
};
+static HRESULT WINAPI video_mixer_service_client_QueryInterface(IMFTopologyServiceLookupClient *iface,
+ REFIID riid, void **obj)
+{
+ struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface);
+ return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj);
+}
+
+static ULONG WINAPI video_mixer_service_client_AddRef(IMFTopologyServiceLookupClient *iface)
+{
+ struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface);
+ return IMFTransform_AddRef(&mixer->IMFTransform_iface);
+}
+
+static ULONG WINAPI video_mixer_service_client_Release(IMFTopologyServiceLookupClient *iface)
+{
+ struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface);
+ return IMFTransform_Release(&mixer->IMFTransform_iface);
+}
+
+static HRESULT WINAPI video_mixer_service_client_InitServicePointers(IMFTopologyServiceLookupClient *iface,
+ IMFTopologyServiceLookup *service_lookup)
+{
+ FIXME("%p, %p.\n", iface, service_lookup);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI video_mixer_service_client_ReleaseServicePointers(IMFTopologyServiceLookupClient *iface)
+{
+ FIXME("%p.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static const IMFTopologyServiceLookupClientVtbl video_mixer_service_client_vtbl =
+{
+ video_mixer_service_client_QueryInterface,
+ video_mixer_service_client_AddRef,
+ video_mixer_service_client_Release,
+ video_mixer_service_client_InitServicePointers,
+ video_mixer_service_client_ReleaseServicePointers,
+};
+
HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj)
{
TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj);
@@ -352,6 +405,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out)
object->IMFTransform_iface.lpVtbl = &video_mixer_transform_vtbl;
object->IMFVideoDeviceID_iface.lpVtbl = &video_mixer_device_id_vtbl;
+ object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl;
object->refcount = 1;
*out = &object->IMFTransform_iface;
diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c
index 7fa6136b0e9..56fb1680b07 100644
--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -350,10 +350,8 @@ static void test_default_mixer(void)
ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr);
hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk);
-todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
- if (SUCCEEDED(hr))
- IUnknown_Release(unk);
+ IUnknown_Release(unk);
hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
--
2.27.0
More information about the wine-devel
mailing list