[PATCH 3/5] evr: Respond to IMFVideoMixerControl in mixer's GetService().

Nikolay Sivov nsivov at codeweavers.com
Wed Jul 8 10:10:36 CDT 2020


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/evr/mixer.c     | 4 +++-
 dlls/evr/tests/evr.c | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c
index c8bd300b0d3..f274a2a447f 100644
--- a/dlls/evr/mixer.c
+++ b/dlls/evr/mixer.c
@@ -1021,7 +1021,9 @@ static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, RE
     {
         if (IsEqualIID(riid, &IID_IMFVideoMixerBitmap) ||
                 IsEqualIID(riid, &IID_IMFVideoProcessor) ||
-                IsEqualIID(riid, &IID_IMFVideoPositionMapper))
+                IsEqualIID(riid, &IID_IMFVideoPositionMapper) ||
+                IsEqualIID(riid, &IID_IMFVideoMixerControl) ||
+                IsEqualIID(riid, &IID_IMFVideoMixerControl2))
         {
             return IMFGetService_QueryInterface(iface, riid, obj);
         }
diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c
index db9b3a80e04..5e184947188 100644
--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -450,6 +450,10 @@ static void test_default_mixer(void)
     hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&processor);
     ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
 
+    hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, (void **)&unk);
+    ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+    IUnknown_Release(unk);
+
     hr = IMFVideoProcessor_GetBackgroundColor(processor, NULL);
     ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);
 
-- 
2.27.0




More information about the wine-devel mailing list