June 2023 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfmediaengine/tests: Allocate notification object on heap for frame transfer tests.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 6b9eb2d09fc97d6e868e84c97ec8e286a43141eb URL: https://gitlab.winehq.org/wine/wine/-/commit/6b9eb2d09fc97d6e868e84c97ec8e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 16:31:28 2023 +0200 mfmediaengine/tests: Allocate notification object on heap for frame transfer tests. --- 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(&notify->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(&notify->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(&notify.IMFMediaEngineNotify_iface, - manager, DXGI_FORMAT_B8G8R8X8_UNORM); + media_engine = create_media_engine_ex(&notify->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(&notify->IMFMediaEngineNotify_iface); } START_TEST(mfmediaengine)

1 0

Nikolay Sivov : mfmediaengine/tests: Use correct type for url argument in SetSourceFromByteStream().
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 36fcbba73ef377ff08e81618b752a9eafa59cdd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/36fcbba73ef377ff08e81618b752a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 16:38:38 2023 +0200 mfmediaengine/tests: Use correct type for url argument in SetSourceFromByteStream(). --- 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);

1 0

Zebediah Figura : d3d11/tests: Use more aligned offsets in test_clear_buffer_unordered_access_view().
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: fdd64782ffaa9d41829f82f790a72661dd5708f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fdd64782ffaa9d41829f82f790a726… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jun 10 15:14:34 2023 -0500 d3d11/tests: Use more aligned offsets in test_clear_buffer_unordered_access_view(). Creating a view with an unaligned offset is legal in d3d and apparently works, both on Windows and Linux, but may violate the Vulkan specification: VUID-VkBufferViewCreateInfo-offset-00926(ERROR / SPEC): msgNum: -833749292 - Validation Error: [ VUID-VkBufferViewCreateInfo-offset-00926 ] Object 0: handle = 0x3c000000003c, type = VK_OBJECT_TYPE_BUFFER; | MessageID = 0xce4dfed4 | vkCreateBufferView(): VkBufferViewCreateInfo offset (36) must be a multiple of VkPhysicalDeviceLimits::minTexelBufferOffsetAlignment (16). The Vulkan spec states: offset must be a multiple of VkPhysicalDeviceLimits::minTexelBufferOffsetAlignment (https://www.khronos.org/registry/vulkan/specs/1.2-khr-extensions/html/vkspe…) Without any reason to test unaligned buffer views here, just resolve this by changing the test. --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9d120e99f6f..cc3139f759f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16638,8 +16638,8 @@ static void test_clear_buffer_unordered_access_view(void) U(uav_desc).Buffer.Flags = 0; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - U(uav_desc).Buffer.FirstElement = 9; - U(uav_desc).Buffer.NumElements = 7; + U(uav_desc).Buffer.FirstElement = 8; + U(uav_desc).Buffer.NumElements = 8; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav2); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Tim Clem : win32u: Detect a missed WM_LBUTTONUP in the size/move loop.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 1e21e82859baf1298d610021c88adcbe2a529de5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e21e82859baf1298d610021c88adc… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Jun 23 13:38:46 2023 -0700 win32u: Detect a missed WM_LBUTTONUP in the size/move loop. --- dlls/win32u/defwnd.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index e5ff1a010b9..cba5f02c02e 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -788,6 +788,17 @@ static void sys_command_size_move( HWND hwnd, WPARAM wparam ) { NtUserTranslateMessage( &msg, 0 ); NtUserDispatchMessage( &msg ); + + /* It's possible that the window proc that handled the dispatch consumed a + * WM_LBUTTONUP. Detect that and terminate the loop as if we'd gotten it. */ + if (!(NtUserGetKeyState( VK_LBUTTON ) & 0x8000)) + { + DWORD last_pos = NtUserGetThreadInfo()->message_pos; + pt.x = ((int)(short)LOWORD( last_pos )); + pt.y = ((int)(short)HIWORD( last_pos )); + break; + } + continue; /* We are not interested in other messages */ }

1 0

Michael Stefaniuc : wow64win: Remove dangling space after newline in ERR() message.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 7ae55662a2a417eae913f4b459cfb900fb156769 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ae55662a2a417eae913f4b459cfb9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 22 18:56:52 2023 +0200 wow64win: Remove dangling space after newline in ERR() message. --- dlls/wow64win/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 59c3251fe92..73854225b7f 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -4357,6 +4357,6 @@ NTSTATUS WINAPI wow64_NtUserDisplayConfigGetDeviceInfo( UINT *args ) NTSTATUS WINAPI wow64___wine_send_input( UINT *args ) { - ERR( "not supported\n "); + ERR( "not supported\n" ); return 0; }

1 0

Michael Stefaniuc : windows.gaming.input: Drop superfluous casts to self.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 3dfa697b0e3944856c8d2ba1380a6f7e71ff789e URL: https://gitlab.winehq.org/wine/wine/-/commit/3dfa697b0e3944856c8d2ba1380a6f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 19 18:33:43 2023 +0200 windows.gaming.input: Drop superfluous casts to self. --- dlls/windows.gaming.input/async.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index c41abe96cd1..a30004f2d24 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -442,7 +442,7 @@ static HRESULT WINAPI async_bool_put_Completed( IAsyncOperation_boolean *iface, IWineAsyncOperationCompletedHandler *handler = (IWineAsyncOperationCompletedHandler *)bool_handler; struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); TRACE( "iface %p, handler %p.\n", iface, handler ); - return IWineAsyncInfoImpl_put_Completed( impl->IWineAsyncInfoImpl_inner, (IWineAsyncOperationCompletedHandler *)handler ); + return IWineAsyncInfoImpl_put_Completed( impl->IWineAsyncInfoImpl_inner, handler ); } static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, IAsyncOperationCompletedHandler_boolean **bool_handler ) @@ -450,7 +450,7 @@ static HRESULT WINAPI async_bool_get_Completed( IAsyncOperation_boolean *iface, IWineAsyncOperationCompletedHandler **handler = (IWineAsyncOperationCompletedHandler **)bool_handler; struct async_bool *impl = impl_from_IAsyncOperation_boolean( iface ); TRACE( "iface %p, handler %p.\n", iface, handler ); - return IWineAsyncInfoImpl_get_Completed( impl->IWineAsyncInfoImpl_inner, (IWineAsyncOperationCompletedHandler **)handler ); + return IWineAsyncInfoImpl_get_Completed( impl->IWineAsyncInfoImpl_inner, handler ); } static HRESULT WINAPI async_bool_GetResults( IAsyncOperation_boolean *iface, BOOLEAN *results )

1 0

Michael Stefaniuc : gdiplus/tests: Remove superfluous casts to self.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 3bb5fcd5f3441cbae74edf942cbe41e64d37d3d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bb5fcd5f3441cbae74edf942cbe41… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jun 11 21:55:24 2023 +0300 gdiplus/tests: Remove superfluous casts to self. --- dlls/gdiplus/tests/customlinecap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 4ff090ddce0..6aecf1c7dc4 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -395,13 +395,13 @@ static void test_strokecap(void) stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, &cap); ok(stat == Ok, "Failed to create cap, %d\n", stat); - stat = GdipSetCustomLineCapStrokeCaps((GpCustomLineCap*)cap, LineCapSquare, LineCapFlat); + stat = GdipSetCustomLineCapStrokeCaps(cap, LineCapSquare, LineCapFlat); ok(stat == Ok, "Unexpected return code, %d\n", stat); - stat = GdipSetCustomLineCapStrokeCaps((GpCustomLineCap*)cap, LineCapSquareAnchor, LineCapFlat); + stat = GdipSetCustomLineCapStrokeCaps(cap, LineCapSquareAnchor, LineCapFlat); ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); - stat = GdipSetCustomLineCapStrokeCaps((GpCustomLineCap*)cap, LineCapFlat, LineCapSquareAnchor); + stat = GdipSetCustomLineCapStrokeCaps(cap, LineCapFlat, LineCapSquareAnchor); ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); GdipDeleteCustomLineCap(cap); GdipDeletePath(path);

1 0

Rémi Bernon : winegstreamer: Rename winegstreamer_stream_handler to stream_handler.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 1069d4792cb9f75fd99f461516edcd6539250dad URL: https://gitlab.winehq.org/wine/wine/-/commit/1069d4792cb9f75fd99f461516edcd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 1 11:04:42 2023 +0200 winegstreamer: Rename winegstreamer_stream_handler to stream_handler. --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/media_source.c | 118 +++++++++++++++++++------------------- dlls/winegstreamer/mfplat.c | 2 +- 3 files changed, 61 insertions(+), 61 deletions(-)

1 0

Rémi Bernon : winegstreamer: Lookup stream handler result using a dedicated helper.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 341673f669e87b4e8efe4942ba261a2d6d7b529a URL: https://gitlab.winehq.org/wine/wine/-/commit/341673f669e87b4e8efe4942ba261a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 1 11:07:58 2023 +0200 winegstreamer: Lookup stream handler result using a dedicated helper. --- dlls/winegstreamer/media_source.c | 86 +++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 48 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 2a83abfb7a5..9e75e82063d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1698,6 +1698,25 @@ struct stream_handler CRITICAL_SECTION cs; }; +static struct result_entry *handler_find_result_entry(struct stream_handler *handler, IMFAsyncResult *result) +{ + struct result_entry *entry; + + EnterCriticalSection(&handler->cs); + LIST_FOR_EACH_ENTRY(entry, &handler->results, struct result_entry, entry) + { + if (result == entry->result) + { + list_remove(&entry->entry); + LeaveCriticalSection(&handler->cs); + return entry; + } + } + LeaveCriticalSection(&handler->cs); + + return NULL; +} + static struct stream_handler *impl_from_IMFByteStreamHandler(IMFByteStreamHandler *iface) { return CONTAINING_RECORD(iface, struct stream_handler, IMFByteStreamHandler_iface); @@ -1884,71 +1903,42 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa } static HRESULT WINAPI stream_handler_EndCreateObject(IMFByteStreamHandler *iface, IMFAsyncResult *result, - MF_OBJECT_TYPE *obj_type, IUnknown **object) + MF_OBJECT_TYPE *type, IUnknown **object) { struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface); - struct result_entry *found = NULL, *cur; + struct result_entry *entry; HRESULT hr; - TRACE("%p, %p, %p, %p.\n", iface, result, obj_type, object); - - EnterCriticalSection(&handler->cs); + TRACE("%p, %p, %p, %p.\n", iface, result, type, object); - LIST_FOR_EACH_ENTRY(cur, &handler->results, struct result_entry, entry) + if (!(entry = handler_find_result_entry(handler, result))) { - if (result == cur->result) - { - list_remove(&cur->entry); - found = cur; - break; - } - } - - LeaveCriticalSection(&handler->cs); - - if (found) - { - hr = IMFAsyncResult_GetStatus(found->result); - *obj_type = found->type; - *object = found->object; - IUnknown_AddRef(*object); - result_entry_destroy(found); - } - else - { - *obj_type = MF_OBJECT_INVALID; + *type = MF_OBJECT_INVALID; *object = NULL; - hr = MF_E_UNEXPECTED; + return MF_E_UNEXPECTED; } + hr = IMFAsyncResult_GetStatus(entry->result); + *type = entry->type; + *object = entry->object; + IUnknown_AddRef(*object); + result_entry_destroy(entry); return hr; } -static HRESULT WINAPI stream_handler_CancelObjectCreation(IMFByteStreamHandler *iface, IUnknown *cancel_cookie) +static HRESULT WINAPI stream_handler_CancelObjectCreation(IMFByteStreamHandler *iface, IUnknown *cookie) { struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface); - struct result_entry *found = NULL, *cur; - - TRACE("%p, %p.\n", iface, cancel_cookie); - - EnterCriticalSection(&handler->cs); - - LIST_FOR_EACH_ENTRY(cur, &handler->results, struct result_entry, entry) - { - if (cancel_cookie == (IUnknown *)cur->result) - { - list_remove(&cur->entry); - found = cur; - break; - } - } + IMFAsyncResult *result = (IMFAsyncResult *)cookie; + struct result_entry *entry; - LeaveCriticalSection(&handler->cs); + TRACE("%p, %p.\n", iface, cookie); - if (found) - result_entry_destroy(found); + if (!(entry = handler_find_result_entry(handler, result))) + return MF_E_UNEXPECTED; - return found ? S_OK : MF_E_UNEXPECTED; + result_entry_destroy(entry); + return S_OK; } static HRESULT WINAPI stream_handler_GetMaxNumberOfBytesRequiredForResolution(IMFByteStreamHandler *iface, QWORD *bytes)

1 0

Rémi Bernon : winegstreamer: Lookup stream descriptors before starting streams.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: ed9a7b667f16830b01b5d4ed8ba896d0e924284c URL: https://gitlab.winehq.org/wine/wine/-/commit/ed9a7b667f16830b01b5d4ed8ba896… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 29 14:01:57 2023 +0200 winegstreamer: Lookup stream descriptors before starting streams. --- dlls/winegstreamer/media_source.c | 78 ++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 558d7dd51f5..4de5b5ab608 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -272,30 +272,6 @@ static HRESULT wg_format_from_stream_descriptor(IMFStreamDescriptor *descriptor, return hr; } -static IMFStreamDescriptor *stream_descriptor_from_id(IMFPresentationDescriptor *pres_desc, DWORD id, BOOL *selected) -{ - ULONG sd_count; - IMFStreamDescriptor *ret; - unsigned int i; - - if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorCount(pres_desc, &sd_count))) - return NULL; - - for (i = 0; i < sd_count; i++) - { - DWORD stream_id; - - if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(pres_desc, i, selected, &ret))) - return NULL; - - if (SUCCEEDED(IMFStreamDescriptor_GetStreamIdentifier(ret, &stream_id)) && stream_id == id) - return ret; - - IMFStreamDescriptor_Release(ret); - } - return NULL; -} - static HRESULT stream_descriptor_set_tag(IMFStreamDescriptor *descriptor, struct wg_parser_stream *stream, const GUID *attr, enum wg_parser_tag tag) { @@ -517,7 +493,8 @@ static HRESULT media_source_start(struct media_source *source, IMFPresentationDe GUID *format, PROPVARIANT *position) { BOOL starting = source->state == SOURCE_STOPPED, seek_message = !starting && position->vt != VT_EMPTY; - unsigned int i; + IMFStreamDescriptor **descriptors; + DWORD i, count; HRESULT hr; TRACE("source %p, descriptor %p, format %s, position %s\n", source, descriptor, @@ -533,29 +510,54 @@ static HRESULT media_source_start(struct media_source *source, IMFPresentationDe position->hVal.QuadPart = 0; } - for (i = 0; i < source->stream_count; i++) + if (!(descriptors = calloc(source->stream_count, sizeof(*descriptors)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorCount(descriptor, &count))) + WARN("Failed to get presentation descriptor stream count, hr %#lx\n", hr); + + for (i = 0; i < count; i++) { - struct media_stream *stream; - BOOL was_active, selected; - IMFStreamDescriptor *sd; - DWORD stream_id; + IMFStreamDescriptor *stream_descriptor; + BOOL selected; + DWORD id; - stream = source->streams[i]; - was_active = !starting && stream->active; + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, i, + &selected, &stream_descriptor))) + WARN("Failed to get presentation stream descriptor, hr %#lx\n", hr); + else + { + if (FAILED(hr = IMFStreamDescriptor_GetStreamIdentifier(stream_descriptor, &id))) + WARN("Failed to get stream descriptor id, hr %#lx\n", hr); + else if (id >= source->stream_count) + WARN("Invalid stream descriptor id %lu, hr %#lx\n", id, hr); + else if (selected) + IMFStreamDescriptor_AddRef((descriptors[id] = stream_descriptor)); + + IMFStreamDescriptor_Release(stream_descriptor); + } + } - IMFStreamDescriptor_GetStreamIdentifier(stream->descriptor, &stream_id); - sd = stream_descriptor_from_id(descriptor, stream_id, &selected); - IMFStreamDescriptor_Release(sd); + for (i = 0; i < source->stream_count; i++) + { + struct media_stream *stream = source->streams[i]; + BOOL was_active = !starting && stream->active; if (position->vt != VT_EMPTY) stream->eos = FALSE; - if (!(stream->active = selected)) + if (!(stream->active = !!descriptors[i])) wg_parser_stream_disable(stream->wg_stream); - else if (FAILED(hr = media_stream_start(stream, was_active, seek_message, position))) - WARN("Failed to start media stream, hr %#lx\n", hr); + else + { + if (FAILED(hr = media_stream_start(stream, was_active, seek_message, position))) + WARN("Failed to start media stream, hr %#lx\n", hr); + IMFStreamDescriptor_Release(descriptors[i]); + } } + free(descriptors); + source->state = SOURCE_RUNNING; if (position->vt == VT_I8)

1 0