Nikolay Sivov : evr/mixer: Handle uninitialized input case in GetOutputAvailableType().

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Sep 17 14:24:38 2020 +0300

evr/mixer: Handle uninitialized input case in GetOutputAvailableType().

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

---

 dlls/evr/mixer.c     | 4 +++-
 dlls/evr/tests/evr.c | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c
index 70199f37a1..710e20815a 100644
--- a/dlls/evr/mixer.c
+++ b/dlls/evr/mixer.c
@@ -533,7 +533,9 @@ static HRESULT WINAPI video_mixer_transform_GetOutputAvailableType(IMFTransform
 
     EnterCriticalSection(&mixer->cs);
 
-    if (index >= mixer->output.type_count)
+    if (!mixer->inputs[0].media_type)
+        hr = MF_E_TRANSFORM_TYPE_NOT_SET;
+    else if (index >= mixer->output.type_count)
         hr = MF_E_NO_MORE_TYPES;
     else
     {
diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c
index ecf1f850c7..a68952c42a 100644
--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -835,6 +835,9 @@ static void test_default_mixer_type_negotiation(void)
     hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type);
     ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr);
 
+    hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type);
+    ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr);
+
     hr = MFCreateMediaType(&media_type);
     ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr);