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

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

evr/mixer: Handle uninitialized input case in GetOutputAvailableType().
deac29d4 · Nikolay Sivov · Alexandre Julliard · 19342f43 · deac29d4 · deac29d4
Commit deac29d4 authored Sep 17, 2020 by Nikolay Sivov Committed by Alexandre Julliard Sep 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

mixer.c dlls/evr/mixer.c +3 -1

evr.c dlls/evr/tests/evr.c +3 -0

No files found.
--- 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
    {

--- 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);