[v2 PATCH 1/2] mfmediaengine: Add IMFGetService stub.
Nikolay Sivov
nsivov at codeweavers.com
Thu Jan 20 08:49:13 CST 2022
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
v2: fixed a test failure on Windows 8
dlls/mfmediaengine/main.c | 60 ++++++++++++++++++++++--
dlls/mfmediaengine/tests/mfmediaengine.c | 23 +++++++++
2 files changed, 78 insertions(+), 5 deletions(-)
diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index 5b8d91d9632..b098844a7fa 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -114,6 +114,7 @@ struct rect
struct media_engine
{
IMFMediaEngine IMFMediaEngine_iface;
+ IMFGetService IMFGetService_iface;
IMFAsyncCallback session_events;
IMFAsyncCallback load_handler;
IMFSampleGrabberSinkCallback grabber_callback;
@@ -722,6 +723,11 @@ static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *ifac
return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface);
}
+static inline struct media_engine *impl_from_IMFGetService(IMFGetService *iface)
+{
+ return CONTAINING_RECORD(iface, struct media_engine, IMFGetService_iface);
+}
+
static struct media_engine *impl_from_session_events_IMFAsyncCallback(IMFAsyncCallback *iface)
{
return CONTAINING_RECORD(iface, struct media_engine, session_events);
@@ -1254,19 +1260,28 @@ static const IMFAsyncCallbackVtbl media_engine_load_handler_vtbl =
static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj)
{
+ struct media_engine *engine = impl_from_IMFMediaEngine(iface);
+
TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj);
if (IsEqualIID(riid, &IID_IMFMediaEngine) ||
IsEqualIID(riid, &IID_IUnknown))
{
*obj = iface;
- IMFMediaEngine_AddRef(iface);
- return S_OK;
+ }
+ else if (IsEqualIID(riid, &IID_IMFGetService))
+ {
+ *obj = &engine->IMFGetService_iface;
+ }
+ else
+ {
+ WARN("Unsupported interface %s.\n", debugstr_guid(riid));
+ *obj = NULL;
+ return E_NOINTERFACE;
}
- WARN("Unsupported interface %s.\n", debugstr_guid(riid));
- *obj = NULL;
- return E_NOINTERFACE;
+ IUnknown_AddRef((IUnknown *)*obj);
+ return S_OK;
}
static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface)
@@ -2288,6 +2303,40 @@ static const IMFMediaEngineVtbl media_engine_vtbl =
media_engine_OnVideoStreamTick,
};
+static HRESULT WINAPI media_engine_gs_QueryInterface(IMFGetService *iface, REFIID riid, void **obj)
+{
+ struct media_engine *engine = impl_from_IMFGetService(iface);
+ return IMFMediaEngine_QueryInterface(&engine->IMFMediaEngine_iface, riid, obj);
+}
+
+static ULONG WINAPI media_engine_gs_AddRef(IMFGetService *iface)
+{
+ struct media_engine *engine = impl_from_IMFGetService(iface);
+ return IMFMediaEngine_AddRef(&engine->IMFMediaEngine_iface);
+}
+
+static ULONG WINAPI media_engine_gs_Release(IMFGetService *iface)
+{
+ struct media_engine *engine = impl_from_IMFGetService(iface);
+ return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface);
+}
+
+static HRESULT WINAPI media_engine_gs_GetService(IMFGetService *iface, REFGUID service,
+ REFIID riid, void **object)
+{
+ FIXME("%p, %s, %s, %p stub.\n", iface, debugstr_guid(service), debugstr_guid(riid), object);
+
+ return E_NOTIMPL;
+}
+
+static const IMFGetServiceVtbl media_engine_get_service_vtbl =
+{
+ media_engine_gs_QueryInterface,
+ media_engine_gs_AddRef,
+ media_engine_gs_Release,
+ media_engine_gs_GetService,
+};
+
static HRESULT WINAPI media_engine_grabber_callback_QueryInterface(IMFSampleGrabberSinkCallback *iface,
REFIID riid, void **obj)
{
@@ -2442,6 +2491,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct
HRESULT hr;
engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl;
+ engine->IMFGetService_iface.lpVtbl = &media_engine_get_service_vtbl;
engine->session_events.lpVtbl = &media_engine_session_events_vtbl;
engine->load_handler.lpVtbl = &media_engine_load_handler_vtbl;
engine->grabber_callback.lpVtbl = &media_engine_grabber_callback_vtbl;
diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c
index 096f6e3f2a5..047a81d0d88 100644
--- a/dlls/mfmediaengine/tests/mfmediaengine.c
+++ b/dlls/mfmediaengine/tests/mfmediaengine.c
@@ -46,6 +46,21 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line)
ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref);
}
+#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c)
+static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported)
+{
+ IUnknown *iface = iface_ptr;
+ HRESULT hr, expected_hr;
+ IUnknown *unk;
+
+ expected_hr = supported ? S_OK : E_NOINTERFACE;
+
+ hr = IUnknown_QueryInterface(iface, iid, (void **)&unk);
+ ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr);
+ if (SUCCEEDED(hr))
+ IUnknown_Release(unk);
+}
+
static void init_functions(void)
{
HMODULE mod = GetModuleHandleA("mfplat.dll");
@@ -197,6 +212,7 @@ static void test_CreateInstance(void)
IMFDXGIDeviceManager *manager;
IMFMediaEngine *media_engine;
IMFAttributes *attributes;
+ IUnknown *unk;
UINT token;
HRESULT hr;
@@ -227,6 +243,13 @@ static void test_CreateInstance(void)
hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine);
ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr);
+ check_interface(media_engine, &IID_IMFMediaEngine, TRUE);
+
+ hr = IMFMediaEngine_QueryInterface(media_engine, &IID_IMFGetService, (void **)&unk);
+ ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* supported since win10 */, "Unexpected hr %#x.\n", hr);
+ if (SUCCEEDED(hr))
+ IUnknown_Release(unk);
+
IMFMediaEngine_Release(media_engine);
IMFAttributes_Release(attributes);
IMFDXGIDeviceManager_Release(manager);
--
2.34.1
More information about the wine-devel
mailing list