Nikolay Sivov : mfplay: Update destination rectangle on SetVideoSourceRect().

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Mon Oct 25 13:04:18 2021 +0300

mfplay: Update destination rectangle on SetVideoSourceRect().

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

---

 dlls/mfplay/player.c       |  7 +++++--
 dlls/mfplay/tests/mfplay.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c
index fb748a485d8..2ccee418b72 100644
--- a/dlls/mfplay/player.c
+++ b/dlls/mfplay/player.c
@@ -1373,13 +1373,16 @@ static HRESULT WINAPI media_player_SetVideoSourceRect(IMFPMediaPlayer *iface,
 {
     struct media_player *player = impl_from_IMFPMediaPlayer(iface);
     IMFVideoDisplayControl *display_control;
+    RECT dst_rect;
     HRESULT hr;
 
     TRACE("%p, %p.\n", iface, rect);
 
-    if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control)))
+    if (!GetClientRect(player->output_window, &dst_rect))
+        hr = HRESULT_FROM_WIN32(GetLastError());
+    else if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control)))
     {
-        hr = IMFVideoDisplayControl_SetVideoPosition(display_control, rect, NULL);
+        hr = IMFVideoDisplayControl_SetVideoPosition(display_control, rect, &dst_rect);
         IMFVideoDisplayControl_Release(display_control);
     }
 
diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c
index 074cee6d217..70fde9160c8 100644
--- a/dlls/mfplay/tests/mfplay.c
+++ b/dlls/mfplay/tests/mfplay.c
@@ -261,6 +261,49 @@ static void test_video_control(void)
     hr = IMFPMediaPlayer_SetVideoSourceRect(player, &rect);
     ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);
 
+    hr = IMFPMediaPlayer_SetVideoSourceRect(player, NULL);
+    ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);
+
+    hr = IMFPMediaPlayer_SetBorderColor(player, 0);
+    ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);
+
+    hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None);
+    ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);
+
+    hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect);
+    ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);
+
+    hr = IMFPMediaPlayer_GetBorderColor(player, &color);
+    ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);
+
+    hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode);
+    ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);
+
+    hr = IMFPMediaPlayer_GetIdealVideoSize(player, &size, &size);
+    ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);
+
+    hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size);
+    ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);
+
+    hr = IMFPMediaPlayer_UpdateVideo(player);
+todo_wine
+    ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);
+
+    IMFPMediaPlayer_Release(player);
+
+    /* No active media item, no output window.*/
+
+    hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player);
+    ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+
+    rect.left = rect.top = 0.0f;
+    rect.right = rect.bottom = 1.0f;
+    hr = IMFPMediaPlayer_SetVideoSourceRect(player, &rect);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Unexpected hr %#x.\n", hr);
+
+    hr = IMFPMediaPlayer_SetVideoSourceRect(player, NULL);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Unexpected hr %#x.\n", hr);
+
     hr = IMFPMediaPlayer_SetBorderColor(player, 0);
     ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr);