wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Martin Storsjo : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 11bb6deb08d8004c2a889c74693c295afdf16ceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=11bb6deb08d8004c2a889c74… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:56:58 2020 +0300 tools: Upgrade the config.guess/config.sub scripts. The updated version recognizes arm64 macos. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/config.guess | 385 ++++++-- tools/config.sub | 2560 ++++++++++++++++++++++++++-------------------------- 2 files changed, 1601 insertions(+), 1344 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11bb6deb08d8004c2a88…

1 0

Martin Storsjo : ntdll: Only call putenv() if we are going to call exec().
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: e8f2c2464a3ce47e84be7786691ba35d25c7e6a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8f2c2464a3ce47e84be7786… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:34:51 2020 +0300 ntdll: Only call putenv() if we are going to call exec(). If we aren't going to exec (if pre_exec() returns zero), we will continue using the envp pointer we got from the caller. However, the putenv() call does update the environment, and this can in some cases overwrite the array that the old (stale, potentially dangling) envp pointer points to. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d621d4ef8e..e7cc050ba9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1685,14 +1685,14 @@ void __wine_main( int argc, char *argv[], char *envp[] ) if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ { - static char noexec[] = "WINELOADERNOEXEC=1"; - - putenv( noexec ); check_command_line( argc, argv ); if (pre_exec()) { + static char noexec[] = "WINELOADERNOEXEC=1"; char **new_argv = malloc( (argc + 2) * sizeof(*argv) ); + memcpy( new_argv + 1, argv, (argc + 1) * sizeof(*argv) ); + putenv( noexec ); loader_exec( argv0, new_argv, client_cpu ); fatal_error( "could not exec the wine loader\n" ); }

1 0

Jacek Caban : server: Remove no longer used get_console_input_info.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 2306efc3fae152586348a618fce3d8398a883924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2306efc3fae152586348a618… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:42 2020 +0200 server: Remove no longer used get_console_input_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 26 +------------------------- server/console.c | 18 ------------------ server/protocol.def | 15 --------------- server/request.h | 12 ------------ server/trace.c | 20 -------------------- 5 files changed, 1 insertion(+), 90 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ddf6373dec..472ed6ab93 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1904,27 +1904,6 @@ struct set_console_input_info_reply -struct get_console_input_info_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct get_console_input_info_reply -{ - struct reply_header __header; - int history_mode; - int history_size; - int history_index; - int edition_mode; - int input_cp; - int output_cp; - user_handle_t win; - /* VARARG(title,unicode_str); */ - char __pad_36[4]; -}; - - - struct append_console_input_history_request { struct request_header __header; @@ -5566,7 +5545,6 @@ enum request REQ_attach_console, REQ_get_console_wait_event, REQ_set_console_input_info, - REQ_get_console_input_info, REQ_append_console_input_history, REQ_get_console_input_history, REQ_create_console_output, @@ -5857,7 +5835,6 @@ union generic_request struct attach_console_request attach_console_request; struct get_console_wait_event_request get_console_wait_event_request; struct set_console_input_info_request set_console_input_info_request; - struct get_console_input_info_request get_console_input_info_request; struct append_console_input_history_request append_console_input_history_request; struct get_console_input_history_request get_console_input_history_request; struct create_console_output_request create_console_output_request; @@ -6146,7 +6123,6 @@ union generic_reply struct attach_console_reply attach_console_reply; struct get_console_wait_event_reply get_console_wait_event_reply; struct set_console_input_info_reply set_console_input_info_reply; - struct get_console_input_info_reply get_console_input_info_reply; struct append_console_input_history_reply append_console_input_history_reply; struct get_console_input_history_reply get_console_input_history_reply; struct create_console_output_reply create_console_output_reply; @@ -6367,7 +6343,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 635 +#define SERVER_PROTOCOL_VERSION 636 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 5a71bece9d..59a2794e01 100644 --- a/server/console.c +++ b/server/console.c @@ -2131,24 +2131,6 @@ DECL_HANDLER(set_console_input_info) set_console_input_info( req, get_req_data(), get_req_data_size() ); } -/* get info about a console (output only) */ -DECL_HANDLER(get_console_input_info) -{ - struct console_input *console; - - if (!(console = console_input_get( req->handle, FILE_READ_PROPERTIES ))) return; - if (console->title) set_reply_data( console->title, min( console->title_len, get_reply_max_size() )); - reply->history_mode = console->history_mode; - reply->history_size = console->history_size; - reply->history_index = console->history_index; - reply->edition_mode = console->edition_mode; - reply->input_cp = console->input_cp; - reply->output_cp = console->output_cp; - reply->win = console->win; - - release_object( console ); -} - /* appends a string to console's history */ DECL_HANDLER(append_console_input_history) { diff --git a/server/protocol.def b/server/protocol.def index 9693228eaa..123f629a48 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1508,21 +1508,6 @@ enum server_fd_type #define SET_CONSOLE_INPUT_INFO_WIN 0x80 -/* Get info about a console (input only) */ -@REQ(get_console_input_info) - obj_handle_t handle; /* handle to console input, or 0 for process' console */ -@REPLY - int history_mode; /* whether we duplicate lines in history */ - int history_size; /* number of lines in history */ - int history_index; /* number of used lines in history */ - int edition_mode; /* index to the edition mode flavors */ - int input_cp; /* console input codepage */ - int output_cp; /* console output codepage */ - user_handle_t win; /* console window if backend supports it */ - VARARG(title,unicode_str); /* console title */ -@END - - /* appends a string to console's history */ @REQ(append_console_input_history) obj_handle_t handle; /* handle to console input, or 0 for process' console */ diff --git a/server/request.h b/server/request.h index 1d5fe8942a..4dff87e8b9 100644 --- a/server/request.h +++ b/server/request.h @@ -186,7 +186,6 @@ DECL_HANDLER(free_console); DECL_HANDLER(attach_console); DECL_HANDLER(get_console_wait_event); DECL_HANDLER(set_console_input_info); -DECL_HANDLER(get_console_input_info); DECL_HANDLER(append_console_input_history); DECL_HANDLER(get_console_input_history); DECL_HANDLER(create_console_output); @@ -476,7 +475,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_attach_console, (req_handler)req_get_console_wait_event, (req_handler)req_set_console_input_info, - (req_handler)req_get_console_input_info, (req_handler)req_append_console_input_history, (req_handler)req_get_console_input_history, (req_handler)req_create_console_output, @@ -1128,16 +1126,6 @@ C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, input_cp) == 36 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, output_cp) == 40 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, win) == 44 ); C_ASSERT( sizeof(struct set_console_input_info_request) == 48 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_request, handle) == 12 ); -C_ASSERT( sizeof(struct get_console_input_info_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, history_mode) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, history_size) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, history_index) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, edition_mode) == 20 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, input_cp) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, output_cp) == 28 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, win) == 32 ); -C_ASSERT( sizeof(struct get_console_input_info_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct append_console_input_history_request, handle) == 12 ); C_ASSERT( sizeof(struct append_console_input_history_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_input_history_request, handle) == 12 ); diff --git a/server/trace.c b/server/trace.c index b04d9cc36e..a276f54212 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2070,23 +2070,6 @@ static void dump_set_console_input_info_request( const struct set_console_input_ dump_varargs_unicode_str( ", title=", cur_size ); } -static void dump_get_console_input_info_request( const struct get_console_input_info_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - -static void dump_get_console_input_info_reply( const struct get_console_input_info_reply *req ) -{ - fprintf( stderr, " history_mode=%d", req->history_mode ); - fprintf( stderr, ", history_size=%d", req->history_size ); - fprintf( stderr, ", history_index=%d", req->history_index ); - fprintf( stderr, ", edition_mode=%d", req->edition_mode ); - fprintf( stderr, ", input_cp=%d", req->input_cp ); - fprintf( stderr, ", output_cp=%d", req->output_cp ); - fprintf( stderr, ", win=%08x", req->win ); - dump_varargs_unicode_str( ", title=", cur_size ); -} - static void dump_append_console_input_history_request( const struct append_console_input_history_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4513,7 +4496,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_attach_console_request, (dump_func)dump_get_console_wait_event_request, (dump_func)dump_set_console_input_info_request, - (dump_func)dump_get_console_input_info_request, (dump_func)dump_append_console_input_history_request, (dump_func)dump_get_console_input_history_request, (dump_func)dump_create_console_output_request, @@ -4800,7 +4782,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_console_wait_event_reply, NULL, - (dump_func)dump_get_console_input_info_reply, NULL, (dump_func)dump_get_console_input_history_reply, (dump_func)dump_create_console_output_reply, @@ -5087,7 +5068,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "attach_console", "get_console_wait_event", "set_console_input_info", - "get_console_input_info", "append_console_input_history", "get_console_input_history", "create_console_output",

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in CONSOLE_GetNumHistoryEntries.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: f54c7205b6ac387ee394c8877245f0d0f3a3cc7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f54c7205b6ac387ee394c887… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:31 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in CONSOLE_GetNumHistoryEntries. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 13 ++++--------- dlls/kernel32/console_private.h | 2 +- dlls/kernel32/editline.c | 2 +- include/wine/condrv.h | 1 + server/console.c | 1 + 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 032f938a12..44df9463da 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1009,16 +1009,11 @@ BOOL CONSOLE_AppendHistory(const WCHAR* ptr) * * */ -unsigned CONSOLE_GetNumHistoryEntries(void) +unsigned CONSOLE_GetNumHistoryEntries(HANDLE console) { - unsigned ret = -1; - SERVER_START_REQ(get_console_input_info) - { - req->handle = 0; - if (!wine_server_call_err( req )) ret = reply->history_index; - } - SERVER_END_REQ; - return ret; + struct condrv_input_info info; + BOOL ret = DeviceIoControl( console, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ); + return ret ? info.history_index : ~0; } /****************************************************************** diff --git a/dlls/kernel32/console_private.h b/dlls/kernel32/console_private.h index 0b033b3550..b0fd2acd92 100644 --- a/dlls/kernel32/console_private.h +++ b/dlls/kernel32/console_private.h @@ -24,7 +24,7 @@ /* console.c */ extern int CONSOLE_GetHistory(int idx, WCHAR* buf, int buf_len) DECLSPEC_HIDDEN; extern BOOL CONSOLE_AppendHistory(const WCHAR *p) DECLSPEC_HIDDEN; -extern unsigned CONSOLE_GetNumHistoryEntries(void) DECLSPEC_HIDDEN; +extern unsigned CONSOLE_GetNumHistoryEntries(HANDLE) DECLSPEC_HIDDEN; extern void CONSOLE_FillLineUniform(HANDLE hConsoleOutput, int i, int j, int len, LPCHAR_INFO lpFill) DECLSPEC_HIDDEN; extern BOOL CONSOLE_GetEditionMode(HANDLE, int*) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 489960aba6..38bc475754 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -408,7 +408,7 @@ static WCHAR* WCEL_GetHistory(WCEL_Context* ctx, int idx) static void WCEL_HistoryInit(WCEL_Context* ctx) { - ctx->histPos = CONSOLE_GetNumHistoryEntries(); + ctx->histPos = CONSOLE_GetNumHistoryEntries(ctx->hConIn); ctx->histSize = ctx->histPos + 1; ctx->histCurr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)); } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index d42128f810..c898b094cf 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -74,6 +74,7 @@ struct condrv_input_info unsigned int output_cp; /* console output codepage */ unsigned int history_mode; /* whether we duplicate lines in history */ unsigned int history_size; /* number of lines in history */ + unsigned int history_index; /* number of used lines in history */ unsigned int edition_mode; /* index to the edition mode flavors */ unsigned int input_count; /* number of available input records */ condrv_handle_t win; /* renderer window handle */ diff --git a/server/console.c b/server/console.c index 890ea609c2..5a71bece9d 100644 --- a/server/console.c +++ b/server/console.c @@ -1595,6 +1595,7 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * info.output_cp = console->output_cp; info.history_mode = console->history_mode; info.history_size = console->history_size; + info.history_index = console->history_index; info.edition_mode = console->edition_mode; info.input_count = console->recnum; info.win = console->win;

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleWindow.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 36fc962f5c0f2fd33cfd09c816017655104c4201 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36fc962f5c0f2fd33cfd09c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:20 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 16 ++++++---------- dlls/kernel32/tests/console.c | 6 ++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index c38fa5d0c2..032f938a12 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -187,18 +187,14 @@ static BOOL restore_console_mode(HANDLE hin) * Success: hwnd of the console window. * Failure: NULL */ -HWND WINAPI GetConsoleWindow(VOID) +HWND WINAPI GetConsoleWindow(void) { - HWND hWnd = NULL; - - SERVER_START_REQ(get_console_input_info) - { - req->handle = 0; - if (!wine_server_call_err(req)) hWnd = wine_server_ptr_handle( reply->win ); - } - SERVER_END_REQ; + struct condrv_input_info info; + BOOL ret; - return hWnd; + ret = DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ); + return ret ? (HWND)info.win : NULL; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1fc23992ba..1702369d7a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3592,6 +3592,7 @@ static void test_FreeConsole(void) WCHAR title[16]; HANDLE handle; DWORD size; + HWND hwnd; UINT cp; BOOL ret; @@ -3646,6 +3647,11 @@ static void test_FreeConsole(void) ok(title[0] == 0xc0c0, "title byffer changed\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + hwnd = GetConsoleWindow(); + ok(!hwnd, "hwnd = %p\n", hwnd); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef );

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_TITLE in GetConsoleTitleW.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 7444aa42306cd0e091dd46efc2e0be3c7c61b2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7444aa42306cd0e091dd46ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:10 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_TITLE in GetConsoleTitleW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 9 +++++++++ dlls/kernelbase/console.c | 21 ++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index ee050e887a..1fc23992ba 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3589,7 +3589,9 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { + WCHAR title[16]; HANDLE handle; + DWORD size; UINT cp; BOOL ret; @@ -3637,6 +3639,13 @@ static void test_FreeConsole(void) ok(!cp, "cp = %x\n", cp); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + memset( title, 0xc0, sizeof(title) ); + size = GetConsoleTitleW( title, ARRAY_SIZE(title) ); + ok(!size, "GetConsoleTitleW returned %u\n", size); + ok(title[0] == 0xc0c0, "title byffer changed\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 8f4bde8d05..a3271712d9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -739,20 +739,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, */ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleW( LPWSTR title, DWORD size ) { - DWORD ret = 0; + if (!size) return 0; - SERVER_START_REQ( get_console_input_info ) - { - req->handle = 0; - wine_server_set_reply( req, title, (size - 1) * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) - { - ret = wine_server_reply_size(reply) / sizeof(WCHAR); - title[ret] = 0; - } - } - SERVER_END_REQ; - return ret; + if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, + NULL, 0, title, (size - 1) * sizeof(WCHAR), &size )) + return 0; + + size /= sizeof(WCHAR); + title[size] = 0; + return size + 1; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleOutputCP.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 3576258402f5e23ad059cf446eafef7fb2c10430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3576258402f5e23ad059cf44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:00 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleOutputCP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 5 +++++ dlls/kernelbase/console.c | 16 +++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d3ce6fb21c..ee050e887a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3632,6 +3632,11 @@ static void test_FreeConsole(void) ok(!cp, "cp = %x\n", cp); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + cp = GetConsoleOutputCP(); + ok(!cp, "cp = %x\n", cp); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 94577a5806..8f4bde8d05 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -658,18 +658,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode ) */ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleOutputCP(void) { - UINT codepage = GetOEMCP(); /* default value */ + struct condrv_input_info info; - SERVER_START_REQ( get_console_input_info ) - { - req->handle = 0; - if (!wine_server_call_err( req )) - { - if (reply->output_cp) codepage = reply->output_cp; - } - } - SERVER_END_REQ; - return codepage; + if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) + return 0; + return info.output_cp ? info.output_cp : GetOEMCP(); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleCP.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 4faed406d428a2cec752c2aa1bda8449a1342057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4faed406d428a2cec752c2aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:26:53 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleCP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 6 ++++++ dlls/kernelbase/console.c | 16 +++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2b70c2ffc4..d3ce6fb21c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3590,6 +3590,7 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { HANDLE handle; + UINT cp; BOOL ret; ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); @@ -3626,6 +3627,11 @@ static void test_FreeConsole(void) ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_HANDLE, "CreateConsoleScreenBuffer returned: %p (%u)\n", handle, GetLastError()); + SetLastError(0xdeadbeef); + cp = GetConsoleCP(); + ok(!cp, "cp = %x\n", cp); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 484072e252..94577a5806 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -585,18 +585,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH GenerateConsoleCtrlEvent( DWORD event, DWORD group */ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleCP(void) { - UINT codepage = GetOEMCP(); /* default value */ + struct condrv_input_info info; - SERVER_START_REQ( get_console_input_info ) - { - req->handle = 0; - if (!wine_server_call_err( req )) - { - if (reply->input_cp) codepage = reply->input_cp; - } - } - SERVER_END_REQ; - return codepage; + if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) + return 0; + return info.input_cp ? info.input_cp : GetOEMCP(); }

1 0

Martin Storsjo : ntdll: Remove a stray duplicate instruction.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 00b4a51fcc325fe1a5f2d1dbc7b81dacf4686b4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b4a51fcc325fe1a5f2d1db… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:15:55 2020 +0300 ntdll: Remove a stray duplicate instruction. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 573eaef0f6..a35e48c1d6 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1174,7 +1174,6 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "ldp x4, x5, [sp]\n\t" /* frame pointer, return address */ "stp x4, x5, [x1, #0xf0]\n\t" /* context->Fp, Lr */ "str x5, [x1, #0x108]\n\t" /* context->Pc */ - "str x5, [x1, #0x108]\n\t" /* context->Pc */ "str x5, [x0, #0x10]\n\t" /* rec->ExceptionAddress */ "mov x2, #1\n\t" "bl " __ASM_NAME("NtRaiseException") "\n\t"

1 0

Paul Gofman : ntdll: Don't mind epilog in RtlVirtualUnwind() in case of zero op count on x64.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 71090bdc2f5051f181c193ea410e6438b92c9c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71090bdc2f5051f181c193ea… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 14 13:10:44 2020 +0300 ntdll: Don't mind epilog in RtlVirtualUnwind() in case of zero op count on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 5 ++- dlls/ntdll/tests/exception.c | 105 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 88 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0cbcc177b2..faf24b93b5 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -815,13 +815,16 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, /* check if in prolog */ if (pc >= base + function->BeginAddress && pc < base + function->BeginAddress + info->prolog) { + TRACE("inside prolog.\n"); prolog_offset = pc - base - function->BeginAddress; } else { prolog_offset = ~0; - if (is_inside_epilog( (BYTE *)pc, base, function )) + /* Since Win10 1809 epilogue does not have a special treatment in case of zero opcode count. */ + if (info->count && is_inside_epilog( (BYTE *)pc, base, function )) { + TRACE("inside epilog.\n"); interpret_epilog( (BYTE *)pc, context, ctx_ptr ); *frame_ret = frame; return NULL; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b6307264bc..9e33417c7f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1935,6 +1935,7 @@ struct unwind_test const BYTE *unwind_info; const struct results *results; unsigned int nb_results; + const struct results *broken_results; }; enum regs @@ -1959,10 +1960,11 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) CONTEXT context; RUNTIME_FUNCTION runtime_func; KNONVOLATILE_CONTEXT_POINTERS ctx_ptr; - UINT i, j, k; + UINT i, j, k, broken_k; ULONG64 fake_stack[256]; ULONG64 frame, orig_rip, orig_rbp, unset_reg; UINT unwind_size = 4 + 2 * test->unwind_info[2] + 8; + void *expected_handler, *broken_handler; memcpy( (char *)code_mem + code_offset, test->function, test->function_size ); memcpy( (char *)code_mem + unwind_offset, test->unwind_info, unwind_size ); @@ -1991,23 +1993,24 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) data = (void *)0xdeadbeef; handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)code_mem, orig_rip, &runtime_func, &context, &data, &frame, &ctx_ptr ); - if (test->results[i].handler) - { - ok( (char *)handler == (char *)code_mem + 0x200, - "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); - if (handler) ok( *(DWORD *)data == 0x08070605, - "%u/%u: wrong handler data %p\n", testnum, i, data ); - } + + expected_handler = test->results[i].handler ? (char *)code_mem + 0x200 : NULL; + broken_handler = test->broken_results && test->broken_results[i].handler ? (char *)code_mem + 0x200 : NULL; + + ok( handler == expected_handler || broken( test->broken_results && handler == broken_handler ), + "%u/%u: wrong handler %p/%p\n", testnum, i, handler, expected_handler ); + if (handler) + ok( *(DWORD *)data == 0x08070605, "%u/%u: wrong handler data %p\n", testnum, i, data ); else - { - ok( handler == NULL, "%u/%u: handler %p instead of NULL\n", testnum, i, handler ); ok( data == (void *)0xdeadbeef, "%u/%u: handler data set to %p\n", testnum, i, data ); - } - ok( context.Rip == test->results[i].rip, "%u/%u: wrong rip %p/%x\n", - testnum, i, (void *)context.Rip, test->results[i].rip ); - ok( frame == (ULONG64)fake_stack + test->results[i].frame, "%u/%u: wrong frame %p/%p\n", - testnum, i, (void *)frame, (char *)fake_stack + test->results[i].frame ); + ok( context.Rip == test->results[i].rip + || broken( test->broken_results && context.Rip == test->broken_results[i].rip ), + "%u/%u: wrong rip %p/%x\n", testnum, i, (void *)context.Rip, test->results[i].rip ); + ok( frame == (ULONG64)fake_stack + test->results[i].frame + || broken( test->broken_results && frame == (ULONG64)fake_stack + test->broken_results[i].frame ), + "%u/%u: wrong frame %p/%p\n", + testnum, i, (void *)frame, (char *)fake_stack + test->results[i].frame ); for (j = 0; j < 16; j++) { @@ -2023,15 +2026,40 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (test->results[i].regs[k][0] == j) break; } + if (test->broken_results) + { + for (broken_k = 0; broken_k < nb_regs; broken_k++) + { + if (test->broken_results[i].regs[broken_k][0] == -1) + { + broken_k = nb_regs; + break; + } + if (test->broken_results[i].regs[broken_k][0] == j) + break; + } + } + else + { + broken_k = k; + } + if (j == rsp) /* rsp is special */ { - ULONG64 expected_rsp; + ULONG64 expected_rsp, broken_rsp; ok( !ctx_ptr.IntegerContext[j], "%u/%u: rsp should not be set in ctx_ptr\n", testnum, i ); expected_rsp = test->results[i].regs[k][1] < 0 ? -test->results[i].regs[k][1] : (ULONG64)fake_stack + test->results[i].regs[k][1]; - ok( context.Rsp == expected_rsp, + if (test->broken_results) + broken_rsp = test->broken_results[i].regs[k][1] < 0 + ? -test->broken_results[i].regs[k][1] + : (ULONG64)fake_stack + test->broken_results[i].regs[k][1]; + else + broken_rsp = expected_rsp; + + ok( context.Rsp == expected_rsp || broken( context.Rsp == broken_rsp ), "%u/%u: register rsp wrong %p/%p\n", testnum, i, (void *)context.Rsp, (void *)expected_rsp ); continue; @@ -2039,16 +2067,18 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (ctx_ptr.IntegerContext[j]) { - ok( k < nb_regs, "%u/%u: register %s should not be set to %lx\n", + ok( k < nb_regs || broken( broken_k < nb_regs ), "%u/%u: register %s should not be set to %lx\n", testnum, i, reg_names[j], *(&context.Rax + j) ); - if (k < nb_regs) - ok( *(&context.Rax + j) == test->results[i].regs[k][1], + ok( k == nb_regs || *(&context.Rax + j) == test->results[i].regs[k][1] + || broken( broken_k == nb_regs || *(&context.Rax + j) + == test->broken_results[i].regs[broken_k][1] ), "%u/%u: register %s wrong %p/%x\n", testnum, i, reg_names[j], (void *)*(&context.Rax + j), test->results[i].regs[k][1] ); } else { - ok( k == nb_regs, "%u/%u: register %s should be set\n", testnum, i, reg_names[j] ); + ok( k == nb_regs || broken( broken_k == nb_regs ), "%u/%u: register %s should be set\n", + testnum, i, reg_names[j] ); if (j == rbp) ok( context.Rbp == orig_rbp, "%u/%u: register rbp wrong %p/unset\n", testnum, i, (void *)context.Rbp ); @@ -2215,12 +2245,45 @@ static void test_virtual_unwind(void) { 0x01, 0x50, TRUE, 0x010, 0x000, { {rsp,-0x028}, {rbp,0x000}, {-1,-1} }}, }; + static const BYTE function_4[] = + { + 0x55, /* 00: push %rbp */ + 0x5d, /* 01: pop %rbp */ + 0xc3 /* 02: ret */ + }; + + static const BYTE unwind_info_4[] = + { + 1 | (UNW_FLAG_EHANDLER << 3), /* version + flags */ + 0x0, /* prolog size */ + 0, /* opcode count */ + 0, /* frame reg */ + + 0x00, 0x02, 0x00, 0x00, /* handler */ + 0x05, 0x06, 0x07, 0x08, /* data */ + }; + + static const struct results results_4[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x50, TRUE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, + }; + + static const struct results broken_results_4[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x50, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { { function_0, sizeof(function_0), unwind_info_0, results_0, ARRAY_SIZE(results_0) }, { function_1, sizeof(function_1), unwind_info_1, results_1, ARRAY_SIZE(results_1) }, { function_2, sizeof(function_2), unwind_info_2, results_2, ARRAY_SIZE(results_2) }, { function_2, sizeof(function_2), unwind_info_3, results_3, ARRAY_SIZE(results_3) }, + + /* Broken before Win10 1809. */ + { function_4, sizeof(function_4), unwind_info_4, results_4, ARRAY_SIZE(results_4), broken_results_4 }, }; unsigned int i;

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020