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

mfplay: Keep user callback reference. 

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-05 09:10:57 +03:00 committed by Alexandre Julliard
parent c3c0e2a440
commit 97ed08cb52
3 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/mfplay/player.c
View File

@ -33,6 +33,7 @@ struct media_player
{
IMFPMediaPlayer IMFPMediaPlayer_iface;
LONG refcount;
IMFPMediaPlayerCallback *callback;
};
static struct media_player *impl_from_IMFPMediaPlayer(IMFPMediaPlayer *iface)
@ -76,7 +77,11 @@ static ULONG WINAPI media_player_Release(IMFPMediaPlayer *iface)
TRACE("%p, refcount %u.\n", iface, refcount);
if (!refcount)
{
if (player->callback)
IMFPMediaPlayerCallback_Release(player->callback);
heap_free(player);
}
return refcount;
}
@ -396,6 +401,9 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C
object->IMFPMediaPlayer_iface.lpVtbl = &media_player_vtbl;
object->refcount = 1;
object->callback = callback;
if (object->callback)
IMFPMediaPlayerCallback_AddRef(object->callback);
*player = &object->IMFPMediaPlayer_iface;

2
dlls/mfplay/tests/Makefile.in
View File

@ -1,5 +1,5 @@
TESTDLL = mfplay.dll
IMPORTS = mfplay
IMPORTS = mfplay uuid mfuuid
C_SRCS = \
mfplay.c

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

@ -26,14 +26,55 @@
#include "wine/test.h"
static HRESULT WINAPI test_callback_QueryInterface(IMFPMediaPlayerCallback *iface, REFIID riid, void **obj)
{
if (IsEqualIID(riid, &IID_IMFPMediaPlayerCallback) ||
IsEqualIID(riid, &IID_IUnknown))
{
*obj = iface;
IMFPMediaPlayerCallback_AddRef(iface);
return S_OK;
}
*obj = NULL;
return E_NOINTERFACE;
}
static ULONG WINAPI test_callback_AddRef(IMFPMediaPlayerCallback *iface)
{
return 2;
}
static ULONG WINAPI test_callback_Release(IMFPMediaPlayerCallback *iface)
{
return 1;
}
static void WINAPI test_callback_OnMediaPlayerEvent(IMFPMediaPlayerCallback *iface, MFP_EVENT_HEADER *event_header)
{
}
static const IMFPMediaPlayerCallbackVtbl test_callback_vtbl =
{
test_callback_QueryInterface,
test_callback_AddRef,
test_callback_Release,
test_callback_OnMediaPlayerEvent,
};
static void test_create_player(void)
{
IMFPMediaPlayerCallback callback = { &test_callback_vtbl };
IMFPMediaPlayer *player;
HRESULT hr;
hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
IMFPMediaPlayer_Release(player);
hr = MFPCreateMediaPlayer(NULL, FALSE, 0, &callback, NULL, &player);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
IMFPMediaPlayer_Release(player);
}
START_TEST(mfplay)