January 2024 - Wine-Commits

Alexandre Julliard : wineandroid.drv: Return result through NtCallbackReturn for the start device callback.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: be44253c9497724f5418cf8b4dbe8637aade5884 URL: https://gitlab.winehq.org/wine/wine/-/commit/be44253c9497724f5418cf8b4dbe86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 13:43:10 2024 +0100 wineandroid.drv: Return result through NtCallbackReturn for the start device callback. --- dlls/wineandroid.drv/device.c | 3 ++- dlls/wineandroid.drv/dllmain.c | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index b8f6f97eec7..140ae82fe26 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -1177,7 +1177,8 @@ void start_android_device(void) { void *ret_ptr; ULONG ret_len; - thread = ULongToHandle( KeUserModeCallback( client_start_device, NULL, 0, &ret_ptr, &ret_len )); + KeUserModeCallback( client_start_device, NULL, 0, &ret_ptr, &ret_len ); + if (ret_len == sizeof(thread)) thread = *(HANDLE *)ret_ptr; } diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index 1045a902ae9..ceda9c5dfb2 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -34,7 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(android); extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static HANDLE stop_event; -static HANDLE thread; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -97,10 +96,10 @@ static NTSTATUS WINAPI android_start_device(void *param, ULONG size) HANDLE handles[2]; handles[0] = CreateEventW( NULL, TRUE, FALSE, NULL ); - handles[1] = thread = CreateThread( NULL, 0, device_thread, handles[0], 0, NULL ); + handles[1] = CreateThread( NULL, 0, device_thread, handles[0], 0, NULL ); WaitForMultipleObjects( 2, handles, FALSE, INFINITE ); CloseHandle( handles[0] ); - return HandleToULong( thread ); + return NtCallbackReturn( &handles[1], sizeof(handles[1]), STATUS_SUCCESS ); }

1 0

Alexandre Julliard : user32: Return a proper NTSTATUS in the load driver callback.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: d06192afe92f94f349cc09f73695930876c7d300 URL: https://gitlab.winehq.org/wine/wine/-/commit/d06192afe92f94f349cc09f7369593… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 14:23:24 2024 +0100 user32: Return a proper NTSTATUS in the load driver callback. --- dlls/user32/user_main.c | 9 +++++++-- dlls/win32u/driver.c | 3 +-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index f1b169a9741..c27e6add071 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -184,9 +184,14 @@ static NTSTATUS WINAPI User32RenderSsynthesizedFormat( const struct render_synth return 0; } -static BOOL WINAPI User32LoadDriver( const WCHAR *path, ULONG size ) +static NTSTATUS WINAPI User32LoadDriver( void *args, ULONG size ) { - return LoadLibraryW( path ) != NULL; + const WCHAR *path = args; + UNICODE_STRING str; + HMODULE module; + + RtlInitUnicodeString( &str, path ); + return LdrLoadDll( L"c:\\windows\\system32", 0, &str, &module ); } static NTSTATUS WINAPI User32UnpackDDEMessage( void *args, ULONG size ) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index fcfb7d55d54..7fcdbc4c383 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1019,8 +1019,7 @@ static BOOL load_desktop_driver( HWND hwnd ) { void *ret_ptr; ULONG ret_len; - ret = KeUserModeCallback( NtUserLoadDriver, info->Data, info->DataLength, - &ret_ptr, &ret_len ); + ret = !KeUserModeCallback( NtUserLoadDriver, info->Data, info->DataLength, &ret_ptr, &ret_len ); } else {

1 0

Alexandre Julliard : winemac.drv: Return result through NtCallbackReturn for the drag and drop callbacks.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: a5d73ae427cf7f92546f943041278d196504d26b URL: https://gitlab.winehq.org/wine/wine/-/commit/a5d73ae427cf7f92546f943041278d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 13:48:32 2024 +0100 winemac.drv: Return result through NtCallbackReturn for the drag and drop callbacks. --- dlls/winemac.drv/dllmain.c | 10 ++++++---- dlls/winemac.drv/dragdrop.c | 9 +++++---- dlls/winemac.drv/event.c | 19 ++++++++++++++++--- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c index 5917ed0906f..90fcd469eff 100644 --- a/dlls/winemac.drv/dllmain.c +++ b/dlls/winemac.drv/dllmain.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "macdrv_dll.h" #include "macdrv_res.h" #include "shellapi.h" @@ -209,7 +211,7 @@ NTSTATUS WINAPI macdrv_app_quit_request(void *arg, ULONG size) } /* quit_callback() will clean up qi */ - return 0; + return STATUS_SUCCESS; fail: WARN("failed to allocate window list\n"); @@ -219,7 +221,7 @@ fail: HeapFree(GetProcessHeap(), 0, qi); } quit_reply(FALSE); - return 0; + return STATUS_SUCCESS; } /*********************************************************************** @@ -259,13 +261,13 @@ static NTSTATUS WINAPI macdrv_app_icon(void *arg, ULONG size) if (!res_info) { WARN("found no RT_GROUP_ICON resource\n"); - return 0; + return STATUS_SUCCESS; } if (!(res_data = LoadResource(NULL, res_info))) { WARN("failed to load RT_GROUP_ICON resource\n"); - return 0; + return STATUS_SUCCESS; } if (!(icon_dir = LockResource(res_data))) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index bbf74ac80c2..a75641afd32 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -499,7 +499,7 @@ NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size) if (active_data_object) IDataObject_Release(active_data_object); active_data_object = NULL; last_droptarget_hwnd = NULL; - return ret; + return NtCallbackReturn( &ret, sizeof(ret), STATUS_SUCCESS ); } @@ -511,6 +511,7 @@ NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) struct dnd_query_exited_params *params = arg; HWND hwnd = UlongToHandle(params->hwnd); IDropTarget *droptarget; + BOOL ret = TRUE; TRACE("win %p\n", hwnd); @@ -529,8 +530,7 @@ NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) if (active_data_object) IDataObject_Release(active_data_object); active_data_object = NULL; last_droptarget_hwnd = NULL; - - return TRUE; + return NtCallbackReturn( &ret, sizeof(ret), STATUS_SUCCESS ); } @@ -643,5 +643,6 @@ NTSTATUS WINAPI macdrv_dnd_query_drag(void *arg, ULONG size) } TRACE(" -> %s\n", ret ? "TRUE" : "FALSE"); - return ret ? effect : 0; + if (!ret) effect = 0; + return NtCallbackReturn( &effect, sizeof(effect), STATUS_SUCCESS ); } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 9fbbe9d3d66..ab31c9d22c7 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -227,6 +227,8 @@ static BOOL query_drag_drop(macdrv_query *query) HWND hwnd = macdrv_get_window_hwnd(query->window); struct macdrv_win_data *data = get_win_data(hwnd); struct dnd_query_drop_params params; + void *ret_ptr; + ULONG ret_len; if (!data) { @@ -240,7 +242,9 @@ static BOOL query_drag_drop(macdrv_query *query) params.y = query->drag_drop.y + data->whole_rect.top; params.handle = (UINT_PTR)query->drag_drop.pasteboard; release_win_data(data); - return macdrv_client_func(client_func_dnd_query_drop, &params, sizeof(params)); + if (KeUserModeCallback(client_func_dnd_query_drop, &params, sizeof(params), &ret_ptr, &ret_len)) + return FALSE; + return *(BOOL *)ret_ptr; } /************************************************************************** @@ -249,8 +253,13 @@ static BOOL query_drag_drop(macdrv_query *query) static BOOL query_drag_exited(macdrv_query *query) { struct dnd_query_exited_params params; + void *ret_ptr; + ULONG ret_len; + params.hwnd = HandleToUlong(macdrv_get_window_hwnd(query->window)); - return macdrv_client_func(client_func_dnd_query_exited, &params, sizeof(params)); + if (KeUserModeCallback(client_func_dnd_query_exited, &params, sizeof(params), &ret_ptr, &ret_len)) + return FALSE; + return *(BOOL *)ret_ptr; } @@ -262,6 +271,8 @@ static BOOL query_drag_operation(macdrv_query *query) struct dnd_query_drag_params params; HWND hwnd = macdrv_get_window_hwnd(query->window); struct macdrv_win_data *data = get_win_data(hwnd); + void *ret_ptr; + ULONG ret_len; DWORD effect; if (!data) @@ -277,7 +288,9 @@ static BOOL query_drag_operation(macdrv_query *query) params.handle = (UINT_PTR)query->drag_operation.pasteboard; release_win_data(data); - effect = macdrv_client_func(client_func_dnd_query_drag, &params, sizeof(params)); + if (KeUserModeCallback(client_func_dnd_query_drag, &params, sizeof(params), &ret_ptr, &ret_len)) + return FALSE; + effect = *(DWORD *)ret_ptr; if (!effect) return FALSE; query->drag_operation.accepted_op = dropeffect_to_drag_operation(effect,

1 0

Alexandre Julliard : user32: Return a proper NTSTATUS in the post DDE message callback.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 621bcd0db27372166c1ac5f7887b04e2f8b31ada URL: https://gitlab.winehq.org/wine/wine/-/commit/621bcd0db27372166c1ac5f7887b04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 14:28:26 2024 +0100 user32: Return a proper NTSTATUS in the post DDE message callback. --- dlls/user32/message.c | 21 ++++++--------------- dlls/user32/user_private.h | 4 ++-- dlls/win32u/message.c | 16 +++++++--------- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 07dfbdb0f85..51e908d4dcd 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -333,7 +333,7 @@ static HGLOBAL dde_get_pair(HGLOBAL shm) * * Post a DDE message */ -BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ) +NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ) { void* ptr = NULL; int size = 0; @@ -344,7 +344,7 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD ULONGLONG hpack; if (!UnpackDDElParam( msg, lparam, &uiLo, &uiHi )) - return FALSE; + return STATUS_INVALID_PARAMETER; lp = lparam; switch (msg) @@ -386,9 +386,9 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD if ((msg == WM_DDE_ADVISE && size < sizeof(DDEADVISE)) || (msg == WM_DDE_DATA && size < FIELD_OFFSET(DDEDATA, Value)) || (msg == WM_DDE_POKE && size < FIELD_OFFSET(DDEPOKE, Value))) - return FALSE; + return STATUS_INVALID_PARAMETER; } - else if (msg != WM_DDE_DATA) return FALSE; + else if (msg != WM_DDE_DATA) return STATUS_INVALID_PARAMETER; lp = uiHi; if (uiLo) @@ -428,21 +428,12 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD req->lparam = lp; req->timeout = TIMEOUT_INFINITE; if (size) wine_server_add_data( req, ptr, size ); - if ((res = wine_server_call( req ))) - { - if (res == STATUS_INVALID_PARAMETER) - /* FIXME: find a STATUS_ value for this one */ - SetLastError( ERROR_INVALID_THREAD_ID ); - else - SetLastError( RtlNtStatusToDosError(res) ); - } - else - FreeDDElParam( msg, lparam ); + if (!(res = wine_server_call( req ))) FreeDDElParam( msg, lparam ); } SERVER_END_REQ; if (hunlock) GlobalUnlock(hunlock); - return !res; + return res; } /*********************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 40d67ac468d..102fee69af2 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -45,8 +45,8 @@ struct wm_char_mapping_data extern HMODULE user32_module; -extern BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, - DWORD type ); +extern NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, + DWORD type ); extern BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, const void *buffer, size_t size ); extern void free_cached_data( UINT format, HANDLE handle ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 2b6df6cc72c..21d3af8c5fc 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3299,7 +3299,8 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * params.lparam = info->lparam; params.dest_tid = info->dest_tid; params.type = info->type; - return KeUserModeCallback( NtUserPostDDEMessage, &params, sizeof(params), &ret_ptr, &ret_len ); + res = KeUserModeCallback( NtUserPostDDEMessage, &params, sizeof(params), &ret_ptr, &ret_len ); + goto done; } SERVER_START_REQ( send_message ) @@ -3315,16 +3316,13 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * if (info->flags & SMTO_ABORTIFHUNG) req->flags |= SEND_MSG_ABORT_IF_HUNG; for (i = 0; i < data.count; i++) wine_server_add_data( req, data.data[i], data.size[i] ); - if ((res = wine_server_call( req ))) - { - if (res == STATUS_INVALID_PARAMETER) - /* FIXME: find a STATUS_ value for this one */ - RtlSetLastWin32Error( ERROR_INVALID_THREAD_ID ); - else - RtlSetLastWin32Error( RtlNtStatusToDosError(res) ); - } + res = wine_server_call( req ); } SERVER_END_REQ; + +done: + if (res == STATUS_INVALID_PARAMETER) res = STATUS_NO_LDT; + if (res) RtlSetLastWin32Error( RtlNtStatusToDosError(res) ); return !res; }

1 0

Vijay Kiran Kamuju : concrt140: Add stub for _Cancellation_beacon::_Confirm_cancel().
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 05a1062f95a176b1f019ac6f51dabfa4b052ae6c URL: https://gitlab.winehq.org/wine/wine/-/commit/05a1062f95a176b1f019ac6f51dabf… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jan 17 19:44:04 2024 +0100 concrt140: Add stub for _Cancellation_beacon::_Confirm_cancel(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56174 --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 10 ++++++++++ 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 7ce3475df4e..f3a39a30599 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -450,9 +450,9 @@ @ stub -arch=win64 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPEBD0H(a)Z @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel @ cdecl ?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ() _Context__CurrentContext @ stub ?_Current_node(a)location@Concurrency@@SA?AV12(a)XZ @ stub -arch=arm ?_Destroy(a)_AsyncTaskCollection@details(a)Concurrency@@EAAXXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6a6d38db187..15ceae906c1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -507,9 +507,9 @@ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 13d7e401133..2d6798a0af2 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -504,9 +504,9 @@ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) _Cancellation_beacon__Confirm_cancel +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) _Cancellation_beacon__Confirm_cancel @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 561c3774260..02a28330b54 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -501,9 +501,9 @@ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ -@ stub -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ -@ stub -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ -@ stub -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ +@ cdecl -arch=arm ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ(ptr) msvcr120.?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ +@ thiscall -arch=i386 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ +@ cdecl -arch=win64 ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ(ptr) msvcr120.?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ @ stub -arch=arm ?_Copy_str(a)exception@std@@AAAXPBD(a)Z @ stub -arch=i386 ?_Copy_str(a)exception@std@@AAEXPBD(a)Z @ stub -arch=win64 ?_Copy_str(a)exception@std@@AEAAXPEBD(a)Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 2af2f3ff917..74bd8193476 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -3106,6 +3106,16 @@ void __thiscall _Cancellation_beacon_dtor(_Cancellation_beacon *this) free(this->beacon); } +/* ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ */ +/* ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ */ +/* ?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ */ +DEFINE_THISCALL_WRAPPER(_Cancellation_beacon__Confirm_cancel, 4) +bool __thiscall _Cancellation_beacon__Confirm_cancel(_Cancellation_beacon *this) +{ + FIXME("(%p)\n", this); + return TRUE; +} + /* ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ */ /* ??0_Condition_variable(a)details@Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(_Condition_variable_ctor, 4)

1 0

Hans Leidekker : sxs: Skip file copy when assembly is already installed.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 54c7df15bb2026f3b0247cef9a4513d61f27ccaa URL: https://gitlab.winehq.org/wine/wine/-/commit/54c7df15bb2026f3b0247cef9a4513… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 12 14:20:56 2024 +0100 sxs: Skip file copy when assembly is already installed. --- dlls/sxs/cache.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index f9ecc454550..7dd5b067573 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -598,6 +598,13 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl dst = build_manifest_filename( assembly->arch, assembly->name, assembly->token, assembly->version ); if (!dst) return E_OUTOFMEMORY; + if (GetFileAttributesW( dst ) != INVALID_FILE_ATTRIBUTES) + { + free( dst ); + TRACE("manifest exists, skipping install\n"); + return S_OK; + } + ret = CopyFileW( manifest, dst, FALSE ); free( dst ); if (!ret)

1 0

Hans Leidekker : sxs/tests: Use wide character string literals.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 72dc82c03316d07a6176fb7aebeb08ce59790e08 URL: https://gitlab.winehq.org/wine/wine/-/commit/72dc82c03316d07a6176fb7aebeb08… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 12 13:56:02 2024 +0100 sxs/tests: Use wide character string literals. --- dlls/sxs/tests/cache.c | 87 +++++++++++++------------------------------------- dlls/sxs/tests/name.c | 55 ++++++++++--------------------- 2 files changed, 39 insertions(+), 103 deletions(-)

1 0

Piotr Caban : concrt140: Add _Cancellation_beacon::_Confirm_cancel() implementation.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: bcda5979bec20702d9773d8e38737bf51da25d80 URL: https://gitlab.winehq.org/wine/wine/-/commit/bcda5979bec20702d9773d8e38737b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 18 19:56:25 2024 +0100 concrt140: Add _Cancellation_beacon::_Confirm_cancel() implementation. --- dlls/msvcr120/tests/msvcr120.c | 30 ++++++++++++++++++++++++------ dlls/msvcrt/concurrency.c | 14 ++++++++++---- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 672be695c3d..c76db6582cf 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -184,7 +184,7 @@ typedef struct _UnrealizedChore } _UnrealizedChore; typedef struct { - MSVCRT_bool *cancelling; + long *cancelling; } _Cancellation_beacon; static char* (CDECL *p_setlocale)(int category, const char* locale); @@ -262,6 +262,7 @@ static MSVCRT_bool (__thiscall *p__StructuredTaskCollection__IsCanceling)(_Struc static _Cancellation_beacon* (__thiscall *p__Cancellation_beacon_ctor)(_Cancellation_beacon*); static void (__thiscall *p__Cancellation_beacon_dtor)(_Cancellation_beacon*); +static MSVCRT_bool (__thiscall *p__Cancellation_beacon__Confirm_cancel)(_Cancellation_beacon*); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -368,6 +369,8 @@ static BOOL init(void) "??0_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ"); SET(p__Cancellation_beacon_dtor, "??1_Cancellation_beacon(a)details@Concurrency@@QEAA(a)XZ"); + SET(p__Cancellation_beacon__Confirm_cancel, + "?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QEAA_NXZ"); } else { #ifdef __arm__ SET(p__StructuredTaskCollection_ctor, @@ -416,6 +419,8 @@ static BOOL init(void) "??0_Cancellation_beacon(a)details@Concurrency@@QAA(a)XZ"); SET(p__Cancellation_beacon_dtor, "??1_Cancellation_beacon(a)details@Concurrency@@QAA(a)XZ"); + SET(p__Cancellation_beacon__Confirm_cancel, + "?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAA_NXZ"); #else SET(p__StructuredTaskCollection_ctor, "??0_StructuredTaskCollection(a)details@Concurrency@@QAE(a)PAV_CancellationTokenState@12@@Z"); @@ -463,6 +468,8 @@ static BOOL init(void) "??0_Cancellation_beacon(a)details@Concurrency@@QAE(a)XZ"); SET(p__Cancellation_beacon_dtor, "??1_Cancellation_beacon(a)details@Concurrency@@QAE(a)XZ"); + SET(p__Cancellation_beacon__Confirm_cancel, + "?_Confirm_cancel(a)_Cancellation_beacon@details(a)Concurrency@@QAE_NXZ"); #endif SET(p_Context_CurrentContext, "?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ"); @@ -1415,11 +1422,16 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) "IsCurrentTaskCollectionCanceling returned TRUE\n"); call_func1(p__Cancellation_beacon_ctor, &beacon); - ok(!*beacon.cancelling, "beacon signalled %x\n", *beacon.cancelling); + ok(!*beacon.cancelling, "beacon signalled %lx\n", *beacon.cancelling); call_func1(p__Cancellation_beacon_ctor, &beacon2); ok(beacon.cancelling != beacon2.cancelling, "beacons point to the same data\n"); - ok(!*beacon.cancelling, "beacon signalled %x\n", *beacon.cancelling); + ok(!*beacon.cancelling, "beacon signalled %lx\n", *beacon.cancelling); + + canceling = call_func1(p__Cancellation_beacon__Confirm_cancel, &beacon); + ok(!canceling, "_Confirm_cancel returned TRUE\n"); + ok(*beacon.cancelling == -1, "beacon signalled %lx\n", *beacon.cancelling); + *beacon.cancelling = 0; } if (!chore->wait_event) @@ -1448,13 +1460,19 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) ok(p_Context_IsCurrentTaskCollectionCanceling(), "IsCurrentTaskCollectionCanceling returned FALSE\n"); - ok(*beacon.cancelling == 1, "beacon not signalled (%x)\n", *beacon.cancelling); + ok(*beacon.cancelling == 1, "beacon not signalled (%lx)\n", *beacon.cancelling); + canceling = call_func1(p__Cancellation_beacon__Confirm_cancel, &beacon); + ok(canceling, "_Confirm_cancel returned FALSE\n"); + ok(*beacon.cancelling == 1, "beacon not signalled (%lx)\n", *beacon.cancelling); call_func1(p__Cancellation_beacon_dtor, &beacon); - ok(*beacon2.cancelling == 1, "beacon not signalled (%x)\n", *beacon2.cancelling); + ok(*beacon2.cancelling == 1, "beacon not signalled (%lx)\n", *beacon2.cancelling); call_func1(p__Cancellation_beacon_dtor, &beacon2); call_func1(p__Cancellation_beacon_ctor, &beacon); - ok(*beacon.cancelling == 1, "beacon not signalled (%x)\n", *beacon.cancelling); + ok(*beacon.cancelling == 1, "beacon not signalled (%lx)\n", *beacon.cancelling); + canceling = call_func1(p__Cancellation_beacon__Confirm_cancel, &beacon); + ok(canceling, "_Confirm_cancel returned FALSE\n"); + ok(*beacon.cancelling == 1, "beacon not signalled (%lx)\n", *beacon.cancelling); call_func1(p__Cancellation_beacon_dtor, &beacon); } } diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 74bd8193476..68091c21e60 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -98,7 +98,7 @@ struct scheduler_list { }; struct beacon { - bool cancelling; + LONG cancelling; struct list entry; struct _StructuredTaskCollection *task_collection; }; @@ -2143,7 +2143,7 @@ void __thiscall _StructuredTaskCollection__Cancel( EnterCriticalSection(&((ExternalContextBase*)this->context)->beacons_cs); LIST_FOR_EACH_ENTRY(beacon, &((ExternalContextBase*)this->context)->beacons, struct beacon, entry) { if (beacon->task_collection == this) - beacon->cancelling = TRUE; + InterlockedIncrement(&beacon->cancelling); } LeaveCriticalSection(&((ExternalContextBase*)this->context)->beacons_cs); @@ -3112,8 +3112,14 @@ void __thiscall _Cancellation_beacon_dtor(_Cancellation_beacon *this) DEFINE_THISCALL_WRAPPER(_Cancellation_beacon__Confirm_cancel, 4) bool __thiscall _Cancellation_beacon__Confirm_cancel(_Cancellation_beacon *this) { - FIXME("(%p)\n", this); - return TRUE; + bool ret; + + TRACE("(%p)\n", this); + + ret = Context_IsCurrentTaskCollectionCanceling(); + if (!ret) + InterlockedDecrement(&this->beacon->cancelling); + return ret; } /* ??0_Condition_variable(a)details@Concurrency@@QAE(a)XZ */

1 0

Hans Leidekker : sxs/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: b62d7e7a6607e8e88b1618e7f8590e00188250a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b62d7e7a6607e8e88b1618e7f8590e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 12 13:58:44 2024 +0100 sxs/tests: Get rid of workarounds for old Windows versions. --- dlls/sxs/tests/cache.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index dc84aebc867..6c3869e7b58 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -47,16 +47,13 @@ static void test_QueryAssemblyInfo( void ) ok( hr == E_INVALIDARG, "got %08lx\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine", NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == E_INVALIDARG) /* winxp */, "got %08lx\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ), "got %08lx\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine,version=\"1.2.3.4\"", NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08lx\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ), "got %08lx\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine,version=\"1.2.3.4\",type=\"win32\"", NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08lx\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ), "got %08lx\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, L"wine,version=\"1.2.3.4\",type=\"win32\",processorArchitecture=\"x86\"", NULL );

1 0

Hans Leidekker : sxs/tests: Update QueryAssemblyInfo() test for Windows 10.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 499fa1d9075b86937ece0811dfe3e4135bcc879a URL: https://gitlab.winehq.org/wine/wine/-/commit/499fa1d9075b86937ece0811dfe3e4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 12 14:19:01 2024 +0100 sxs/tests: Update QueryAssemblyInfo() test for Windows 10. --- dlls/sxs/tests/cache.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index 6c3869e7b58..c3b9df86518 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -33,7 +33,7 @@ static void test_QueryAssemblyInfo( void ) ASSEMBLY_INFO info; IAssemblyCache *cache = NULL; WCHAR path[MAX_PATH]; - char comctl_path1[MAX_PATH], comctl_path2[MAX_PATH], comctl_path3[MAX_PATH], comctl_path4[MAX_PATH]; + char comctl_path1[MAX_PATH], comctl_path2[MAX_PATH]; const WCHAR *comctlW; hr = CreateAssemblyCache( &cache, 0 ); @@ -65,22 +65,12 @@ static void test_QueryAssemblyInfo( void ) GetWindowsDirectoryA( comctl_path1, MAX_PATH ); lstrcatA( comctl_path1, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef" ); GetWindowsDirectoryA( comctl_path2, MAX_PATH ); - lstrcatA( comctl_path2, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.3790.4770_x-ww_05fdf087" ); - GetWindowsDirectoryA( comctl_path3, MAX_PATH ); - lstrcatA( comctl_path3, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.8250.0_none_c119e7cca62b92bd" ); - GetWindowsDirectoryA( comctl_path4, MAX_PATH ); - lstrcatA( comctl_path4, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.7601.17514_none_41e6975e2bd6f2b2" ); + lstrcatA( comctl_path2, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.19041.3636_none_a863d714867441db" ); if (GetFileAttributesA( comctl_path1 ) != INVALID_FILE_ATTRIBUTES) comctlW = L"microsoft.windows.common-controls,version=\"6.0.2600.2982\",type=\"win32\",processorArchitecture=\"x86\"," "publicKeyToken=\"6595b64144ccf1df\""; else if (GetFileAttributesA( comctl_path2 ) != INVALID_FILE_ATTRIBUTES) - comctlW = L"microsoft.windows.common-controls,version=\"6.0.3790.4770\",type=\"win32\",processorArchitecture=\"x86\"," - "publicKeyToken=\"6595b64144ccf1df\""; - else if (GetFileAttributesA( comctl_path3 ) != INVALID_FILE_ATTRIBUTES) - comctlW = L"microsoft.windows.common-controls,version=\"6.0.8250.0\",type=\"win32\",processorArchitecture=\"x86\"," - "publicKeyToken=\"6595b64144ccf1df\""; - else if (GetFileAttributesA( comctl_path4 ) != INVALID_FILE_ATTRIBUTES) - comctlW = L"microsoft.windows.common-controls,version=\"6.0.7601.17514\",type=\"win32\",processorArchitecture=\"x86\"," + comctlW = L"microsoft.windows.common-controls,version=\"6.0.19041.3636\",type=\"win32\",processorArchitecture=\"x86\"," "publicKeyToken=\"6595b64144ccf1df\""; else {

1 0