mfmediaengine: Handle shutdown state in GetNativeVideoSize().

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

mfmediaengine: Handle shutdown state in GetNativeVideoSize().
86a72e05 · Nikolay Sivov · Alexandre Julliard · ef8bf642 · 86a72e05 · 86a72e05
Commit 86a72e05 authored Nov 05, 2020 by Nikolay Sivov Committed by Alexandre Julliard Nov 05, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

main.c dlls/mfmediaengine/main.c +3 -1

mfmediaengine.c dlls/mfmediaengine/tests/mfmediaengine.c +0 -1

No files found.
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -1338,7 +1338,9 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO

    EnterCriticalSection(&engine->cs);

-    if (!engine->video_frame.size.cx && !engine->video_frame.size.cy)
+    if (engine->flags & FLAGS_ENGINE_SHUT_DOWN)
+        hr = MF_E_SHUTDOWN;
+    else if (!engine->video_frame.size.cx && !engine->video_frame.size.cy)
        hr = E_FAIL;
    else
    {

--- a/dlls/mfmediaengine/tests/mfmediaengine.c
+++ b/dlls/mfmediaengine/tests/mfmediaengine.c
@@ -379,7 +379,6 @@ todo_wine
    ok(!state, "Unexpected state.\n");

    hr = IMFMediaEngine_GetNativeVideoSize(media_engine, &cx, &cy);
-todo_wine
    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);

    hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy);