[PATCH 0/3] MR3176: mfmediaengine/tests: Notification handling cleanup.
From: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/tests/mfmediaengine.c | 78 +++++++++++++++++------- 1 file changed, 55 insertions(+), 23 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 655b19af050..26f006a2335 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1136,12 +1136,18 @@ static IMFByteStream *load_resource(const WCHAR *name, const WCHAR *mime) struct test_transfer_notify { IMFMediaEngineNotify IMFMediaEngineNotify_iface; + LONG refcount; IMFMediaEngineEx *media_engine; HANDLE ready_event; HRESULT error; }; +static struct test_transfer_notify *impl_from_test_transfer_notify(IMFMediaEngineNotify *iface) +{ + return CONTAINING_RECORD(iface, struct test_transfer_notify, IMFMediaEngineNotify_iface); +} + static HRESULT WINAPI test_transfer_notify_QueryInterface(IMFMediaEngineNotify *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown) @@ -1158,17 +1164,27 @@ static HRESULT WINAPI test_transfer_notify_QueryInterface(IMFMediaEngineNotify * static ULONG WINAPI test_transfer_notify_AddRef(IMFMediaEngineNotify *iface) { - return 2; + struct test_transfer_notify *notify = impl_from_test_transfer_notify(iface); + return InterlockedIncrement(¬ify->refcount); } static ULONG WINAPI test_transfer_notify_Release(IMFMediaEngineNotify *iface) { - return 1; + struct test_transfer_notify *notify = impl_from_test_transfer_notify(iface); + ULONG refcount = InterlockedDecrement(¬ify->refcount); + + if (!refcount) + { + CloseHandle(notify->ready_event); + free(notify); + } + + return refcount; } static HRESULT WINAPI test_transfer_notify_EventNotify(IMFMediaEngineNotify *iface, DWORD event, DWORD_PTR param1, DWORD param2) { - struct test_transfer_notify *notify = CONTAINING_RECORD(iface, struct test_transfer_notify, IMFMediaEngineNotify_iface); + struct test_transfer_notify *notify = impl_from_test_transfer_notify(iface); IMFMediaEngineEx *media_engine = notify->media_engine; DWORD width, height; HRESULT hr; @@ -1211,13 +1227,26 @@ static IMFMediaEngineNotifyVtbl test_transfer_notify_vtbl = test_transfer_notify_EventNotify, }; +static struct test_transfer_notify *create_transfer_notify(void) +{ + struct test_transfer_notify *object; + + object = calloc(1, sizeof(*object)); + object->IMFMediaEngineNotify_iface.lpVtbl = &test_transfer_notify_vtbl; + object->refcount = 1; + object->ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(!!object->ready_event, "Failed to create an event, error %lu.\n", GetLastError()); + + return object; +} + static void test_TransferVideoFrame(void) { - struct test_transfer_notify notify = {{&test_transfer_notify_vtbl}}; + struct test_transfer_notify *notify; WCHAR url[] = {L"i420-64x64.avi"}; - ID3D11Texture2D *texture, *rb_texture; + ID3D11Texture2D *texture = NULL, *rb_texture; D3D11_MAPPED_SUBRESOURCE map_desc; - IMFMediaEngineEx *media_engine; + IMFMediaEngineEx *media_engine = NULL; IMFDXGIDeviceManager *manager; ID3D11DeviceContext *context; D3D11_TEXTURE2D_DESC desc; @@ -1230,13 +1259,12 @@ static void test_TransferVideoFrame(void) stream = load_resource(L"i420-64x64.avi", L"video/avi"); - notify.ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); - ok(!!notify.ready_event, "CreateEventW failed, error %lu\n", GetLastError()); + notify = create_transfer_notify(); if (!(device = create_d3d11_device())) { skip("Failed to create a D3D11 device, skipping tests.\n"); - return; + goto done; } hr = pMFCreateDXGIDeviceManager(&token, &manager); @@ -1244,13 +1272,12 @@ static void test_TransferVideoFrame(void) hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)device, token); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - media_engine = create_media_engine_ex(¬ify.IMFMediaEngineNotify_iface, - manager, DXGI_FORMAT_B8G8R8X8_UNORM); + media_engine = create_media_engine_ex(¬ify->IMFMediaEngineNotify_iface, manager, DXGI_FORMAT_B8G8R8X8_UNORM); IMFDXGIDeviceManager_Release(manager); - if (!(notify.media_engine = media_engine)) - return; + if (!(notify->media_engine = media_engine)) + goto done; memset(&desc, 0, sizeof(desc)); desc.Width = 64; @@ -1266,12 +1293,12 @@ static void test_TransferVideoFrame(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFByteStream_Release(stream); - res = WaitForSingleObject(notify.ready_event, 5000); + res = WaitForSingleObject(notify->ready_event, 5000); ok(!res, "Unexpected res %#lx.\n", res); - if (FAILED(notify.error)) + if (FAILED(notify->error)) { - win_skip("Media engine reported error %#lx, skipping tests.\n", notify.error); + win_skip("Media engine reported error %#lx, skipping tests.\n", notify->error); goto done; } @@ -1281,13 +1308,13 @@ static void test_TransferVideoFrame(void) ok(res == 1, "Unexpected stream count %lu.\n", res); /* FIXME: Wine first video frame is often full of garbage, wait for another update */ - res = WaitForSingleObject(notify.ready_event, 500); + res = WaitForSingleObject(notify->ready_event, 500); /* It's also missing the MF_MEDIA_ENGINE_EVENT_TIMEUPDATE notifications */ todo_wine ok(!res, "Unexpected res %#lx.\n", res); SetRect(&dst_rect, 0, 0, desc.Width, desc.Height); - hr = IMFMediaEngineEx_TransferVideoFrame(notify.media_engine, (IUnknown *)texture, NULL, NULL, NULL); + hr = IMFMediaEngineEx_TransferVideoFrame(notify->media_engine, (IUnknown *)texture, NULL, NULL, NULL); ok(hr == S_OK || broken(hr == E_POINTER) /* w1064v1507 */, "Unexpected hr %#lx.\n", hr); if (hr == E_POINTER) goto done; @@ -1317,13 +1344,18 @@ static void test_TransferVideoFrame(void) ID3D11Texture2D_Release(rb_texture); done: - IMFMediaEngineEx_Shutdown(media_engine); - IMFMediaEngineEx_Release(media_engine); + if (media_engine) + { + IMFMediaEngineEx_Shutdown(media_engine); + IMFMediaEngineEx_Release(media_engine); + } - ID3D11Texture2D_Release(texture); - ID3D11Device_Release(device); + if (texture) + ID3D11Texture2D_Release(texture); + if (device) + ID3D11Device_Release(device); - CloseHandle(notify.ready_event); + IMFMediaEngineNotify_Release(¬ify->IMFMediaEngineNotify_iface); } START_TEST(mfmediaengine) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3176
From: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/tests/mfmediaengine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 26f006a2335..1af6858aca3 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1243,7 +1243,6 @@ static struct test_transfer_notify *create_transfer_notify(void) static void test_TransferVideoFrame(void) { struct test_transfer_notify *notify; - WCHAR url[] = {L"i420-64x64.avi"}; ID3D11Texture2D *texture = NULL, *rb_texture; D3D11_MAPPED_SUBRESOURCE map_desc; IMFMediaEngineEx *media_engine = NULL; @@ -1256,6 +1255,7 @@ static void test_TransferVideoFrame(void) UINT token; HRESULT hr; DWORD res; + BSTR url; stream = load_resource(L"i420-64x64.avi", L"video/avi"); @@ -1289,8 +1289,10 @@ static void test_TransferVideoFrame(void) hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + url = SysAllocString(L"i420-64x64.avi"); hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, stream, url); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + SysFreeString(url); IMFByteStream_Release(stream); res = WaitForSingleObject(notify->ready_event, 5000); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3176
From: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/tests/mfmediaengine.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 1af6858aca3..c6baaed5942 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1316,10 +1316,8 @@ static void test_TransferVideoFrame(void) ok(!res, "Unexpected res %#lx.\n", res); SetRect(&dst_rect, 0, 0, desc.Width, desc.Height); - hr = IMFMediaEngineEx_TransferVideoFrame(notify->media_engine, (IUnknown *)texture, NULL, NULL, NULL); - ok(hr == S_OK || broken(hr == E_POINTER) /* w1064v1507 */, "Unexpected hr %#lx.\n", hr); - if (hr == E_POINTER) - goto done; + hr = IMFMediaEngineEx_TransferVideoFrame(notify->media_engine, (IUnknown *)texture, NULL, &dst_rect, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ID3D11Texture2D_GetDesc(texture, &desc); desc.Usage = D3D11_USAGE_STAGING; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3176
participants (2)
-
Nikolay Sivov -
Nikolay Sivov (＠nsivov)