ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

evr/presenter: Keep video window handle. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-10-02 14:01:11 +03:00 committed by Alexandre Julliard
parent 69e777c804
commit 77e04e221a
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/evr/presenter.c
View File

@ -58,6 +58,7 @@ struct video_presenter
IDirect3DDeviceManager9 *device_manager;
UINT reset_token;
HWND video_window;
unsigned int state;
CRITICAL_SECTION cs;
};
@ -497,16 +498,26 @@ static HRESULT WINAPI video_presenter_control_GetAspectRatioMode(IMFVideoDisplay
static HRESULT WINAPI video_presenter_control_SetVideoWindow(IMFVideoDisplayControl *iface, HWND window)
{
FIXME("%p, %p.\n", iface, window);
struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface);
return E_NOTIMPL;
TRACE("%p, %p.\n", iface, window);
EnterCriticalSection(&presenter->cs);
presenter->video_window = window;
LeaveCriticalSection(&presenter->cs);
return S_OK;
}
static HRESULT WINAPI video_presenter_control_GetVideoWindow(IMFVideoDisplayControl *iface, HWND *window)
{
FIXME("%p, %p.\n", iface, window);
struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface);
return E_NOTIMPL;
TRACE("%p, %p.\n", iface, window);
*window = presenter->video_window;
return S_OK;
}
static HRESULT WINAPI video_presenter_control_RepaintVideo(IMFVideoDisplayControl *iface)

7
dlls/evr/tests/evr.c
View File

@ -1056,20 +1056,17 @@ static void test_default_presenter(void)
hwnd2 = hwnd;
hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2);
todo_wine {
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(hwnd2 == NULL, "Unexpected window %p.\n", hwnd2);
}
hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd);
todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hwnd2 = NULL;
hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2);
todo_wine {
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(hwnd2 == hwnd, "Unexpected window %p.\n", hwnd2);
}
hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);