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

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

Aug. 16, 2022

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

Alexandre Julliard : winetest: Use CRT allocation functions.
by Alexandre Julliard Aug. 16, 2022

Aug. 16, 2022

Module: wine Branch: master Commit: 22aceb44e738c51e169fffc669223da5952d8072 URL: https://gitlab.winehq.org/wine/wine/-/commit/22aceb44e738c51e169fffc669223d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 16 11:57:39 2022 +0200 winetest: Use CRT allocation functions. --- programs/winetest/gui.c | 32 +++++++-------- programs/winetest/main.c | 93 ++++++++++++++++++-------------------------- programs/winetest/send.c | 45 +++++++++++---------- programs/winetest/util.c | 34 +++++----------- programs/winetest/winetest.h | 7 ++-- 5 files changed, 88 insertions(+), 123 deletions(-)

1 0

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

Aug. 16, 2022

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

Jacek Caban : wow64win: Implement wow64_NtUserMessageCall.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

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 Aug. 15, 2022

Aug. 15, 2022

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 : wow64win: Implement wow64_NtUserCallWinProc.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 9f63cbc052e72bbe16398cf45c8a1a43dc27ed4f URL: https://gitlab.winehq.org/wine/wine/-/commit/9f63cbc052e72bbe16398cf45c8a1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 15 00:11:49 2022 +0200 wow64win: Implement wow64_NtUserCallWinProc. --- dlls/user32/winproc.c | 16 +++++++++---- dlls/win32u/message.c | 1 + dlls/wow64win/user.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index ab28eecb67c..a22262b037b 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1176,12 +1176,13 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) { + LRESULT result, *result_ptr = params->result; + params->result = &result; if (params->needs_unpack) { char stack_buffer[128]; void *buffer; - LRESULT result; if (size > sizeof(*params)) { @@ -1196,8 +1197,6 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) if (!unpack_message( params->hwnd, params->msg, &params->wparam, &params->lparam, &buffer, size )) return 0; - params->result = &result; - dispatch_win_proc_params( params ); @@ -1206,7 +1205,16 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) if (buffer != stack_buffer && buffer != params + 1) HeapFree( GetProcessHeap(), 0, buffer ); } - else dispatch_win_proc_params( params ); + else + { + dispatch_win_proc_params( params ); + if (result_ptr) + { + *result_ptr = result; + return TRUE; + } + NtCallbackReturn( &result, sizeof(result), TRUE ); + } return TRUE; } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index a19b6bab230..bc932c5c820 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -265,6 +265,7 @@ static BOOL dispatch_win_proc_params( struct win_proc_params *params, size_t siz thread_info->recursion_count++; KeUserModeCallback( NtUserCallWinProc, params, size, &ret_ptr, &ret_len ); + if (ret_len == sizeof(*params->result)) *params->result = *(LRESULT *)ret_ptr; thread_info->recursion_count--; return TRUE; diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 6aecdacda39..ef817025dda 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -152,6 +152,23 @@ struct client_menu_name32 ULONG nameUS; }; +struct win_proc_params32 +{ + ULONG func; + ULONG hwnd; + UINT msg; + ULONG wparam; + ULONG lparam; + ULONG result; + BOOL ansi; + BOOL ansi_dst; + BOOL needs_unpack; + enum wm_char_mapping mapping; + ULONG dpi_awareness; + ULONG procA; + ULONG procW; +}; + static MSG *msg_32to64( MSG *msg, const MSG32 *msg32 ) { if (!msg32) return NULL; @@ -200,6 +217,24 @@ static struct client_menu_name32 *client_menu_name_64to32( const struct client_m return name32; } +static void win_proc_params_64to32( const struct win_proc_params *src, struct win_proc_params32 *dst, + ULONG *result ) +{ + dst->func = PtrToUlong( src->func ); + dst->hwnd = HandleToUlong( src->hwnd ); + dst->msg = src->msg; + dst->wparam = src->wparam; + dst->lparam = src->lparam; + dst->result = PtrToUlong( result ); + dst->ansi = src->ansi; + dst->ansi_dst = src->ansi_dst; + dst->needs_unpack = src->needs_unpack; + dst->mapping = src->mapping; + dst->dpi_awareness = HandleToUlong( src->dpi_awareness ); + dst->procA = PtrToUlong( src->procA ); + dst->procW = PtrToUlong( src->procW ); +} + static NTSTATUS dispatch_callback( ULONG id, void *args, ULONG len ) { void *ret_ptr; @@ -256,8 +291,34 @@ static NTSTATUS WINAPI wow64_NtUserCallWinEventHook( void *arg, ULONG size ) static NTSTATUS WINAPI wow64_NtUserCallWinProc( void *arg, ULONG size ) { - FIXME( "\n" ); - return 0; + struct win_proc_params *params = arg; + struct win_proc_params32 params32_buf, *params32 = &params32_buf; + LONG result32 = 0; + LRESULT result; + void *ret_ptr; + ULONG ret_len; + NTSTATUS status; + + if (size > sizeof(*params)) + { + if (!(params32 = Wow64AllocateTemp( size - sizeof(*params) + sizeof(*params32) ))) + return 0; + memcpy( params32 + 1, params + 1, size - sizeof(*params) ); + } + win_proc_params_64to32( params, params32, NULL ); + + status = Wow64KiUserCallbackDispatcher( NtUserCallWinProc, params32, + size - sizeof(*params) + sizeof(*params32), + &ret_ptr, &ret_len ); + if (ret_len == sizeof(result32)) result32 = *(LONG *)ret_ptr; + result = result32; + + if (params->result) + { + *params->result = result; + return status; + } + return NtCallbackReturn( &result, sizeof(result), status ); } static NTSTATUS WINAPI wow64_NtUserCallWindowsHook( void *arg, ULONG size )

1 0

Jacek Caban : win32u: Pack messages sent directly from win32u.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

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 : win32u: Use a separate helper to send messages from win32u.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

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: Remove no longer needed unicode call_hooks argument.
by Alexandre Julliard Aug. 15, 2022

Aug. 15, 2022

Module: wine Branch: master Commit: 85012b910227dcd9394acce1d4f12d6253f643b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/85012b910227dcd9394acce1d4f12d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 15 01:42:43 2022 +0200 win32u: Remove no longer needed unicode call_hooks argument. --- dlls/win32u/defwnd.c | 6 +++--- dlls/win32u/hook.c | 8 ++++---- dlls/win32u/input.c | 6 +++--- dlls/win32u/message.c | 24 ++++++++++++------------ dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 10 +++++----- 6 files changed, 28 insertions(+), 28 deletions(-)

1 0

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

Aug. 15, 2022

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