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

mfplay: Implement GetVideoWindow(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-04-07 11:06:59 +03:00 committed by Alexandre Julliard
parent e3ca290a4c
commit 0f18e5f81d
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/mfplay/player.c
View File

@ -69,6 +69,7 @@ struct media_player
IMFSourceResolver *resolver;
MFP_CREATION_OPTIONS options;
HWND event_window;
HWND output_window;
};
struct generic_event
@ -862,11 +863,15 @@ static HRESULT WINAPI media_player_GetAspectRatioMode(IMFPMediaPlayer *iface,
return E_NOTIMPL;
}
static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND *hwnd)
static HRESULT WINAPI media_player_GetVideoWindow(IMFPMediaPlayer *iface, HWND *window)
{
FIXME("%p, %p.\n", iface, hwnd);
struct media_player *player = impl_from_IMFPMediaPlayer(iface);
return E_NOTIMPL;
TRACE("%p, %p.\n", iface, window);
*window = player->output_window;
return S_OK;
}
static HRESULT WINAPI media_player_UpdateVideo(IMFPMediaPlayer *iface)
@ -1166,12 +1171,12 @@ static const IMFAsyncCallbackVtbl media_player_events_callback_vtbl =
};
HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options,
IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player)
IMFPMediaPlayerCallback *callback, HWND window, IMFPMediaPlayer **player)
{
struct media_player *object;
HRESULT hr;
TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, hwnd, player);
TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, window, player);
if (!(object = heap_alloc_zero(sizeof(*object))))
return E_OUTOFMEMORY;
@ -1184,9 +1189,10 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C
object->events_callback.lpVtbl = &media_player_events_callback_vtbl;
object->refcount = 1;
object->callback = callback;
object->options = options;
if (object->callback)
IMFPMediaPlayerCallback_AddRef(object->callback);
object->options = options;
object->output_window = window;
if (FAILED(hr = CreatePropertyStore(&object->propstore)))
goto failed;
if (FAILED(hr = MFCreateSourceResolver(&object->resolver)))

8
dlls/mfplay/tests/mfplay.c
View File

@ -83,6 +83,7 @@ static void test_create_player(void)
IPropertyStore *propstore;
IMFPMediaPlayer *player;
IUnknown *unk, *unk2;
HWND window;
HRESULT hr;
hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player);
@ -108,8 +109,13 @@ static void test_create_player(void)
IMFPMediaPlayer_Release(player);
hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, NULL, &player);
hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, (HWND)0x1, &player);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMFPMediaPlayer_GetVideoWindow(player, &window);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(window == (HWND)0x1, "Unexpected window.\n");
IMFPMediaPlayer_Release(player);
}