evr/presenter: Validate passed handle on SetVideoWindow().

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

evr/presenter: Validate passed handle on SetVideoWindow().
adc4dd67 · Nikolay Sivov · Alexandre Julliard · c01a9bae · adc4dd67 · adc4dd67
Commit adc4dd67 authored Oct 06, 2020 by Nikolay Sivov Committed by Alexandre Julliard Oct 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

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

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

No files found.
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -603,6 +603,9 @@ static HRESULT WINAPI video_presenter_control_SetVideoWindow(IMFVideoDisplayCont

    TRACE("%p, %p.\n", iface, window);

+    if (!IsWindow(window))
+        return E_INVALIDARG;
+
    EnterCriticalSection(&presenter->cs);
    presenter->video_window = window;
    LeaveCriticalSection(&presenter->cs);

--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -1073,6 +1073,12 @@ static void test_default_presenter(void)
    ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
    ok(hwnd2 == NULL, "Unexpected window %p.\n", hwnd2);

+    hr = IMFVideoDisplayControl_SetVideoWindow(display_control, NULL);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+
+    hr = IMFVideoDisplayControl_SetVideoWindow(display_control, (HWND)0x1);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
+
    hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd);
    ok(hr == S_OK, "Unexpected hr %#x.\n", hr);