August 2022 - Wine-commits - list.winehq.org

Alexandre Julliard : winetest: Support loading the list of tests from a file.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 6ae99e4da0a396297f934b9a969d6549f344c4a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ae99e4da0a396297f934b9a969d65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 16 12:14:21 2022 +0200 winetest: Support loading the list of tests from a file. --- programs/winetest/main.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 92bfacaa2c5..13a5c5ab294 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -66,8 +66,9 @@ static BOOL is_wow64; static int failures; /* filters for running only specific tests */ -static char *filters[64]; -static unsigned int nb_filters = 0; +static char **filters; +static unsigned int nb_filters; +static unsigned int alloc_filters; static BOOL exclude_tests = FALSE; /* Needed to check for .NET dlls */ @@ -109,6 +110,36 @@ static BOOL test_filtered_out( LPCSTR module, LPCSTR testname ) return !exclude_tests; } +static void add_filter( const char *name ) +{ + if (name[0] == '@') + { + char *p, *str, buffer[256]; + FILE *f = fopen( name + 1, "rt" ); + if (!f) return; + + while (fgets( buffer, sizeof(buffer), f )) + { + p = buffer; + while (*p == ' ' || *p == '\t') p++; + if (*p == '#') continue; + str = p; + while (*p && *p != ' ' && *p != '\t' && *p != '\r' && *p != '\n') p++; + *p = 0; + add_filter( str ); + } + fclose( f ); + return; + } + + if (nb_filters >= alloc_filters) + { + alloc_filters = max( alloc_filters * 2, 64 ); + filters = xrealloc( filters, alloc_filters * sizeof(*filters) ); + } + filters[nb_filters++] = xstrdup(name); +} + static char * get_file_version(char * file_name) { static char version[32]; @@ -1275,12 +1306,7 @@ int __cdecl main( int argc, char *argv[] ) exit (0); } else if ((argv[i][0] != '-' && argv[i][0] != '/') || argv[i][2]) { - if (nb_filters == ARRAY_SIZE(filters)) - { - report (R_ERROR, "Too many test filters specified"); - exit (2); - } - filters[nb_filters++] = argv[i]; + add_filter( argv[i] ); } else switch (argv[i][1]) { case 'c':

1 0

Alexandre Julliard : winetest: Disable the crash dialog in non-interactive mode.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 3deabed43d73695d0829a7b7fd4cec8c516f84a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3deabed43d73695d0829a7b7fd4cec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 16 17:41:31 2022 +0200 winetest: Disable the crash dialog in non-interactive mode. --- programs/winetest/main.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 13a5c5ab294..7caa20d862a 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -362,6 +362,34 @@ static BOOL is_stub_dll(const char *filename) return isstub; } +static int disable_crash_dialog(void) +{ + HKEY key; + DWORD type, data, size; + int ret = 0; + + if (RegCreateKeyA( HKEY_CURRENT_USER, "Software\\Wine\\WineDbg", &key )) return 0; + size = sizeof(data); + if (RegQueryValueExA( key, "ShowCrashDialog", NULL, &type, (BYTE *)&data, &size )) ret = 1; + else if (type != REG_DWORD || data) ret = 2; + data = 0; + RegSetValueExA( key, "ShowCrashDialog", 0, REG_DWORD, (BYTE *)&data, sizeof(data) ); + RegCloseKey( key ); + return ret; +} + +static void restore_crash_dialog( int prev ) +{ + HKEY key; + DWORD data = 1; + + if (!prev) return; + if (RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\WineDbg", &key )) return; + if (prev == 1) RegDeleteKeyValueA( key, NULL, "ShowCrashDialog" ); + else RegSetValueExA( key, "ShowCrashDialog", 0, REG_DWORD, (BYTE *)&data, sizeof(data) ); + RegCloseKey( key ); +} + static void print_version (void) { #ifdef __i386__ @@ -1286,6 +1314,7 @@ int __cdecl main( int argc, char *argv[] ) int reset_env = 1; int poweroff = 0; int interactive = 1; + int prev_crash_dialog = 0; int i; InitCommonControls(); @@ -1430,6 +1459,8 @@ int __cdecl main( int argc, char *argv[] ) if (!check_display_driver()) report (R_FATAL, "Unable to create a window, the display driver is not working."); + + if (!interactive) prev_crash_dialog = disable_crash_dialog(); } SetConsoleCtrlHandler(ctrl_handler, TRUE); @@ -1485,6 +1516,7 @@ int __cdecl main( int argc, char *argv[] ) report (R_WARNING, "Can't remove logfile: %u", GetLastError()); } else run_tests (logname, outdir); report (R_STATUS, "Finished - %u failures", failures); + if (prev_crash_dialog) restore_crash_dialog( prev_crash_dialog ); } if (poweroff) {

1 0

Alexandre Julliard : winetest: Exit with error 3 when there are test failures.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 5fabd968d4987c2b4d54787e77b9662a29f00b64 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fabd968d4987c2b4d54787e77b966… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 16 17:42:34 2022 +0200 winetest: Exit with error 3 when there are test failures. --- programs/winetest/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 7caa20d862a..ff76eec6e64 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1476,7 +1476,7 @@ int __cdecl main( int argc, char *argv[] ) if (nb_filters && !exclude_tests) { run_tests( logname, outdir ); - exit(0); + exit( failures ? 3 : 0 ); } while (!tag) { @@ -1534,5 +1534,5 @@ int __cdecl main( int argc, char *argv[] ) } ExitWindowsEx(EWX_SHUTDOWN | EWX_POWEROFF | EWX_FORCEIFHUNG, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER); } - exit (0); + exit( failures ? 3 : 0 ); }

1 0

Jacek Caban : wow64win: Implement wow64_NtUserMessageCall.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: cdcd773efe0e3669570d71d814f265a55835a772 URL: https://gitlab.winehq.org/wine/wine/-/commit/cdcd773efe0e3669570d71d814f265… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 15 01:07:13 2022 +0200 wow64win: Implement wow64_NtUserMessageCall. --- dlls/wow64win/user.c | 427 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 423 insertions(+), 4 deletions(-)

1 0

Jacek Caban : user32: Always use original parameter values in dispatch_send_message.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: b4a5556da983c7ebc8a25b228100c08947024c59 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4a5556da983c7ebc8a25b228100c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 5 17:26:37 2022 +0200 user32: Always use original parameter values in dispatch_send_message. --- dlls/user32/message.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index f6431e0c28a..7be93d94e39 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -588,7 +588,7 @@ LRESULT WINAPI SendMessageTimeoutA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l } -static LRESULT dispatch_send_message( struct win_proc_params *params ) +static LRESULT dispatch_send_message( struct win_proc_params *params, WPARAM wparam, LPARAM lparam ) { struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); INPUT_MESSAGE_SOURCE prev_source = thread_info->msg_source; @@ -596,6 +596,10 @@ static LRESULT dispatch_send_message( struct win_proc_params *params ) static const INPUT_MESSAGE_SOURCE msg_source_unavailable = { IMDT_UNAVAILABLE, IMO_UNAVAILABLE }; + /* params may contain arguments modified by wow, use original parameters instead */ + params->wparam = wparam; + params->lparam = lparam; + thread_info->recursion_count++; params->result = &retval; @@ -621,7 +625,7 @@ LRESULT WINAPI SendMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) params.hwnd = 0; retval = NtUserMessageCall( hwnd, msg, wparam, lparam, &params, NtUserSendMessage, FALSE ); - if (params.hwnd) retval = dispatch_send_message( &params ); + if (params.hwnd) retval = dispatch_send_message( &params, wparam, lparam ); return retval; } @@ -643,7 +647,7 @@ LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) params.hwnd = 0; retval = NtUserMessageCall( hwnd, msg, wparam, lparam, &params, NtUserSendMessage, TRUE ); - if (params.hwnd) retval = dispatch_send_message( &params ); + if (params.hwnd) retval = dispatch_send_message( &params, wparam, lparam ); return retval; }

1 0

Jacek Caban : win32u: Move more logic from dispatch_win_proc_params.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: 439cdf49014e97b684e0d75c52aaa2885e44cfc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/439cdf49014e97b684e0d75c52aaa2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 14 16:06:14 2022 +0200 win32u: Move more logic from dispatch_win_proc_params. --- dlls/user32/winproc.c | 62 +++----------------------------------------- dlls/win32u/class.c | 19 +++++++++++++- dlls/win32u/message.c | 8 +++--- dlls/win32u/ntuser_private.h | 2 +- include/ntuser.h | 1 - 5 files changed, 27 insertions(+), 65 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 2c0aaf03da5..ab28eecb67c 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -719,78 +719,24 @@ void dispatch_win_proc_params( struct win_proc_params *params ) if (params->procW == WINPROC_PROC16) WINPROC_CallProcWtoA( wow_handlers.call_window_proc, params->hwnd, params->msg, params->wparam, params->lparam, params->result, params->func ); - else if (params->is_dialog) - { - if (!params->ansi_dst) - { - if (params->procW) - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->procW ); - else - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->func ); - } - else - { - if (params->procA) - WINPROC_CallProcWtoA( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->procA ); - else - WINPROC_CallProcWtoA( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->func ); - } - } - else if (params->procW) - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->procW ); - else if (params->procA) - WINPROC_CallProcWtoA( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->procA ); else if (!params->ansi_dst) call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->func ); + params->result, params->procW ); else WINPROC_CallProcWtoA( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->func ); + params->lparam, params->result, params->procA ); } else { if (params->procA == WINPROC_PROC16) wow_handlers.call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, params->result, params->func ); - else if (params->is_dialog) - { - if (!params->ansi_dst) - { - if (params->procW) - WINPROC_CallProcAtoW( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->procW, params->mapping ); - else - WINPROC_CallProcAtoW( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->func, params->mapping ); - } - else - { - if (params->procA) - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->procA ); - else - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->func ); - } - } - else if (params->procA) - call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->procA ); - else if (params->procW) - WINPROC_CallProcAtoW( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->procW, params->mapping ); else if (!params->ansi_dst) WINPROC_CallProcAtoW( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->func, params->mapping ); + params->lparam, params->result, params->procW, params->mapping ); else call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->func ); + params->result, params->procA ); } SetThreadDpiAwarenessContext( context ); diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index f8a7e67ddd1..6058617b80e 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -201,7 +201,7 @@ BOOL is_winproc_unicode( WNDPROC proc, BOOL def_val ) return ptr->procW != NULL; } -void get_winproc_params( struct win_proc_params *params ) +void get_winproc_params( struct win_proc_params *params, BOOL fixup_ansi_dst ) { WINDOWPROC *proc = get_winproc_ptr( params->func ); @@ -217,7 +217,24 @@ void get_winproc_params( struct win_proc_params *params ) { params->procA = proc->procA; params->procW = proc->procW; + + if (fixup_ansi_dst) + { + if (params->ansi) + { + if (params->procA) params->ansi_dst = TRUE; + else if (params->procW) params->ansi_dst = FALSE; + } + else + { + if (params->procW) params->ansi_dst = FALSE; + else if (params->procA) params->ansi_dst = TRUE; + } + } } + + if (!params->procA) params->procA = params->func; + if (!params->procW) params->procW = params->func; } DLGPROC get_dialog_proc( HWND hwnd, enum dialog_proc_type type ) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 6506a201559..b0c444f5407 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -202,11 +202,10 @@ static BOOL init_win_proc_params( struct win_proc_params *params, HWND hwnd, UIN params->wparam = wparam; params->lparam = lparam; params->ansi = params->ansi_dst = ansi; - params->is_dialog = FALSE; params->needs_unpack = FALSE; params->mapping = WMCHAR_MAP_CALLWINDOWPROC; params->dpi_awareness = get_window_dpi_awareness_context( params->hwnd ); - get_winproc_params( params ); + get_winproc_params( params, TRUE ); return TRUE; } @@ -214,6 +213,7 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, LPARAM lParam, LRESULT *result, BOOL ansi, enum wm_char_mapping mapping ) { + BOOL is_dialog; WND *win; user_check_not_lock(); @@ -227,11 +227,10 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, } params->func = win->winproc; params->ansi_dst = !(win->flags & WIN_ISUNICODE); - params->is_dialog = win->dlgInfo != NULL; + is_dialog = win->dlgInfo != NULL; release_win_ptr( win ); params->hwnd = get_full_window_handle( hwnd ); - get_winproc_params( params ); params->msg = msg; params->wparam = wParam; params->lparam = lParam; @@ -240,6 +239,7 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, params->needs_unpack = FALSE; params->mapping = mapping; params->dpi_awareness = get_window_dpi_awareness_context( params->hwnd ); + get_winproc_params( params, !is_dialog ); return TRUE; } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 1be8eed3020..c8ba7522278 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -235,7 +235,7 @@ WORD get_class_word( HWND hwnd, INT offset ) DECLSPEC_HIDDEN; DLGPROC get_dialog_proc( HWND hwnd, enum dialog_proc_type type ) DECLSPEC_HIDDEN; ATOM get_int_atom_value( UNICODE_STRING *name ) DECLSPEC_HIDDEN; WNDPROC get_winproc( WNDPROC proc, BOOL ansi ) DECLSPEC_HIDDEN; -void get_winproc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; +void get_winproc_params( struct win_proc_params *params, BOOL fixup_ansi_dst ) DECLSPEC_HIDDEN; struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; BOOL needs_ime_window( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 053f60b8d1e..17301562013 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -146,7 +146,6 @@ struct win_proc_params LRESULT *result; BOOL ansi; BOOL ansi_dst; - BOOL is_dialog; BOOL needs_unpack; enum wm_char_mapping mapping; DPI_AWARENESS_CONTEXT dpi_awareness;

1 0

Jacek Caban : win32u: Use a separate helper to send messages from win32u.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: 894d728b7e29e3338b30014fb185bda49df134c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/894d728b7e29e3338b30014fb185bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 14 18:13:42 2022 +0200 win32u: Use a separate helper to send messages from win32u. --- dlls/win32u/clipboard.c | 4 ++-- dlls/win32u/input.c | 2 +- dlls/win32u/message.c | 22 +++++++++++++++------- dlls/win32u/palette.c | 2 +- dlls/win32u/sysparams.c | 4 ++-- dlls/win32u/win32u_private.h | 2 +- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index d91d4339493..dfc0b629763 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -232,8 +232,8 @@ BOOL WINAPI NtUserEmptyClipboard(void) TRACE( "owner %p\n", owner ); - if (owner) send_message_timeout( owner, WM_DESTROYCLIPBOARD, 0, 0, SMTO_ABORTIFHUNG, - 5000, NULL, FALSE ); + if (owner) + send_message_timeout( owner, WM_DESTROYCLIPBOARD, 0, 0, SMTO_ABORTIFHUNG, 5000, FALSE ); pthread_mutex_lock( &clipboard_mutex ); diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 19233af4418..1344ab997cd 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1636,7 +1636,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) /* send palette messages */ if (send_message( hwnd, WM_QUERYNEWPALETTE, 0, 0 )) send_message_timeout( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0, - SMTO_ABORTIFHUNG, 2000, NULL, FALSE ); + SMTO_ABORTIFHUNG, 2000, FALSE ); if (!is_window(hwnd)) return FALSE; } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index b0c444f5407..f1ff3da2cd6 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2609,11 +2609,11 @@ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_pt { case MSG_UNICODE: send_message_timeout( list[i], info->msg, info->wparam, info->lparam, - info->flags, info->timeout, NULL, FALSE ); + info->flags, info->timeout, FALSE ); break; case MSG_ASCII: send_message_timeout( list[i], info->msg, info->wparam, info->lparam, - info->flags, info->timeout, NULL, TRUE ); + info->flags, info->timeout, TRUE ); break; case MSG_NOTIFY: NtUserMessageCall( list[i], info->msg, info->wparam, info->lparam, @@ -2810,8 +2810,8 @@ static LRESULT send_window_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l } /* see SendMessageTimeoutW */ -LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, - UINT flags, UINT timeout, DWORD_PTR *res_ptr, BOOL ansi ) +static LRESULT send_client_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, + UINT flags, UINT timeout, DWORD_PTR *res_ptr, BOOL ansi ) { struct send_message_info info; @@ -2828,10 +2828,18 @@ LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, return process_message( &info, res_ptr, ansi ); } +LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, + UINT flags, UINT timeout, BOOL ansi ) +{ + DWORD_PTR res = 0; + send_client_message( hwnd, msg, wparam, lparam, flags, timeout, &res, ansi ); + return res; +} + /* see SendMessageW */ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - return send_window_message( hwnd, msg, wparam, lparam, NULL, FALSE ); + return send_message_timeout( hwnd, msg, wparam, lparam, SMTO_NORMAL, 0, FALSE ); } /* see SendNotifyMessageW */ @@ -2971,8 +2979,8 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa { struct send_message_timeout_params *params = (void *)result_info; DWORD_PTR res = 0; - params->result = send_message_timeout( hwnd, msg, wparam, lparam, params->flags, - params->timeout, &res, ansi ); + params->result = send_client_message( hwnd, msg, wparam, lparam, params->flags, + params->timeout, &res, ansi ); return res; } diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index 217a96bb027..e8fd51dba22 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -584,7 +584,7 @@ UINT realize_palette( HDC hdc ) /* send palette change notification */ HWND hwnd = NtUserWindowFromDC( hdc ); if (hwnd) send_message_timeout( HWND_BROADCAST, WM_PALETTECHANGED, HandleToUlong(hwnd), 0, - SMTO_ABORTIFHUNG, 2000, NULL, FALSE ); + SMTO_ABORTIFHUNG, 2000, FALSE ); } return realized; } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 99495349246..52665f7a641 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4397,7 +4397,7 @@ BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, void *ptr, UINT w static const WCHAR emptyW[1]; if (winini & (SPIF_SENDWININICHANGE | SPIF_SENDCHANGE)) send_message_timeout( HWND_BROADCAST, WM_SETTINGCHANGE, action, (LPARAM) emptyW, - SMTO_ABORTIFHUNG, 2000, NULL, FALSE ); + SMTO_ABORTIFHUNG, 2000, FALSE ); } TRACE( "(%u, %u, %p, %u) ret %d\n", action, val, ptr, winini, ret ); return ret; @@ -4840,7 +4840,7 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va /* Send WM_SYSCOLORCHANGE message to all windows */ send_message_timeout( HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0, - SMTO_ABORTIFHUNG, 2000, NULL, FALSE ); + SMTO_ABORTIFHUNG, 2000, FALSE ); /* Repaint affected portions of all visible windows */ NtUserRedrawWindow( 0, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); return TRUE; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ba6479a5426..a243afd668c 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -308,7 +308,7 @@ extern LRESULT send_internal_message_timeout( DWORD dest_pid, DWORD dest_tid, UI PDWORD_PTR res_ptr ) DECLSPEC_HIDDEN; extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, - UINT flags, UINT timeout, PDWORD_PTR res_ptr, BOOL ansi ); + UINT flags, UINT timeout, BOOL ansi ); /* rawinput.c */ extern BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : win32u: Pack messages sent directly from win32u.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: 0ad2db66a109b4c0a46d04ff8231706fff540941 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ad2db66a109b4c0a46d04ff823170… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 14 20:49:53 2022 +0200 win32u: Pack messages sent directly from win32u. Instead of leaking kernel pointers. --- dlls/win32u/message.c | 216 +++++++++++++++++++++++++++++++++++++++++-- dlls/win32u/ntuser_private.h | 9 -- 2 files changed, 208 insertions(+), 17 deletions(-)

1 0

Jacek Caban : user32: Pass window name as UNICODE_STRING to NtUserCreateWindowEx.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: 0d0f2067f89545539ab3ae0ccd802239a2dce98e URL: https://gitlab.winehq.org/wine/wine/-/commit/0d0f2067f89545539ab3ae0ccd8022… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 14 23:24:04 2022 +0200 user32: Pass window name as UNICODE_STRING to NtUserCreateWindowEx. --- dlls/user32/win.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e246d112383..77bd2bfa3fe 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -300,9 +300,9 @@ static BOOL is_default_coord( int x ) */ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) { + UNICODE_STRING class, window_name; HWND hwnd, top_child = 0; MDICREATESTRUCTW mdi_cs; - UNICODE_STRING class; CBT_CREATEWNDW cbtc; WNDCLASSEXW info; HMENU menu; @@ -399,15 +399,21 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } } + if (unicode || !cs->lpszName) + RtlInitUnicodeString( &window_name, cs->lpszName ); + else if (!RtlCreateUnicodeStringFromAsciiz( &window_name, (const char *)cs->lpszName )) + return 0; + menu = cs->hMenu; if (!menu && info.lpszMenuName && (cs->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) menu = LoadMenuW( cs->hInstance, info.lpszMenuName ); cbtc.lpcs = cs; - hwnd = NtUserCreateWindowEx( cs->dwExStyle, &class, NULL, NULL, cs->style, cs->x, cs->y, - cs->cx, cs->cy, cs->hwndParent, menu, module, + hwnd = NtUserCreateWindowEx( cs->dwExStyle, &class, NULL, &window_name, cs->style, + cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, menu, module, cs->lpCreateParams, 0, &cbtc, 0, !unicode ); if (!hwnd && menu && menu != cs->hMenu) NtUserDestroyMenu( menu ); + if (!unicode) RtlFreeUnicodeString( &window_name ); return hwnd; }

1 0

Jacek Caban : win32u: Use send_message_timeout for WM_CREATE and WM_NCCREATE.
by Alexandre Julliard 15 Aug '22

15 Aug '22

Module: wine Branch: master Commit: e41c255be6ba66d1eec7affe674b8cc7699226b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e41c255be6ba66d1eec7affe674b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 14 23:41:53 2022 +0200 win32u: Use send_message_timeout for WM_CREATE and WM_NCCREATE. --- dlls/user32/win.c | 4 +--- dlls/win32u/window.c | 38 +++++++++++--------------------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 77bd2bfa3fe..d0a34841ce0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -303,7 +303,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, UNICODE_STRING class, window_name; HWND hwnd, top_child = 0; MDICREATESTRUCTW mdi_cs; - CBT_CREATEWNDW cbtc; WNDCLASSEXW info; HMENU menu; @@ -408,10 +407,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (!menu && info.lpszMenuName && (cs->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) menu = LoadMenuW( cs->hInstance, info.lpszMenuName ); - cbtc.lpcs = cs; hwnd = NtUserCreateWindowEx( cs->dwExStyle, &class, NULL, &window_name, cs->style, cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, menu, module, - cs->lpCreateParams, 0, &cbtc, 0, !unicode ); + cs->lpCreateParams, 0, NULL, 0, !unicode ); if (!hwnd && menu && menu != cs->hMenu) NtUserDestroyMenu( menu ); if (!unicode) RtlFreeUnicodeString( &window_name ); return hwnd; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 6e41bc8d27f..0eac0a6320b 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5050,41 +5050,27 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, UNICODE_STRING *version, UNICODE_STRING *window_name, DWORD style, INT x, INT y, INT cx, INT cy, HWND parent, HMENU menu, HINSTANCE instance, void *params, - DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ) + DWORD flags, CBT_CREATEWNDW *client_cbtc, DWORD unk, BOOL ansi ) { - CREATESTRUCTW cs, *client_cs, cs_buf; UINT win_dpi, thread_dpi = get_thread_dpi(); DPI_AWARENESS_CONTEXT context; - CBT_CREATEWNDW cbtc_buf; + CBT_CREATEWNDW cbtc; HWND hwnd, owner = 0; + CREATESTRUCTW cs; INT sw = SW_SHOW; RECT rect; WND *win; static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; - /* FIXME: We should pass a packed struct to client instead of using client_cs */ - if (cbtc) - { - client_cs = cbtc->lpcs; - cs.lpszName = client_cs->lpszName; - cs.lpszClass = client_cs->lpszClass; - cs.hInstance = client_cs->hInstance; /* may be different than instance for win16 */ - } - else - { - cbtc = &cbtc_buf; - client_cs = cbtc->lpcs = &cs_buf; - cs.lpszName = window_name ? window_name->Buffer : NULL; - cs.lpszClass = class_name->Buffer; - cs.hInstance = instance; - } - cs.lpCreateParams = params; + cs.hInstance = instance; cs.hMenu = menu; cs.hwndParent = parent; cs.style = style; cs.dwExStyle = ex_style; + cs.lpszName = window_name ? window_name->Buffer : NULL; + cs.lpszClass = class_name ? class_name->Buffer : NULL; cs.x = x; cs.y = y; cs.cx = cx; @@ -5166,9 +5152,9 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, /* call the WH_CBT hook */ release_win_ptr( win ); - *client_cs = cs; - cbtc->hwndInsertAfter = HWND_TOP; - if (call_hooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)cbtc, !ansi )) + cbtc.hwndInsertAfter = HWND_TOP; + cbtc.lpcs = &cs; + if (call_hooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)&cbtc, TRUE )) { free_window_handle( hwnd ); return 0; @@ -5250,8 +5236,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, /* send WM_NCCREATE */ TRACE( "hwnd %p cs %d,%d %dx%d %s\n", hwnd, cs.x, cs.y, cs.cx, cs.cy, wine_dbgstr_rect(&rect) ); - *client_cs = cs; - if (!NtUserMessageCall( hwnd, WM_NCCREATE, 0, (LPARAM)client_cs, NULL, NtUserSendMessage, ansi )) + if (!send_message_timeout( hwnd, WM_NCCREATE, 0, (LPARAM)&cs, SMTO_NORMAL, 0, ansi )) { WARN( "%p: aborted by WM_NCCREATE\n", hwnd ); goto failed; @@ -5283,9 +5268,8 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, else goto failed; /* send WM_CREATE */ - if (NtUserMessageCall( hwnd, WM_CREATE, 0, (LPARAM)client_cs, 0, NtUserSendMessage, ansi ) == -1) + if (send_message_timeout( hwnd, WM_CREATE, 0, (LPARAM)&cs, SMTO_NORMAL, 0, ansi ) == -1) goto failed; - cs = *client_cs; /* call the driver */

1 0