mfplay: Handle shutdown state on GetMediaItem().

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

mfplay: Handle shutdown state on GetMediaItem().
e2f74ce4 · Nikolay Sivov · Alexandre Julliard · 58d0cb0d · e2f74ce4 · e2f74ce4
Commit e2f74ce4 authored Apr 13, 2021 by Nikolay Sivov Committed by Alexandre Julliard Apr 13, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

player.c dlls/mfplay/player.c +3 -1

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

No files found.
--- a/dlls/mfplay/player.c
+++ b/dlls/mfplay/player.c
@@ -998,7 +998,9 @@ static HRESULT WINAPI media_player_GetMediaItem(IMFPMediaPlayer *iface, IMFPMedi
        return E_POINTER;

    EnterCriticalSection(&player->cs);
-    if (!player->item)
+    if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN)
+        hr = MF_E_SHUTDOWN;
+    else if (!player->item)
        hr = MF_E_NOT_FOUND;
    else
    {

--- a/dlls/mfplay/tests/mfplay.c
+++ b/dlls/mfplay/tests/mfplay.c
@@ -163,7 +163,6 @@ static void test_shutdown(void)
    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);

    hr = IMFPMediaPlayer_GetMediaItem(player, &item);
-todo_wine
    ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);

    hr = IMFPMediaPlayer_GetVideoWindow(player, &window);