winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2022
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
596 discussions
Start a n
N
ew thread
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
0
0
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
0
0
Alexandre Julliard : winetest: Use CRT allocation functions.
by Alexandre Julliard
16 Aug '22
16 Aug '22
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
0
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, ¶ms, NtUserSendMessage, FALSE ); - if (params.hwnd) retval = dispatch_send_message( ¶ms ); + if (params.hwnd) retval = dispatch_send_message( ¶ms, 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, ¶ms, NtUserSendMessage, TRUE ); - if (params.hwnd) retval = dispatch_send_message( ¶ms ); + if (params.hwnd) retval = dispatch_send_message( ¶ms, wparam, lparam ); return retval; }
1
0
0
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
0
0
Jacek Caban : wow64win: Implement wow64_NtUserCallWinProc.
by Alexandre Julliard
15 Aug '22
15 Aug '22
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, ¶ms->wparam, ¶ms->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 = ¶ms32_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
0
0
Jacek Caban : win32u: Remove no longer needed unicode call_hooks argument.
by Alexandre Julliard
15 Aug '22
15 Aug '22
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
0
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
0
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
0
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
0
0
← Newer
1
...
28
29
30
31
32
33
34
...
60
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
Results per page:
10
25
50
100
200