Nikolay Sivov : evr: Respond to IMFVideoMixerControl in mixer's GetService().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 52f8191b9348f0e5b183b81cb6f7a8e9787a64c2
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=52f8191b9348f0e5b183b81cb...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Wed Jul  8 18:10:36 2020 +0300

evr: Respond to IMFVideoMixerControl in mixer's GetService().

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 c8bd300b0d..f274a2a447 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 db9b3a80e0..5e18494718 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);