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

Jacek Caban : win32u: Use syscall interface for NtUserMsgWaitForMultipleObjectsEx.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: b3fddeb8e4fe06cded9241eee8ed87c115d0a2ef URL: https://gitlab.winehq.org/wine/wine/-/commit/b3fddeb8e4fe06cded9241eee8ed87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 15:46:39 2022 +0200 win32u: Use syscall interface for NtUserMsgWaitForMultipleObjectsEx. --- dlls/user32/user_main.c | 1 - dlls/win32u/driver.c | 8 ++------ dlls/win32u/gdiobj.c | 1 - dlls/win32u/ntuser_private.h | 1 - dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 -- dlls/win32u/wrappers.c | 7 ------- dlls/wineandroid.drv/android.h | 2 -- dlls/wineandroid.drv/dllmain.c | 1 - dlls/wineandroid.drv/init.c | 3 --- dlls/wineandroid.drv/unixlib.h | 1 - dlls/wineandroid.drv/window.c | 4 ++-- dlls/winemac.drv/dllmain.c | 1 - dlls/winemac.drv/event.c | 8 ++++---- dlls/winemac.drv/macdrv.h | 3 --- dlls/winemac.drv/macdrv_main.c | 3 --- dlls/winemac.drv/unixlib.h | 1 - dlls/winex11.drv/dllmain.c | 1 - dlls/winex11.drv/event.c | 8 ++++---- dlls/winex11.drv/unixlib.h | 1 - dlls/winex11.drv/x11drv.h | 3 --- dlls/winex11.drv/x11drv_main.c | 9 --------- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 21 +++++++++++++++++++++ 25 files changed, 36 insertions(+), 58 deletions(-)

1 0

Jacek Caban : win32u/tests: Add tests for catching exceptions from timer proc.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: 6395bf962fe55d93bc3ca599d4519daccb7ab4de URL: https://gitlab.winehq.org/wine/wine/-/commit/6395bf962fe55d93bc3ca599d4519d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 19:51:53 2022 +0200 win32u/tests: Add tests for catching exceptions from timer proc. We currently depend on default behaviour of suppressing exceptions from client callbacks. If we change it to fail by default, we will need a separated filter for NtUserDispatchMessage. --- dlls/win32u/tests/win32u.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 07179e6cdb9..0985478b2f0 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -632,6 +632,50 @@ static void test_message_filter(void) ok( ret, "NtUserUnhookWindowsHook failed: %lu\n", GetLastError() ); } +static char calls[128]; + +static void WINAPI timer_func( HWND hwnd, UINT msg, UINT_PTR id, DWORD time ) +{ + sprintf( calls + strlen( calls ), "timer%Iu,", id ); + NtUserKillTimer( hwnd, id ); + + if (!id) + { + MSG msg; + NtUserSetTimer( hwnd, 1, 1, timer_func, TIMERV_DEFAULT_COALESCING ); + while (GetMessageW( &msg, NULL, 0, 0 )) + { + TranslateMessage( &msg ); + NtUserDispatchMessage( &msg ); + if (msg.message == WM_TIMER) break; + } + } + + strcat( calls, "crash," ); + *(volatile int *)0 = 0; +} + +static void test_timer(void) +{ + HWND hwnd; + MSG msg; + + hwnd = CreateWindowExA( 0, "static", NULL, WS_POPUP, 0,0,0,0,0,0,0, NULL ); + + NtUserSetTimer( hwnd, 0, 1, timer_func, TIMERV_DEFAULT_COALESCING ); + + calls[0] = 0; + while (GetMessageW( &msg, NULL, 0, 0 )) + { + TranslateMessage( &msg ); + NtUserDispatchMessage( &msg ); + if (msg.message == WM_TIMER) break; + } + + ok( !strcmp( calls, "timer0,timer1,crash,crash," ), "calls = %s\n", calls ); + DestroyWindow( hwnd ); +} + START_TEST(win32u) { /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ @@ -646,6 +690,7 @@ START_TEST(win32u) test_window_text(); test_menu(); test_message_filter(); + test_timer(); test_NtUserCloseWindowStation(); }

1 0

Jacek Caban : win32u: Avoid using client callbacks for NtUserSendMessage.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: c1c57bd75014d660abbe456d926320e80b088d67 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1c57bd75014d660abbe456d926320… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 19:19:56 2022 +0200 win32u: Avoid using client callbacks for NtUserSendMessage. --- dlls/user32/message.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/win32u/hook.c | 2 +- dlls/win32u/message.c | 26 +++++++++++++++++++++++--- dlls/win32u/tests/win32u.c | 4 ++-- dlls/win32u/win32u_private.h | 1 + 5 files changed, 64 insertions(+), 8 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 40babb71eba..71c0f339b54 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -597,12 +597,41 @@ LRESULT WINAPI SendMessageTimeoutA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l } +static LRESULT dispatch_send_message( struct win_proc_params *params ) +{ + struct user_thread_info *thread_info = get_user_thread_info(); + INPUT_MESSAGE_SOURCE prev_source = thread_info->msg_source; + LRESULT retval = 0; + + static const INPUT_MESSAGE_SOURCE msg_source_unavailable = { IMDT_UNAVAILABLE, IMO_UNAVAILABLE }; + + thread_info->recursion_count++; + + params->result = &retval; + thread_info->msg_source = msg_source_unavailable; + SPY_EnterMessage( SPY_SENDMESSAGE, params->hwnd, params->msg, params->wparam, params->lparam ); + + dispatch_win_proc_params( params ); + + SPY_ExitMessage( SPY_RESULT_OK, params->hwnd, params->msg, retval, params->wparam, params->lparam ); + thread_info->msg_source = prev_source; + thread_info->recursion_count--; + return retval; +} + + /*********************************************************************** * SendMessageW (USER32.@) */ LRESULT WINAPI SendMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - return NtUserMessageCall( hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, FALSE ); + struct win_proc_params params; + LRESULT retval; + + params.hwnd = 0; + retval = NtUserMessageCall( hwnd, msg, wparam, lparam, &params, NtUserSendMessage, FALSE ); + if (params.hwnd) retval = dispatch_send_message( &params ); + return retval; } @@ -611,6 +640,9 @@ LRESULT WINAPI SendMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) */ LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { + struct win_proc_params params; + LRESULT retval; + if (msg == WM_CHAR && !WIN_IsCurrentThread( hwnd )) { if (!map_wparam_AtoW( msg, &wparam, WMCHAR_MAP_SENDMESSAGE )) @@ -618,7 +650,10 @@ LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) return NtUserMessageCall( hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, FALSE ); } - return NtUserMessageCall( hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, TRUE ); + params.hwnd = 0; + retval = NtUserMessageCall( hwnd, msg, wparam, lparam, &params, NtUserSendMessage, TRUE ); + if (params.hwnd) retval = dispatch_send_message( &params ); + return retval; } diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index a271693622a..dcf2bb9f865 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -60,7 +60,7 @@ static const char *debugstr_hook_id( unsigned int id ) return hook_names[id - WH_MINHOOK]; } -static BOOL is_hooked( INT id ) +BOOL is_hooked( INT id ) { struct user_thread_info *thread_info = get_user_thread_info(); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 49dc3fd6d08..1b9585c4178 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -109,6 +109,7 @@ struct send_message_info SENDASYNCPROC callback; /* callback function for SendMessageCallback */ ULONG_PTR data; /* callback data */ enum wm_char_mapping wm_char; + struct win_proc_params *params; }; static const INPUT_MESSAGE_SOURCE msg_source_unavailable = { IMDT_UNAVAILABLE, IMO_UNAVAILABLE }; @@ -2374,6 +2375,7 @@ LRESULT send_internal_message_timeout( DWORD dest_pid, DWORD dest_tid, info.lparam = lparam; info.flags = flags; info.timeout = timeout; + info.params = NULL; ret = send_inter_thread_message( &info, &result ); } @@ -2399,6 +2401,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r info.hwnd = hwnd; info.flags = 0; info.timeout = 0; + info.params = NULL; if (input->type == INPUT_HARDWARE && rawinput->header.dwType == RIM_TYPEHID) { @@ -2635,6 +2638,16 @@ static BOOL process_message( struct send_message_info *info, DWORD_PTR *res_ptr, if (!(info->dest_tid = get_window_thread( info->hwnd, &dest_pid ))) return FALSE; if (is_exiting_thread( info->dest_tid )) return FALSE; + if (info->params && info->dest_tid == GetCurrentThreadId() && + !is_hooked( WH_CALLWNDPROC ) && !is_hooked( WH_CALLWNDPROCRET ) && + thread_info->recursion_count <= MAX_WINPROC_RECURSION) + { + /* if we're called from client side and need just a simple winproc call, + * just fill dispatch params and let user32 do the rest */ + return init_window_call_params( info->params, info->hwnd, info->msg, info->wparam, info->lparam, + NULL, ansi, info->wm_char ); + } + thread_info->msg_source = msg_source_unavailable; spy_enter_message( SPY_SENDMESSAGE, info->hwnd, info->msg, info->wparam, info->lparam ); @@ -2755,7 +2768,8 @@ BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) return ret; } -static LRESULT send_window_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) +static LRESULT send_window_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, + struct win_proc_params *client_params, BOOL ansi ) { struct send_message_info info; DWORD_PTR res = 0; @@ -2768,6 +2782,7 @@ static LRESULT send_window_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l info.flags = SMTO_NORMAL; info.timeout = 0; info.wm_char = WMCHAR_MAP_SENDMESSAGETIMEOUT; + info.params = client_params; process_message( &info, &res, ansi ); return res; @@ -2787,6 +2802,7 @@ LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, info.flags = flags; info.timeout = timeout; info.wm_char = WMCHAR_MAP_SENDMESSAGETIMEOUT; + info.params = NULL; return process_message( &info, res_ptr, ansi ); } @@ -2794,7 +2810,7 @@ LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, /* see SendMessageW */ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - return send_window_message( hwnd, msg, wparam, lparam, FALSE ); + return send_window_message( hwnd, msg, wparam, lparam, NULL, FALSE ); } /* see SendNotifyMessageW */ @@ -2815,6 +2831,7 @@ static BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar info.lparam = lparam; info.flags = 0; info.wm_char = WMCHAR_MAP_SENDMESSAGETIMEOUT; + info.params = NULL; return process_message( &info, NULL, ansi ); } @@ -2840,6 +2857,7 @@ static BOOL send_message_callback( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp info.data = params->data; info.flags = 0; info.wm_char = WMCHAR_MAP_SENDMESSAGETIMEOUT; + info.params = NULL; return process_message( &info, NULL, ansi ); } @@ -2866,6 +2884,7 @@ BOOL WINAPI NtUserPostMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam info.wparam = wparam; info.lparam = lparam; info.flags = 0; + info.params = NULL; if (is_broadcast(hwnd)) return broadcast_message( &info, NULL ); @@ -2899,6 +2918,7 @@ BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPAR info.wparam = wparam; info.lparam = lparam; info.flags = 0; + info.params = NULL; return put_message_in_queue( &info, NULL ); } @@ -2924,7 +2944,7 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa wparam, lparam, ansi ); case NtUserSendMessage: - return send_window_message( hwnd, msg, wparam, lparam, ansi ); + return send_window_message( hwnd, msg, wparam, lparam, result_info, ansi ); case NtUserSendMessageTimeout: { diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index dc1638f37ab..07179e6cdb9 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -425,10 +425,10 @@ static void test_message_call(void) hwnd = CreateWindowExW( 0, L"TestClass", NULL, WS_POPUP, 0,0,0,0,0,0,0, NULL ); - res = NtUserMessageCall( hwnd, WM_USER, 1, 2, (void *)0xdeadbeef, NtUserSendMessage, FALSE ); + res = NtUserMessageCall( hwnd, WM_USER, 1, 2, NULL, NtUserSendMessage, FALSE ); ok( res == 3, "res = %Iu\n", res ); - res = NtUserMessageCall( hwnd, WM_USER, 1, 2, (void *)0xdeadbeef, NtUserSendMessage, TRUE ); + res = NtUserMessageCall( hwnd, WM_USER, 1, 2, NULL, NtUserSendMessage, TRUE ); ok( res == 3, "res = %Iu\n", res ); res = NtUserMessageCall( hwnd, WM_SETTEXT, 0, (LPARAM)L"test", NULL, NtUserSendMessage, FALSE ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index a7f0624fdba..914a02ffd52 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -391,6 +391,7 @@ extern LRESULT handle_nc_hit_test( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; /* hook.c */ extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern LRESULT call_hooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN; +extern BOOL is_hooked( INT id ) DECLSPEC_HIDDEN; extern BOOL unhook_windows_hook( INT id, HOOKPROC proc ) DECLSPEC_HIDDEN; /* imm.c */

1 0

Jacek Caban : ntdll: Suppress callback exceptions in KiUserCallbackDispatcher.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: 079179fec720780679db3eed90adcc257f4ff240 URL: https://gitlab.winehq.org/wine/wine/-/commit/079179fec720780679db3eed90adcc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 19:42:26 2022 +0200 ntdll: Suppress callback exceptions in KiUserCallbackDispatcher. --- dlls/ntdll/signal_arm.c | 16 ++++++++++++++-- dlls/ntdll/signal_arm64.c | 16 ++++++++++++++-- dlls/ntdll/signal_i386.c | 16 ++++++++++++++-- dlls/ntdll/signal_x86_64.c | 16 ++++++++++++++-- dlls/ntdll/unix/signal_arm.c | 3 +++ dlls/ntdll/unix/signal_arm64.c | 3 +++ dlls/ntdll/unix/signal_i386.c | 3 +++ dlls/ntdll/unix/signal_x86_64.c | 3 +++ 8 files changed, 68 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index d0229d934ce..c3674487277 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -533,9 +533,21 @@ void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1 */ void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) { - NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + NTSTATUS status; + + __TRY + { + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + status = NtCallbackReturn( NULL, 0, func( args, len )); + } + __EXCEPT_ALL + { + ERR_(seh)( "ignoring exception\n" ); + status = NtCallbackReturn( 0, 0, 0 ); + } + __ENDTRY - RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); + RtlRaiseStatus( status ); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 959c3ea50dc..ee3204ebce8 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -576,9 +576,21 @@ void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg */ void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) { - NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + NTSTATUS status; + + __TRY + { + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + status = NtCallbackReturn( NULL, 0, func( args, len )); + } + __EXCEPT_ALL + { + ERR_(seh)( "ignoring exception\n" ); + status = NtCallbackReturn( 0, 0, 0 ); + } + __ENDTRY - RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); + RtlRaiseStatus( status ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f4c935ecc94..ae065f8c37b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -257,9 +257,21 @@ void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1 */ void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) { - NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + NTSTATUS status; + + __TRY + { + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + status = NtCallbackReturn( NULL, 0, func( args, len )); + } + __EXCEPT_ALL + { + ERR_(seh)( "ignoring exception\n" ); + status = NtCallbackReturn( 0, 0, 0 ); + } + __ENDTRY - RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); + RtlRaiseStatus( status ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 9957d0c3dfa..b1ab4933b93 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -661,9 +661,21 @@ __ASM_GLOBAL_FUNC( KiUserApcDispatcher, */ void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) { - NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + NTSTATUS status; + + __TRY + { + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + status = NtCallbackReturn( NULL, 0, func( args, len )); + } + __EXCEPT_ALL + { + ERR_(seh)( "ignoring exception\n" ); + status = NtCallbackReturn( 0, 0, 0 ); + } + __ENDTRY - RtlRaiseStatus( NtCallbackReturn( NULL, 0, func( args, len ))); + RtlRaiseStatus( status ); } diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 73843ba56a6..5d1478a1ff4 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -721,6 +721,7 @@ struct user_callback_frame ULONG *ret_len; __wine_jmp_buf jmpbuf; NTSTATUS status; + void *teb_frame; }; /*********************************************************************** @@ -756,6 +757,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.restore_flags = CONTEXT_INTEGER; callback_frame.frame.syscall_table = frame->syscall_table; callback_frame.frame.prev_frame = frame; + callback_frame.teb_frame = NtCurrentTeb()->Tib.ExceptionList; arm_thread_data()->syscall_frame = &callback_frame.frame; __wine_syscall_dispatcher_return( &callback_frame.frame, 0 ); @@ -777,6 +779,7 @@ NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status *frame->ret_len = ret_len; frame->status = status; arm_thread_data()->syscall_frame = frame->frame.prev_frame; + NtCurrentTeb()->Tib.ExceptionList = frame->teb_frame; __wine_longjmp( &frame->jmpbuf, 1 ); } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 10543322a8f..4e552e0f10a 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -730,6 +730,7 @@ struct user_callback_frame ULONG *ret_len; __wine_jmp_buf jmpbuf; NTSTATUS status; + void *teb_frame; }; /*********************************************************************** @@ -766,6 +767,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.restore_flags = CONTEXT_INTEGER; callback_frame.frame.syscall_table = frame->syscall_table; callback_frame.frame.prev_frame = frame; + callback_frame.teb_frame = NtCurrentTeb()->Tib.ExceptionList; arm64_thread_data()->syscall_frame = &callback_frame.frame; __wine_syscall_dispatcher_return( &callback_frame.frame, 0 ); @@ -787,6 +789,7 @@ NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status *frame->ret_len = ret_len; frame->status = status; arm64_thread_data()->syscall_frame = frame->frame.prev_frame; + NtCurrentTeb()->Tib.ExceptionList = frame->teb_frame; __wine_longjmp( &frame->jmpbuf, 1 ); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 5ddef2701c4..2dfce706394 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1575,6 +1575,7 @@ struct user_callback_frame ULONG *ret_len; __wine_jmp_buf jmpbuf; NTSTATUS status; + void *teb_frame; }; /*********************************************************************** @@ -1614,6 +1615,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.syscall_flags = frame->syscall_flags; callback_frame.frame.syscall_table = frame->syscall_table; callback_frame.frame.prev_frame = frame; + callback_frame.teb_frame = NtCurrentTeb()->Tib.ExceptionList; x86_thread_data()->syscall_frame = &callback_frame.frame; __wine_syscall_dispatcher_return( &callback_frame.frame, 0 ); @@ -1635,6 +1637,7 @@ NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status *frame->ret_len = ret_len; frame->status = status; x86_thread_data()->syscall_frame = frame->frame.prev_frame; + NtCurrentTeb()->Tib.ExceptionList = frame->teb_frame; __wine_longjmp( &frame->jmpbuf, 1 ); } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9b7a19bce72..d6f19dbfa84 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2327,6 +2327,7 @@ struct user_callback_frame ULONG *ret_len; __wine_jmp_buf jmpbuf; NTSTATUS status; + void *teb_frame; }; /*********************************************************************** @@ -2368,6 +2369,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.prev_frame = frame; callback_frame.frame.syscall_flags = frame->syscall_flags; callback_frame.frame.syscall_table = frame->syscall_table; + callback_frame.teb_frame = NtCurrentTeb()->Tib.ExceptionList; amd64_thread_data()->syscall_frame = &callback_frame.frame; __wine_syscall_dispatcher_return( &callback_frame.frame, 0 ); @@ -2389,6 +2391,7 @@ NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status *frame->ret_len = ret_len; frame->status = status; amd64_thread_data()->syscall_frame = frame->frame.prev_frame; + NtCurrentTeb()->Tib.ExceptionList = frame->teb_frame; __wine_longjmp( &frame->jmpbuf, 1 ); }

1 0

Jacek Caban : win32u: Use syscall interface for NtUserDispatchMessage.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: 1e5d4e94229201b66f62a89138bf6c654e91f335 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e5d4e94229201b66f62a89138bf6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 17:19:02 2022 +0200 win32u: Use syscall interface for NtUserDispatchMessage. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/message.c | 10 +--------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 +++++++++- 8 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index fddaf898761..e5c2c185511 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1158,7 +1158,6 @@ static struct unix_funcs unix_funcs = NtUserDestroyMenu, NtUserDestroyWindow, NtUserDisableThreadIme, - NtUserDispatchMessage, NtUserDragDetect, NtUserDrawCaptionTemp, NtUserDrawIconEx, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 1b9585c4178..7045aedb4b1 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2514,15 +2514,7 @@ LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) if (!init_win_proc_params( &params, msg->hwnd, msg->message, msg->wParam, NtGetTickCount(), FALSE )) return 0; - __TRY - { - dispatch_win_proc_params( &params, sizeof(params) ); - } - __EXCEPT - { - retval = 0; - } - __ENDTRY + dispatch_win_proc_params( &params, sizeof(params) ); return retval; } if (msg->message == WM_SYSTIMER) diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index f5508f62d16..a7e18158fb5 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -117,6 +117,7 @@ static void * const syscalls[] = NtUserDeleteMenu, NtUserDestroyAcceleratorTable, NtUserDestroyInputContext, + NtUserDispatchMessage, NtUserEndMenu, NtUserFindExistingCursorIcon, NtUserFindWindowEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index d74685ad603..7ec96eedfcf 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -839,7 +839,7 @@ @ stub NtUserDisableProcessWindowFiltering @ stdcall NtUserDisableThreadIme(long) @ stub NtUserDiscardPointerFrameMessages -@ stdcall NtUserDispatchMessage(ptr) +@ stdcall -syscall NtUserDispatchMessage(ptr) @ stub NtUserDisplayConfigGetDeviceInfo @ stub NtUserDisplayConfigSetDeviceInfo @ stub NtUserDoSoundConnect diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 914a02ffd52..d5b3e0fdda8 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -215,7 +215,6 @@ struct unix_funcs BOOL (WINAPI *pNtUserDestroyMenu)( HMENU handle ); BOOL (WINAPI *pNtUserDestroyWindow)( HWND hwnd ); BOOL (WINAPI *pNtUserDisableThreadIme)( DWORD thread_id ); - LRESULT (WINAPI *pNtUserDispatchMessage)( const MSG *msg ); BOOL (WINAPI *pNtUserDragDetect)( HWND hwnd, int x, int y ); BOOL (WINAPI *pNtUserDrawCaptionTemp)( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 609e893403b..9c2264e887e 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -855,12 +855,6 @@ BOOL WINAPI NtUserDisableThreadIme( DWORD thread_id ) return unix_funcs->pNtUserDisableThreadIme( thread_id ); } -LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserDispatchMessage( msg ); -} - BOOL WINAPI NtUserDragDetect( HWND hwnd, int x, int y ) { if (!unix_funcs) return FALSE; diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 005037d71a5..3842eb3c1da 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -104,6 +104,7 @@ SYSCALL_ENTRY( NtUserDeleteMenu ) \ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserDestroyInputContext ) \ + SYSCALL_ENTRY( NtUserDispatchMessage ) \ SYSCALL_ENTRY( NtUserEndMenu ) \ SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \ SYSCALL_ENTRY( NtUserFindWindowEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 386458ccf0c..7ca1e87109d 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -78,7 +78,7 @@ typedef struct DWORD dwType; } RAWINPUTDEVICELIST32; -static MSG *msg_32to64( MSG *msg, MSG32 *msg32 ) +static MSG *msg_32to64( MSG *msg, const MSG32 *msg32 ) { if (!msg32) return NULL; @@ -281,6 +281,14 @@ NTSTATUS WINAPI wow64_NtUserDestroyInputContext( UINT *args ) return NtUserDestroyInputContext( handle ); } +NTSTATUS WINAPI wow64_NtUserDispatchMessage( UINT *args ) +{ + const MSG32 *msg32 = get_ptr( &args ); + MSG msg; + + return NtUserDispatchMessage( msg_32to64( &msg, msg32 )); +} + NTSTATUS WINAPI wow64_NtUserEndMenu( UINT *args ) { return NtUserEndMenu();

1 0

Hugh McMaster : regedit: Use 'struct edit_params' with read_value().
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: 97f10736db6fc9c58ed181b3f23534513d6f9e13 URL: https://gitlab.winehq.org/wine/wine/-/commit/97f10736db6fc9c58ed181b3f23534… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 21 18:50:36 2022 +1000 regedit: Use 'struct edit_params' with read_value(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 136 ++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 69 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 27251420dde..44ef45993fd 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -30,7 +30,6 @@ #include "main.h" static const WCHAR* editValueName; -static WCHAR* stringValueData; static BOOL isDecimal; struct edit_params @@ -267,39 +266,42 @@ static INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wP return FALSE; } -static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, LONG *len) +static BOOL read_value(HWND hwnd, struct edit_params *params) { - DWORD valueDataLen; - LPWSTR buffer = NULL; - LONG lRet; + LONG ret; + WCHAR *buf = NULL; - lRet = RegQueryValueExW(hKey, valueName, NULL, lpType, NULL, &valueDataLen); - if (lRet) { - if (lRet == ERROR_FILE_NOT_FOUND && !valueName) { /* no default value here, make it up */ - if (len) *len = 1; - if (lpType) *lpType = REG_SZ; - buffer = malloc(sizeof(WCHAR)); - *buffer = '\0'; - return buffer; + if ((ret = RegQueryValueExW(params->hkey, params->value_name, NULL, &params->type, NULL, &params->size))) + { + if (ret == ERROR_FILE_NOT_FOUND && !params->value_name) + { + params->type = REG_SZ; + params->size = sizeof(WCHAR); + params->data = malloc(params->size); + *(WCHAR *)params->data = 0; + return TRUE; } - error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); - goto done; - } - buffer = malloc(valueDataLen + sizeof(WCHAR)); - lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen); - if (lRet) { - error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); - goto done; + goto error; } - if((valueDataLen % sizeof(WCHAR)) == 0) - buffer[valueDataLen / sizeof(WCHAR)] = 0; - if(len) *len = valueDataLen; - return buffer; -done: - free(buffer); - return NULL; + buf = malloc(params->size + sizeof(WCHAR)); + + if (RegQueryValueExW(params->hkey, params->value_name, NULL, &params->type, (BYTE *)buf, &params->size)) + goto error; + + if (params->size % sizeof(WCHAR) == 0) + buf[params->size / sizeof(WCHAR)] = 0; + + params->data = buf; + + return TRUE; + +error: + error_code_messagebox(hwnd, IDS_BAD_VALUE, params->value_name); + free(buf); + params->data = NULL; + return FALSE; } BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) @@ -383,27 +385,24 @@ static void format_dlgproc_string(struct edit_params *params) BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { - HKEY hKey; - DWORD type; - LONG lRet; - LONG len; struct edit_params params; BOOL result = FALSE; - lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet) { + editValueName = valueName ? valueName : g_pszDefaultValueName; + + if (RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &params.hkey)) + { error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); - return FALSE; + return FALSE; } - editValueName = valueName ? valueName : g_pszDefaultValueName; - if(!(stringValueData = read_value(hwnd, hKey, valueName, &type, &len))) goto done; - - params.hkey = hKey; params.value_name = valueName; - params.type = type; - params.data = stringValueData; - params.size = len; + + if (!read_value(hwnd, &params)) + { + RegCloseKey(params.hkey); + return FALSE; + } switch (params.type) { @@ -433,15 +432,13 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); - free(stringValueData); - stringValueData = read_value(hwnd, hKey, valueName, &type, &len); - format_value_data(g_pChildWnd->hListWnd, index, type, stringValueData, len); + + read_value(hwnd, &params); + format_value_data(g_pChildWnd->hListWnd, index, params.type, params.data, params.size); } -done: - free(stringValueData); - stringValueData = NULL; - RegCloseKey(hKey); + free(params.data); + RegCloseKey(params.hkey); return result; } @@ -564,47 +561,48 @@ done: BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName) { - LPWSTR value = NULL; - DWORD type; - LONG len, lRet; + struct edit_params params; BOOL result = FALSE; - HKEY hKey; if (!oldName) return FALSE; if (!newName) return FALSE; - lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); - if (lRet) { + if (RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &params.hkey)) + { error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); - return FALSE; + return FALSE; } - if (!RegQueryValueExW(hKey, newName, NULL, NULL, NULL, NULL)) { + if (!RegQueryValueExW(params.hkey, newName, NULL, NULL, NULL, NULL)) + { error_code_messagebox(hwnd, IDS_VALUE_EXISTS, oldName); goto done; } - value = read_value(hwnd, hKey, oldName, &type, &len); - if(!value) goto done; - lRet = RegSetValueExW(hKey, newName, 0, type, (BYTE*)value, len); - if (lRet) { + + params.value_name = oldName; + if (!read_value(hwnd, &params)) goto done; + + if (RegSetValueExW(params.hkey, newName, 0, params.type, (BYTE *)params.data, params.size)) + { error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); - goto done; + goto done; } - lRet = RegDeleteValueW(hKey, oldName); - if (lRet) { - RegDeleteValueW(hKey, newName); + + if (RegDeleteValueW(params.hkey, oldName)) + { + RegDeleteValueW(params.hkey, newName); error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); - goto done; + goto done; } + result = TRUE; done: - free(value); - RegCloseKey(hKey); + free(params.data); + RegCloseKey(params.hkey); return result; } - BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) { LPWSTR parentPath = 0;

1 0

Hugh McMaster : regedit: Pass updated REG_SZ and REG_EXPAND_SZ data via 'struct edit_params'.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: 72fced02366d2897f8235656cc63ec31a6c9f386 URL: https://gitlab.winehq.org/wine/wine/-/commit/72fced02366d2897f8235656cc63ec… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 11 21:39:32 2022 +1000 regedit: Pass updated REG_SZ and REG_EXPAND_SZ data via 'struct edit_params'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/edit.c | 64 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index d668425b137..e0d9d388bea 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -81,29 +81,53 @@ static void WINAPIV error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) va_end(ap); } -static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) +static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) { HWND hwndValue; unsigned int len; + WCHAR *buf; + LONG ret; + + hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); + len = GetWindowTextLengthW(hwndValue); + buf = malloc((len + 1) * sizeof(WCHAR)); + len = GetWindowTextW(hwndValue, buf, len + 1); + + free(params->data); + params->data = buf; + params->size = (len + 1) * sizeof(WCHAR); + + ret = RegSetValueExW(params->hkey, params->value_name, 0, params->type, (BYTE *)params->data, params->size); + if (ret) error_code_messagebox(hwndDlg, IDS_SET_VALUE_FAILED); + + free(params->data); + params->data = NULL; + + return !ret; +} + +static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + struct edit_params *params; + int ret = 0; switch (msg) { case WM_INITDIALOG: + params = (struct edit_params *)lparam; + SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); - SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, stringValueData); + SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, params->data); return TRUE; case WM_COMMAND: switch (LOWORD(wparam)) { case IDOK: - hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); - len = GetWindowTextLengthW(hwndValue); - stringValueData = realloc(stringValueData, (len + 1) * sizeof(WCHAR)); - if (!GetWindowTextW(hwndValue, stringValueData, len + 1)) - *stringValueData = 0; + params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + ret = update_registry_value(hwndDlg, params); /* fall through */ case IDCANCEL: - EndDialog(hwndDlg, wparam); + EndDialog(hwndDlg, ret); return TRUE; } } @@ -281,11 +305,12 @@ done: BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) { - BOOL result = FALSE; + HKEY hKey; DWORD type; LONG lRet; - HKEY hKey; LONG len; + struct edit_params params; + BOOL result = FALSE; lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet) { @@ -296,12 +321,14 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) editValueName = valueName ? valueName : g_pszDefaultValueName; if(!(stringValueData = read_value(hwnd, hKey, valueName, &type, &len))) goto done; + params.hkey = hKey; + params.value_name = valueName; + params.type = type; + params.data = stringValueData; + params.size = len; + if ( (type == REG_SZ) || (type == REG_EXPAND_SZ) ) { - if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_string_dlgproc) == IDOK) { - lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, (lstrlenW(stringValueData) + 1) * sizeof(WCHAR)); - if (lRet == ERROR_SUCCESS) result = TRUE; - else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); - } + result = DialogBoxParamW(0, MAKEINTRESOURCEW(IDD_EDIT_STRING), hwnd, modify_string_dlgproc, (LPARAM)&params); } else if ( type == REG_DWORD ) { DWORD value = *((DWORD*)stringValueData); stringValueData = realloc(stringValueData, 64); @@ -383,13 +410,6 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) } else /* hex data types */ { - struct edit_params params; - - params.hkey = hKey; - params.value_name = valueName; - params.type = type; - params.data = stringValueData; - params.size = len; result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, bin_modify_dlgproc, (LPARAM)&params); }

1 0

Jacek Caban : win32u: Remove no longer needed NtUserDispatchMessageA.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: 2ef6a6eee67cc3fb5b81e9dc4594bee40e908332 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ef6a6eee67cc3fb5b81e9dc4594be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:42:49 2022 +0200 win32u: Remove no longer needed NtUserDispatchMessageA. --- dlls/user32/message.c | 2 +- dlls/win32u/message.c | 16 ++++------------ dlls/win32u/sysparams.c | 3 --- dlls/win32u/win32u_private.h | 1 - include/ntuser.h | 6 ------ 5 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index f72d837ac94..40babb71eba 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -877,7 +877,7 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) if (msg->message != WM_SYSTIMER && msg->message != WM_PAINT) return dispatch_message( msg, TRUE ); - return NtUserDispatchMessageA( msg ); + return NtUserDispatchMessage( msg ); } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 50bce801339..49dc3fd6d08 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2496,9 +2496,9 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r } /********************************************************************** - * dispatch_message + * NtUserDispatchMessage (win32u.@) */ -LRESULT dispatch_message( const MSG *msg, BOOL ansi ) +LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) { struct win_proc_params params; LRESULT retval = 0; @@ -2509,7 +2509,7 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi ) params.func = (WNDPROC)msg->lParam; params.result = &retval; /* FIXME */ if (!init_win_proc_params( &params, msg->hwnd, msg->message, - msg->wParam, NtGetTickCount(), ansi )) + msg->wParam, NtGetTickCount(), FALSE )) return 0; __TRY { @@ -2541,7 +2541,7 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi ) spy_enter_message( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, msg->wParam, msg->lParam ); if (init_window_call_params( &params, msg->hwnd, msg->message, msg->wParam, msg->lParam, - &retval, ansi, WMCHAR_MAP_DISPATCHMESSAGE )) + &retval, FALSE, WMCHAR_MAP_DISPATCHMESSAGE )) dispatch_win_proc_params( &params, sizeof(params) ); else if (!is_window( msg->hwnd )) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); else SetLastError( ERROR_MESSAGE_SYNC_ONLY ); @@ -2558,14 +2558,6 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi ) return retval; } -/********************************************************************** - * NtUserDispatchMessage (win32u.@) - */ -LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) -{ - return dispatch_message( msg, FALSE ); -} - static BOOL is_message_broadcastable( UINT msg ) { return msg < WM_USER || msg >= 0xc000; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 2c1f8f4241f..e8b55616f6a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4880,9 +4880,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_CreateMenu: return HandleToUlong( create_menu( arg ) ); - case NtUserCallOneParam_DispatchMessageA: - return dispatch_message( (const MSG *)arg, TRUE ); - case NtUserCallOneParam_EnableDC: return set_dce_flags( UlongToHandle(arg), DCHF_ENABLEDC ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index a0b3e8c2e9e..a7f0624fdba 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -436,7 +436,6 @@ extern void track_keyboard_menu_bar( HWND hwnd, UINT wparam, WCHAR ch ) DECLSPEC extern void track_mouse_menu_bar( HWND hwnd, INT ht, int x, int y ) DECLSPEC_HIDDEN; /* message.c */ -extern LRESULT dispatch_message( const MSG *msg, BOOL ansi ) DECLSPEC_HIDDEN; extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN; extern BOOL reply_message_result( LRESULT result, MSG *msg ) DECLSPEC_HIDDEN; extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput, diff --git a/include/ntuser.h b/include/ntuser.h index b0ebfbfcf5f..67058defb6f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -902,7 +902,6 @@ enum NtUserCallOneParam_BeginDeferWindowPos, NtUserCallOneParam_CreateCursorIcon, NtUserCallOneParam_CreateMenu, - NtUserCallOneParam_DispatchMessageA, NtUserCallOneParam_EnableDC, NtUserCallOneParam_EnableThunkLock, NtUserCallOneParam_EnumClipboardFormats, @@ -944,11 +943,6 @@ static inline HMENU NtUserCreateMenu( BOOL is_popup ) return UlongToHandle( NtUserCallOneParam( is_popup, NtUserCallOneParam_CreateMenu )); } -static inline LRESULT NtUserDispatchMessageA( const MSG *msg ) -{ - return NtUserCallOneParam( (UINT_PTR)msg, NtUserCallOneParam_DispatchMessageA ); -} - static inline WORD NtUserEnableDC( HDC hdc ) { return NtUserCallOneParam( HandleToUlong(hdc), NtUserCallOneParam_EnableDC );

1 0

Zebediah Figura : server: Clear sock->errors[AFD_POLL_BIT_CONNECT_ERR] in sock_poll_event().
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: a1fd99cfbb478b2668aa684e5de00b6994a4daee URL: https://gitlab.winehq.org/wine/wine/-/commit/a1fd99cfbb478b2668aa684e5de00b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 11 23:08:04 2022 -0500 server: Clear sock->errors[AFD_POLL_BIT_CONNECT_ERR] in sock_poll_event(). Give sock_dispatch_events() a more consistent scope. --- server/sock.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index b96f81a0ea8..1224c3b4674 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1090,10 +1090,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs case SOCK_CONNECTING: if (event & POLLOUT) - { post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); - sock->errors[AFD_POLL_BIT_CONNECT_ERR] = 0; - } if (event & (POLLERR | POLLHUP)) post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); break; @@ -1149,6 +1146,7 @@ static void sock_poll_event( struct fd *fd, int event ) { sock->state = SOCK_CONNECTED; sock->connect_time = current_time; + sock->errors[AFD_POLL_BIT_CONNECT_ERR] = 0; } break;

1 0

Zebediah Figura : server: Record the error for connected and connectionless sockets sockets in sock_error().
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: a2f2b773fb9a55bd73affe4c0ac9e3ff50f6ce03 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2f2b773fb9a55bd73affe4c0ac9e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 11 23:24:38 2022 -0500 server: Record the error for connected and connectionless sockets sockets in sock_error(). As long as we do it for connecting and listening sockets, do it here for the remaining socket types as well. --- server/sock.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index 1224c3b4674..373236cab56 100644 --- a/server/sock.c +++ b/server/sock.c @@ -645,20 +645,35 @@ static inline int sock_error( struct sock *sock ) socklen_t len = sizeof(error); getsockopt( get_unix_fd(sock->fd), SOL_SOCKET, SO_ERROR, (void *)&error, &len); - if (sock->state == SOCK_CONNECTING) + + switch (sock->state) { + case SOCK_UNCONNECTED: + break; + + case SOCK_CONNECTING: if (error) sock->errors[AFD_POLL_BIT_CONNECT_ERR] = error; else error = sock->errors[AFD_POLL_BIT_CONNECT_ERR]; - } - else if (sock->state == SOCK_LISTENING) - { + break; + + case SOCK_LISTENING: if (error) sock->errors[AFD_POLL_BIT_ACCEPT] = error; else error = sock->errors[AFD_POLL_BIT_ACCEPT]; + break; + + case SOCK_CONNECTED: + case SOCK_CONNECTIONLESS: + if (error) + sock->errors[AFD_POLL_BIT_HUP] = error; + else + error = sock->errors[AFD_POLL_BIT_HUP]; + break; } + return error; }

1 0