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

Paul Gofman : winhttp: Support abort in task_socket_close().
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: 1b766caa48e8675f97016a2ee749dc3d89010400 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b766caa48e8675f97016a2e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 6 20:24:21 2022 -0500 winhttp: Support abort in task_socket_close(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 269af0826c0..2754dc29163 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -4145,13 +4145,18 @@ static void task_socket_close( void *ctx, BOOL abort ) struct socket *socket = (struct socket *)s->task_hdr.obj; DWORD ret; - if (abort) return; + if (abort) + { + socket_close_complete( socket, ERROR_WINHTTP_OPERATION_CANCELLED ); + return; + } TRACE("running %p\n", ctx); ret = socket_close( socket ); receive_io_complete( socket ); - socket_close_complete( socket, ret ); + if (task_needs_completion( &s->task_hdr )) + socket_close_complete( socket, ret ); } DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reason, DWORD len )

1 0

Paul Gofman : winhttp: Implement reference counting for tasks.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: 3d199dd92ea8d74925371c9fc375b85436206972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d199dd92ea8d74925371c9f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 6 21:52:22 2022 -0500 winhttp: Implement reference counting for tasks. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 32 +++++++++++++++++++++++++++----- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9abe4f45598..70d727c7e2e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -135,20 +135,41 @@ void stop_queue( struct queue *queue ) TRACE("stopped %p\n", queue); } +static void addref_task( struct task_header *task ) +{ + InterlockedIncrement( &task->refs ); +} + +static void release_task( struct task_header *task ) +{ + if (!InterlockedDecrement( &task->refs )) + free( task ); +} + static struct task_header *get_next_task( struct queue *queue, struct task_header *prev_task ) { + struct task_header *task; struct list *entry; AcquireSRWLockExclusive( &queue->lock ); assert( queue->callback_running ); if (prev_task) + { list_remove( &prev_task->entry ); - - if (!(entry = list_head( &queue->queued_tasks ))) + release_task( prev_task ); + } + if ((entry = list_head( &queue->queued_tasks ))) + { + task = LIST_ENTRY( entry, struct task_header, entry ); + addref_task( task ); + } + else + { + task = NULL; queue->callback_running = FALSE; + } ReleaseSRWLockExclusive( &queue->lock ); - if (!entry) return NULL; - return LIST_ENTRY( entry, struct task_header, entry ); + return task; } static void CALLBACK task_callback( TP_CALLBACK_INSTANCE *instance, void *ctx ) @@ -165,7 +186,7 @@ static void CALLBACK task_callback( TP_CALLBACK_INSTANCE *instance, void *ctx ) /* Queue object may be freed by release_object() unless there is another task referencing it. */ next_task = get_next_task( queue, task ); release_object( task->obj ); - free( task ); + release_task( task ); task = next_task; } TRACE( "instance %p exiting.\n", instance ); @@ -178,6 +199,7 @@ static DWORD queue_task( struct queue *queue, TASK_CALLBACK task, struct task_he TRACE("queueing %p in %p\n", task_hdr, queue); task_hdr->callback = task; + task_hdr->refs = 1; task_hdr->obj = obj; addref_object( obj ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 4754d9258d1..ee3cdb78157 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -281,6 +281,7 @@ struct task_header struct list entry; TASK_CALLBACK callback; struct object_header *obj; + volatile LONG refs; }; struct send_request

1 0

Paul Gofman : winhttp: Keep task in queue until completion.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: 5d2f2797e32f84993e898c18cd422e2a0514ba3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2f2797e32f84993e898c18… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 6 21:49:07 2022 -0500 winhttp: Keep task in queue until completion. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index fe703c19109..9abe4f45598 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -135,15 +135,16 @@ void stop_queue( struct queue *queue ) TRACE("stopped %p\n", queue); } -static struct task_header *get_next_task( struct queue *queue ) +static struct task_header *get_next_task( struct queue *queue, struct task_header *prev_task ) { struct list *entry; AcquireSRWLockExclusive( &queue->lock ); assert( queue->callback_running ); - if ((entry = list_head( &queue->queued_tasks ))) - list_remove( entry ); - else + if (prev_task) + list_remove( &prev_task->entry ); + + if (!(entry = list_head( &queue->queued_tasks ))) queue->callback_running = FALSE; ReleaseSRWLockExclusive( &queue->lock ); if (!entry) return NULL; @@ -157,12 +158,12 @@ static void CALLBACK task_callback( TP_CALLBACK_INSTANCE *instance, void *ctx ) TRACE( "instance %p.\n", instance ); - task = get_next_task( queue ); + task = get_next_task( queue, NULL ); while (task) { task->callback( task ); /* Queue object may be freed by release_object() unless there is another task referencing it. */ - next_task = get_next_task( queue ); + next_task = get_next_task( queue, task ); release_object( task->obj ); free( task ); task = next_task;

1 0

Jacek Caban : user32: Use a critical section in RegisterUserApiHook.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: 915ac1c197cbb100d2487cc337c044466d84f91a URL: https://source.winehq.org/git/wine.git/?a=commit;h=915ac1c197cbb100d2487cc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 23:30:46 2022 +0200 user32: Use a critical section in RegisterUserApiHook. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/hook.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 357a7fdb25a..7dddfb02638 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -100,6 +100,16 @@ struct hook_info WCHAR module[MAX_PATH]; }; +static CRITICAL_SECTION api_hook_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &api_hook_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": api_hook_cs") } +}; +static CRITICAL_SECTION api_hook_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + + #define WH_WINEVENT (WH_MAXHOOK+1) static const char * const hook_names[WH_WINEVENT - WH_MINHOOK + 1] = @@ -487,12 +497,12 @@ BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new_hook, struct use if (!new_hook) return FALSE; - USER_Lock(); + EnterCriticalSection( &api_hook_cs ); hooked_user_api = *new_hook; user_api = &hooked_user_api; if (old_hook) *old_hook = original_user_api; - USER_Unlock(); + LeaveCriticalSection( &api_hook_cs ); return TRUE; }

1 0

Nikolay Sivov : d3d11: Do not return uninitialized values on Map() failure.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: 4ecf938d6742aa194eb8d918dd148b422d362df3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ecf938d6742aa194eb8d918… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 2 16:37:05 2022 +0300 d3d11: Do not return uninitialized values on Map() failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 15 +++++++++------ dlls/d3d11/tests/d3d11.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 3f08ae5f4f0..e93cdf74518 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -799,18 +799,21 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_Map(ID3D11DeviceContext1 * if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); + mapped_subresource->pData = NULL; + if (context->type != D3D11_DEVICE_CONTEXT_IMMEDIATE && map_type != D3D11_MAP_WRITE_DISCARD && map_type != D3D11_MAP_WRITE_NO_OVERWRITE) return E_INVALIDARG; wined3d_resource = wined3d_resource_from_d3d11_resource(resource); - hr = wined3d_device_context_map(context->wined3d_context, wined3d_resource, subresource_idx, - &map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); - - mapped_subresource->pData = map_desc.data; - mapped_subresource->RowPitch = map_desc.row_pitch; - mapped_subresource->DepthPitch = map_desc.slice_pitch; + if (SUCCEEDED(hr = wined3d_device_context_map(context->wined3d_context, wined3d_resource, subresource_idx, + &map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) + { + mapped_subresource->pData = map_desc.data; + mapped_subresource->RowPitch = map_desc.row_pitch; + mapped_subresource->DepthPitch = map_desc.slice_pitch; + } return hr; } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9a1bd88dc8b..a43e2bb0cc5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14934,8 +14934,14 @@ static void test_resource_map(void) hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + mapped_subresource.pData = (void *)0xdeadbeef; + mapped_subresource.RowPitch = 0xabab; + mapped_subresource.DepthPitch = 0xcdcd; hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)buffer, 1, D3D11_MAP_READ, 0, &mapped_subresource); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!mapped_subresource.pData, "Unexpected pointer %p.\n", mapped_subresource.pData); + ok(mapped_subresource.RowPitch == 0xabab, "Unexpected row pitch value %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 0xcdcd, "Unexpected depth pitch value %u.\n", mapped_subresource.DepthPitch); memset(&mapped_subresource, 0, sizeof(mapped_subresource)); hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE, 0, &mapped_subresource); @@ -14972,8 +14978,14 @@ static void test_resource_map(void) hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, NULL, &texture2d); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + mapped_subresource.pData = (void *)0xdeadbeef; + mapped_subresource.RowPitch = 0xabab; + mapped_subresource.DepthPitch = 0xcdcd; hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture2d, 1, D3D11_MAP_READ, 0, &mapped_subresource); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!mapped_subresource.pData, "Unexpected pointer %p.\n", mapped_subresource.pData); + ok(mapped_subresource.RowPitch == 0xabab, "Unexpected row pitch value %u.\n", mapped_subresource.RowPitch); + ok(mapped_subresource.DepthPitch == 0xcdcd, "Unexpected depth pitch value %u.\n", mapped_subresource.DepthPitch); memset(&mapped_subresource, 0, sizeof(mapped_subresource)); hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)texture2d, 0, D3D11_MAP_WRITE, 0, &mapped_subresource); @@ -33285,8 +33297,14 @@ static void test_deferred_context_map(void) hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer2); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + map_desc.pData = (void *)0xdeadbeef; + map_desc.RowPitch = 0xabab; + map_desc.DepthPitch = 0xcdcd; hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)buffer, 0, D3D11_MAP_READ, 0, &map_desc); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(!map_desc.pData, "Unexpected pointer %p.\n", map_desc.pData); + ok(map_desc.RowPitch == 0xabab, "Unexpected row pitch value %u.\n", map_desc.RowPitch); + ok(map_desc.DepthPitch == 0xcdcd, "Unexpected depth pitch value %u.\n", map_desc.DepthPitch); hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)buffer, 0, D3D11_MAP_READ_WRITE, 0, &map_desc); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);

1 0

Jacek Caban : win32u: Move NtUserLockWindowUpdate implementation from user32.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: 2a3b4c9bd7062c93568bc1acb864ea714e2c9560 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a3b4c9bd7062c93568bc1ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 23:25:16 2022 +0200 win32u: Move NtUserLockWindowUpdate implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/painting.c | 43 ------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/dce.c | 17 +++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 8 files changed, 29 insertions(+), 45 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 29450e6e984..e7be362773a 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -112,49 +112,6 @@ HDC WINAPI GetWindowDC( HWND hwnd ) } -/*********************************************************************** - * LockWindowUpdate (USER32.@) - * - * Enables or disables painting in the chosen window. - * - * PARAMS - * hwnd [I] handle to a window. - * - * RETURNS - * If successful, returns nonzero value. Otherwise, - * returns 0. - * - * NOTES - * You can lock only one window at a time. - */ -BOOL WINAPI LockWindowUpdate( HWND hwnd ) -{ - static HWND lockedWnd; - - FIXME("(%p), partial stub!\n",hwnd); - - USER_Lock(); - if (lockedWnd) - { - if (!hwnd) - { - /* Unlock lockedWnd */ - /* FIXME: Do something */ - } - else - { - /* Attempted to lock a second window */ - /* Return FALSE and do nothing */ - USER_Unlock(); - return FALSE; - } - } - lockedWnd = hwnd; - USER_Unlock(); - return TRUE; -} - - /*********************************************************************** * UpdateWindow (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c153b6dbfe3..ee533305a6e 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -510,7 +510,7 @@ @ stdcall LoadStringW(long long ptr long) @ stdcall LockSetForegroundWindow (long) @ stub LockWindowStation -@ stdcall LockWindowUpdate(long) +@ stdcall LockWindowUpdate(long) NtUserLockWindowUpdate @ stdcall LockWorkStation() @ stdcall LogicalToPhysicalPoint(long ptr) @ stdcall LogicalToPhysicalPointForPerMonitorDPI(long ptr) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 62d84d7e77b..acbb213d7b7 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1574,3 +1574,20 @@ INT WINAPI NtUserExcludeUpdateRgn( HDC hdc, HWND hwnd ) NtGdiDeleteObjectApp( update_rgn ); return ret; } + +/*********************************************************************** + * NtUserLockWindowUpdate (win32u.@) + */ +BOOL WINAPI NtUserLockWindowUpdate( HWND hwnd ) +{ + static HWND locked_hwnd; + + FIXME( "(%p), partial stub!\n", hwnd ); + + if (!hwnd) + { + locked_hwnd = NULL; + return TRUE; + } + return !InterlockedCompareExchangePointer( (void **)&locked_hwnd, hwnd, 0 ); +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index a5ad95cd4b6..ac13580308d 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -150,6 +150,7 @@ static void * const syscalls[] = NtUserInitializeClientPfnArrays, NtUserInternalGetWindowText, NtUserKillTimer, + NtUserLockWindowUpdate, NtUserNotifyWinEvent, NtUserOpenDesktop, NtUserOpenInputDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 48c10fd45d3..17be6894508 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1065,7 +1065,7 @@ @ stub NtUserLoadKeyboardLayoutEx @ stub NtUserLockCursor @ stub NtUserLockWindowStation -@ stub NtUserLockWindowUpdate +@ stdcall -syscall NtUserLockWindowUpdate(long) @ stub NtUserLockWorkStation @ stub NtUserLogicalToPerMonitorDPIPhysicalPoint @ stub NtUserLogicalToPhysicalDpiPointForWindow diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index fde87498131..e30d367cda7 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -137,6 +137,7 @@ SYSCALL_ENTRY( NtUserInitializeClientPfnArrays ) \ SYSCALL_ENTRY( NtUserInternalGetWindowText ) \ SYSCALL_ENTRY( NtUserKillTimer ) \ + SYSCALL_ENTRY( NtUserLockWindowUpdate ) \ SYSCALL_ENTRY( NtUserNotifyWinEvent ) \ SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index e828dae5247..c2d134626f1 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -828,3 +828,10 @@ NTSTATUS WINAPI wow64_NtUserRemoveMenu( UINT *args ) return NtUserRemoveMenu( handle, id, flags ); } + +NTSTATUS WINAPI wow64_NtUserLockWindowUpdate( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + + return NtUserLockWindowUpdate( hwnd ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 091d34c3a5f..e0c65a9f532 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -588,6 +588,7 @@ NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs INT WINAPI NtUserInternalGetWindowText( HWND hwnd, WCHAR *text, INT count ); BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ); BOOL WINAPI NtUserKillTimer( HWND hwnd, UINT_PTR id ); +BOOL WINAPI NtUserLockWindowUpdate( HWND hwnd ); UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ); LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, void *result_info, DWORD type, BOOL ansi );

1 0

Rémi Bernon : winegstreamer: Return void from align_video_info_planes.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: 9f3eb4b7f04c0233d1e62d55c299362f2de4ca52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f3eb4b7f04c0233d1e62d55… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 7 08:35:19 2022 +0200 winegstreamer: Return void from align_video_info_planes. Some older GStreamer versions return void from gst_video_info_align. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_transform.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index fb852b4cf3d..9a5c16afe74 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -70,7 +70,7 @@ static bool is_caps_video(GstCaps *caps) return g_str_has_prefix(media_type, "video/"); } -static bool align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVideoAlignment *align) +static void align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVideoAlignment *align) { gst_video_alignment_reset(align); @@ -81,7 +81,7 @@ static bool align_video_info_planes(gsize plane_align, GstVideoInfo *info, GstVi align->stride_align[2] = plane_align; align->stride_align[3] = plane_align; - return gst_video_info_align(info, align); + gst_video_info_align(info, align); } static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -130,10 +130,11 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery break; if (!gst_video_info_from_caps(&info, caps) - || !align_video_info_planes(plane_align, &info, &align) || !(pool = gst_video_buffer_pool_new())) break; + align_video_info_planes(plane_align, &info, &align); + if ((params = gst_structure_new("video-meta", "padding-top", G_TYPE_UINT, align.padding_top, "padding-bottom", G_TYPE_UINT, align.padding_bottom, @@ -546,11 +547,8 @@ static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_alig } dst_info = src_info; - if (!align_video_info_planes(plane_align, &dst_info, &align)) - { - GST_ERROR("Failed to align video info."); - return false; - } + align_video_info_planes(plane_align, &dst_info, &align); + if (sample->max_size < dst_info.size) { GST_ERROR("Output buffer is too small."); @@ -703,9 +701,10 @@ NTSTATUS wg_transform_read_data(void *args) wg_format_from_caps(format, output_caps); if (format->major_type == WG_MAJOR_TYPE_VIDEO - && gst_video_info_from_caps(&info, output_caps) - && align_video_info_planes(plane_align, &info, &align)) + && gst_video_info_from_caps(&info, output_caps)) { + align_video_info_planes(plane_align, &info, &align); + GST_INFO("Returning video alignment left %u, top %u, right %u, bottom %u.", align.padding_left, align.padding_top, align.padding_right, align.padding_bottom);

1 0

Jacek Caban : win32u: Don't call CopyImage with user lock in NtUserRegisterClassExWOW.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: 40cda88021601c4bfc93db24ba9b6ddc4b3a5257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40cda88021601c4bfc93db24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 19:32:56 2022 +0200 win32u: Don't call CopyImage with user lock in NtUserRegisterClassExWOW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53082 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/class.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 1a6c92edc3a..320a1509a53 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -358,6 +358,7 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam { const BOOL is_builtin = fnid, ansi = flags; HINSTANCE instance; + HICON sm_icon = 0; CLASS *class; ATOM atom; BOOL ret; @@ -427,6 +428,11 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam } /* Other non-null values must be set by caller */ + if (wc->hIcon && !wc->hIconSm) + sm_icon = CopyImage( wc->hIcon, IMAGE_ICON, + get_system_metrics( SM_CXSMICON ), + get_system_metrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ); user_lock(); if (class->local) list_add_head( &class_list, &class->entry ); @@ -440,15 +446,11 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam class->hIcon = wc->hIcon; class->hIconSm = wc->hIconSm; + class->hIconSmIntern = sm_icon; class->hCursor = wc->hCursor; class->hbrBackground = wc->hbrBackground; class->winproc = alloc_winproc( wc->lpfnWndProc, ansi ); if (client_menu_name) class->menu_name = *client_menu_name; - if (wc->hIcon && !wc->hIconSm) - class->hIconSmIntern = CopyImage( wc->hIcon, IMAGE_ICON, - get_system_metrics( SM_CXSMICON ), - get_system_metrics( SM_CYSMICON ), - LR_COPYFROMRESOURCE ); release_class_ptr( class ); return atom; }

1 0

Jacek Caban : win32u: Don't call CopyImage with user lock in set_class_long.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: db8f64375654f67c59995e5f0a8f854b109cf44f URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8f64375654f67c59995e5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 21:27:58 2022 +0200 win32u: Don't call CopyImage with user lock in set_class_long. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/class.c | 62 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 320a1509a53..5af9e586e01 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -647,6 +647,7 @@ static BOOL set_server_info( HWND hwnd, INT offset, LONG_PTR newval, UINT size ) static ULONG_PTR set_class_long( HWND hwnd, INT offset, LONG_PTR newval, UINT size, BOOL ansi ) { ULONG_PTR retval = 0; + HICON small_icon = 0; CLASS *class; if (!(class = get_class_ptr( hwnd, TRUE ))) return 0; @@ -696,31 +697,62 @@ static ULONG_PTR set_class_long( HWND hwnd, INT offset, LONG_PTR newval, UINT si break; case GCLP_HICON: retval = (ULONG_PTR)class->hIcon; - if (class->hIconSmIntern) + if (retval == newval) break; + if (newval && !class->hIconSm) { - NtUserDestroyCursor( class->hIconSmIntern, 0 ); - class->hIconSmIntern = NULL; + release_class_ptr( class ); + + small_icon = CopyImage( (HICON)newval, IMAGE_ICON, + get_system_metrics( SM_CXSMICON ), + get_system_metrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ); + + if (!(class = get_class_ptr( hwnd, TRUE ))) + { + NtUserDestroyCursor( small_icon, 0 ); + return 0; + } + if (retval != HandleToUlong( class->hIcon ) || class->hIconSm) + { + /* someone beat us, restart */ + release_class_ptr( class ); + NtUserDestroyCursor( small_icon, 0 ); + return set_class_long( hwnd, offset, newval, size, ansi ); + } } - if (newval && !class->hIconSm) - class->hIconSmIntern = CopyImage( (HICON)newval, IMAGE_ICON, - get_system_metrics( SM_CXSMICON ), - get_system_metrics( SM_CYSMICON ), - LR_COPYFROMRESOURCE ); + if (class->hIconSmIntern) NtUserDestroyCursor( class->hIconSmIntern, 0 ); class->hIcon = (HICON)newval; + class->hIconSmIntern = small_icon; break; case GCLP_HICONSM: retval = (ULONG_PTR)class->hIconSm; + if (retval == newval) break; if (retval && !newval && class->hIcon) - class->hIconSmIntern = CopyImage( class->hIcon, IMAGE_ICON, - get_system_metrics( SM_CXSMICON ), - get_system_metrics( SM_CYSMICON ), - LR_COPYFROMRESOURCE ); - else if (newval && class->hIconSmIntern) { - NtUserDestroyCursor( class->hIconSmIntern, 0 ); - class->hIconSmIntern = NULL; + HICON icon = class->hIcon; + release_class_ptr( class ); + + small_icon = CopyImage( icon, IMAGE_ICON, + get_system_metrics( SM_CXSMICON ), + get_system_metrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ); + + if (!(class = get_class_ptr( hwnd, TRUE ))) + { + NtUserDestroyCursor( small_icon, 0 ); + return 0; + } + if (class->hIcon != icon || !class->hIconSm) + { + /* someone beat us, restart */ + release_class_ptr( class ); + NtUserDestroyCursor( small_icon, 0 ); + return set_class_long( hwnd, offset, newval, size, ansi ); + } } + if (class->hIconSmIntern) NtUserDestroyCursor( class->hIconSmIntern, 0 ); class->hIconSm = (HICON)newval; + class->hIconSmIntern = small_icon; break; case GCL_STYLE: if (!set_server_info( hwnd, offset, newval, size )) break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Have add_expr() return hlsl_ir_node*.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: vkd3d Branch: master Commit: 76bb1b74397084770d66b5dda2d7e968e48cb520 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=76bb1b74397084770d66b5d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 7 16:29:21 2022 -0500 vkd3d-shader/hlsl: Have add_expr() return hlsl_ir_node*. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 54 +++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=76bb1b74397084770d6…

1 0