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

Jacek Caban : kernelbase: Use init_console_std_handles in AttachConsole.
by Alexandre Julliard July 30, 2020

July 30, 2020

Module: wine Branch: master Commit: ed8358393413d52096c56e96b44ee73f15053f91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed8358393413d52096c56e96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 30 17:16:42 2020 +0200 kernelbase: Use init_console_std_handles in AttachConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 9 +++------ include/wine/server_protocol.h | 6 +----- server/console.c | 14 -------------- server/protocol.def | 4 ---- server/request.h | 4 ---- server/trace.c | 9 +-------- 6 files changed, 5 insertions(+), 41 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index be05a535c5..93ab29d6f1 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -246,15 +246,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH AttachConsole( DWORD pid ) SERVER_START_REQ( attach_console ) { req->pid = pid; - if ((ret = !wine_server_call_err( req ))) - { - SetStdHandle( STD_INPUT_HANDLE, wine_server_ptr_handle( reply->std_in )); - SetStdHandle( STD_OUTPUT_HANDLE, wine_server_ptr_handle( reply->std_out )); - SetStdHandle( STD_ERROR_HANDLE, wine_server_ptr_handle( reply->std_err )); - } + ret = !wine_server_call_err( req ); } SERVER_END_REQ; + if (ret && !(ret = init_console_std_handles())) FreeConsole(); + RtlLeaveCriticalSection( &console_section ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 7753d24877..587b2391ce 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1858,10 +1858,6 @@ struct attach_console_request struct attach_console_reply { struct reply_header __header; - obj_handle_t std_in; - obj_handle_t std_out; - obj_handle_t std_err; - char __pad_20[4]; }; @@ -6355,7 +6351,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 633 +#define SERVER_PROTOCOL_VERSION 634 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 0060f7cb65..53910b3f46 100644 --- a/server/console.c +++ b/server/console.c @@ -2108,15 +2108,6 @@ DECL_HANDLER(attach_console) if (process->console && process->console->active) { - reply->std_in = alloc_handle( current->process, process->console, GENERIC_READ, 0 ); - if (!reply->std_in) goto error; - - reply->std_out = alloc_handle( current->process, process->console->active, GENERIC_WRITE, 0 ); - if (!reply->std_out) goto error; - - reply->std_err = alloc_handle( current->process, process->console->active, GENERIC_WRITE, 0 ); - if (!reply->std_err) goto error; - current->process->console = (struct console_input *)grab_object( process->console ); current->process->console->num_proc++; } @@ -2127,11 +2118,6 @@ DECL_HANDLER(attach_console) release_object( process ); return; - -error: - if (reply->std_in) close_handle( current->process, reply->std_in ); - if (reply->std_out) close_handle( current->process, reply->std_out ); - release_object( process ); } /* set info about a console input */ diff --git a/server/protocol.def b/server/protocol.def index c2773307a4..1bbc8c5008 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1475,10 +1475,6 @@ enum server_fd_type /* Attach to a other process's console */ @REQ(attach_console) process_id_t pid; /* pid of attached console process */ -(a)REPLY - obj_handle_t std_in; /* attached stdin */ - obj_handle_t std_out; /* attached stdout */ - obj_handle_t std_err; /* attached stderr */ @END diff --git a/server/request.h b/server/request.h index 190581332b..cd0799f2c1 100644 --- a/server/request.h +++ b/server/request.h @@ -1112,10 +1112,6 @@ C_ASSERT( sizeof(struct alloc_console_reply) == 16 ); C_ASSERT( sizeof(struct free_console_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct attach_console_request, pid) == 12 ); C_ASSERT( sizeof(struct attach_console_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct attach_console_reply, std_in) == 8 ); -C_ASSERT( FIELD_OFFSET(struct attach_console_reply, std_out) == 12 ); -C_ASSERT( FIELD_OFFSET(struct attach_console_reply, std_err) == 16 ); -C_ASSERT( sizeof(struct attach_console_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_request, handle) == 12 ); C_ASSERT( sizeof(struct get_console_wait_event_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_reply, event) == 8 ); diff --git a/server/trace.c b/server/trace.c index 15a769fb59..51bd490fe2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2046,13 +2046,6 @@ static void dump_attach_console_request( const struct attach_console_request *re fprintf( stderr, " pid=%04x", req->pid ); } -static void dump_attach_console_reply( const struct attach_console_reply *req ) -{ - fprintf( stderr, " std_in=%04x", req->std_in ); - fprintf( stderr, ", std_out=%04x", req->std_out ); - fprintf( stderr, ", std_err=%04x", req->std_err ); -} - static void dump_get_console_wait_event_request( const struct get_console_wait_event_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4793,7 +4786,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_alloc_console_reply, NULL, - (dump_func)dump_attach_console_reply, + NULL, (dump_func)dump_get_console_wait_event_reply, NULL, (dump_func)dump_get_console_input_info_reply,

1 0

Jacek Caban : wineconsole: Use console in/out handles only in WINECON_Init.
by Alexandre Julliard July 30, 2020

July 30, 2020

Module: wine Branch: master Commit: fa2b372ec02d3755ce892612750238f41b39ad85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa2b372ec02d3755ce892612… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 30 17:15:35 2020 +0200 wineconsole: Use console in/out handles only in WINECON_Init. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/winecon_private.h | 2 -- programs/wineconsole/wineconsole.c | 29 ++++++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index d78502a260..736cf7824e 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -60,8 +60,6 @@ struct inner_data { COORD cursor; /* position in cells of cursor */ - HANDLE hConIn; /* console input handle */ - HANDLE hConOut; /* screen buffer handle: has to be changed when active sb changes */ HANDLE console; /* console renderer handle */ HANDLE hProcess; /* handle to the child process or NULL */ HWND hWnd; /* handle of 'user' window or NULL for 'curses' */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index c78a7f814b..1104963f0f 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -530,8 +530,6 @@ static void WINECON_Delete(struct inner_data* data) if (!data) return; if (data->fnDeleteBackend) data->fnDeleteBackend(data); - if (data->hConIn) CloseHandle(data->hConIn); - if (data->hConOut) CloseHandle(data->hConOut); if (data->console) CloseHandle(data->console); if (data->hProcess) CloseHandle(data->hProcess); if (data->overlapped.hEvent) CloseHandle(data->overlapped.hEvent); @@ -584,7 +582,7 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data) * * Spawn the child process when invoked with wineconsole foo bar */ -static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) +static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine, HANDLE con_in, HANDLE con_out) { PROCESS_INFORMATION info; STARTUPINFOW startup; @@ -598,11 +596,11 @@ static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) /* the attributes of wineconsole's handles are not adequate for inheritance, so * get them with the correct attributes before process creation */ - if (!DuplicateHandle(GetCurrentProcess(), data->hConIn, GetCurrentProcess(), + if (!DuplicateHandle(GetCurrentProcess(), con_in, GetCurrentProcess(), &startup.hStdInput, GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, TRUE, 0) || - !DuplicateHandle(GetCurrentProcess(), data->hConOut, GetCurrentProcess(), + !DuplicateHandle(GetCurrentProcess(), con_out, GetCurrentProcess(), &startup.hStdOutput, GENERIC_READ|GENERIC_WRITE, TRUE, 0) || - !DuplicateHandle(GetCurrentProcess(), data->hConOut, GetCurrentProcess(), + !DuplicateHandle(GetCurrentProcess(), con_out, GetCurrentProcess(), &startup.hStdError, GENERIC_READ|GENERIC_WRITE, TRUE, 0)) { WINE_ERR("Can't dup handles\n"); @@ -645,6 +643,8 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna UNICODE_STRING string; IO_STATUS_BLOCK io; condrv_handle_t h; + HANDLE con_in; + HANDLE con_out; NTSTATUS status; static const WCHAR renderer_pathW[] = {'\\','D','e','v','i','c','e','\\','C','o','n','D','r','v', @@ -689,11 +689,11 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna req->input_fd = -1; ret = !wine_server_call_err( req ); - data->hConIn = wine_server_ptr_handle( reply->handle_in ); + con_in = wine_server_ptr_handle( reply->handle_in ); } SERVER_END_REQ; if (!ret) goto error; - WINE_TRACE("using hConIn %p, hSynchro event %p\n", data->hConIn, data->console); + WINE_TRACE("using con_in %p, renderer %p\n", con_in, data->console); RtlInitUnicodeString(&string, renderer_pathW); attr.ObjectName = &string; @@ -702,23 +702,23 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0); if (status) goto error; - h = condrv_handle(data->hConIn); + h = condrv_handle(con_in); if (!DeviceIoControl(data->console, IOCTL_CONDRV_ATTACH_RENDERER, &h, sizeof(h), NULL, 0, NULL, NULL)) goto error; SERVER_START_REQ(create_console_output) { - req->handle_in = wine_server_obj_handle( data->hConIn ); + req->handle_in = wine_server_obj_handle( con_in ); req->access = GENERIC_WRITE|GENERIC_READ; req->attributes = 0; req->share = FILE_SHARE_READ|FILE_SHARE_WRITE; req->fd = -1; ret = !wine_server_call_err( req ); - data->hConOut = wine_server_ptr_handle( reply->handle_out ); + con_out = wine_server_ptr_handle( reply->handle_out ); } SERVER_END_REQ; if (!ret) goto error; - WINE_TRACE("using hConOut %p\n", data->hConOut); + WINE_TRACE("using con_out %p\n", con_out); /* filling data->curcfg from cfg */ switch ((*backend)(data)) @@ -755,7 +755,10 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna lstrlenW(appname) * sizeof(WCHAR), NULL, 0, NULL, NULL); if (!ret) goto error; - if (cmdline && !WINECON_Spawn(data, cmdline)) goto error; + if (cmdline && !WINECON_Spawn(data, cmdline, con_in, con_out)) goto error; + + CloseHandle(con_in); + CloseHandle(con_out); return data; case init_failed:

1 0

Jacek Caban : kernelbase: Fix handling processes using STARTF_USESTDHANDLES when setting standard handles in AllocConsole.
by Alexandre Julliard July 30, 2020

July 30, 2020

Module: wine Branch: master Commit: bd54f39766e53f92909bc208e5746497c0dc5d69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd54f39766e53f92909bc208… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 30 17:16:01 2020 +0200 kernelbase: Fix handling processes using STARTF_USESTDHANDLES when setting standard handles in AllocConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 89 ++++++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 32 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index c3634c792f..d326901eac 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -169,6 +169,61 @@ static COORD get_largest_console_window_size( HANDLE handle ) return c; } +static BOOL init_console_std_handles(void) +{ + HANDLE std_out = NULL, std_err = NULL, handle; + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + IO_STATUS_BLOCK iosb; + UNICODE_STRING name; + STARTUPINFOW si; + NTSTATUS status; + + GetStartupInfoW( &si ); + attr.ObjectName = &name; + attr.Attributes = OBJ_INHERIT; + + if (!(si.dwFlags & STARTF_USESTDHANDLES) || !GetStdHandle( STD_INPUT_HANDLE )) + { + /* FIXME: Use unbound console handle */ + RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\CurrentIn" ); + status = NtCreateFile( &handle, FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE | FILE_READ_ATTRIBUTES | + FILE_WRITE_ATTRIBUTES, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_CREATE, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + if (!set_ntstatus( status )) return FALSE; + SetStdHandle( STD_INPUT_HANDLE, console_handle_map( handle )); + } + + if (si.dwFlags & STARTF_USESTDHANDLES) + { + std_out = GetStdHandle( STD_OUTPUT_HANDLE ); + std_err = GetStdHandle( STD_ERROR_HANDLE ); + if (std_out && std_err) return TRUE; + } + + /* FIXME: Use unbound console handle */ + RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\CurrentOut" ); + status = NtCreateFile( &handle, FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE | FILE_READ_ATTRIBUTES | + FILE_WRITE_ATTRIBUTES, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_CREATE, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + if (!set_ntstatus( status )) return FALSE; + if (!std_out) + { + SetStdHandle( STD_OUTPUT_HANDLE, console_handle_map( handle )); + } + + if (!std_err) + { + if (!std_out && !DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), + &handle, 0, TRUE, DUPLICATE_SAME_ACCESS )) + return FALSE; + SetStdHandle( STD_ERROR_HANDLE, console_handle_map( handle )); + } + + return TRUE; +} + /****************************************************************** * AttachConsole (kernelbase.@) */ @@ -203,13 +258,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH AttachConsole( DWORD pid ) BOOL WINAPI AllocConsole(void) { SECURITY_ATTRIBUTES inheritable_attr = { sizeof(inheritable_attr), NULL, TRUE }; - HANDLE std_in = INVALID_HANDLE_VALUE; - HANDLE std_out = INVALID_HANDLE_VALUE; - HANDLE std_err = INVALID_HANDLE_VALUE; STARTUPINFOW app_si, console_si; WCHAR buffer[1024], cmd[256]; PROCESS_INFORMATION pi; - HANDLE event; + HANDLE event, std_in; DWORD mode; BOOL ret; @@ -266,42 +318,15 @@ BOOL WINAPI AllocConsole(void) CloseHandle( pi.hProcess ); } CloseHandle( event ); - if (!ret) goto error; + if (!ret || !init_console_std_handles()) goto error; TRACE( "Started wineconsole pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); - if (!(app_si.dwFlags & STARTF_USESTDHANDLES)) - { - - std_in = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, &inheritable_attr, - OPEN_EXISTING, 0, 0); - if (std_in == INVALID_HANDLE_VALUE) goto error; - - std_out = CreateFileW( L"CONOUT$", GENERIC_READ | GENERIC_WRITE, 0, &inheritable_attr, OPEN_EXISTING, 0, 0); - if (std_out == INVALID_HANDLE_VALUE) goto error; - - if (!DuplicateHandle( GetCurrentProcess(), std_out, GetCurrentProcess(), - &std_err, 0, TRUE, DUPLICATE_SAME_ACCESS) ) - goto error; - } - else - { - std_in = app_si.hStdInput; - std_out = app_si.hStdOutput; - std_err = app_si.hStdError; - } - - SetStdHandle( STD_INPUT_HANDLE, std_in ); - SetStdHandle( STD_OUTPUT_HANDLE, std_out ); - SetStdHandle( STD_ERROR_HANDLE, std_err ); RtlLeaveCriticalSection( &console_section ); SetLastError( ERROR_SUCCESS ); return TRUE; error: ERR("Can't allocate console\n"); - if (std_in != INVALID_HANDLE_VALUE) CloseHandle(std_in); - if (std_out != INVALID_HANDLE_VALUE) CloseHandle(std_out); - if (std_err != INVALID_HANDLE_VALUE) CloseHandle(std_err); FreeConsole(); RtlLeaveCriticalSection( &console_section ); return FALSE;

1 0

Jacek Caban : kernelbase: Close handles allocated by AllocConsole in FreeConsole.
by Alexandre Julliard July 30, 2020

July 30, 2020

Module: wine Branch: master Commit: 53f17314aa97d4aba8d37d76ae878cbae20818bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=53f17314aa97d4aba8d37d76… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 30 17:16:13 2020 +0200 kernelbase: Close handles allocated by AllocConsole in FreeConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index d326901eac..be05a535c5 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -55,6 +55,11 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION console_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static HANDLE console_wait_event; +static unsigned int console_flags; + +#define CONSOLE_INPUT_HANDLE 0x01 +#define CONSOLE_OUTPUT_HANDLE 0x02 +#define CONSOLE_ERROR_HANDLE 0x04 static WCHAR input_exe[MAX_PATH + 1]; @@ -191,6 +196,7 @@ static BOOL init_console_std_handles(void) FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_CREATE, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); if (!set_ntstatus( status )) return FALSE; + console_flags |= CONSOLE_INPUT_HANDLE; SetStdHandle( STD_INPUT_HANDLE, console_handle_map( handle )); } @@ -210,6 +216,7 @@ static BOOL init_console_std_handles(void) if (!set_ntstatus( status )) return FALSE; if (!std_out) { + console_flags |= CONSOLE_OUTPUT_HANDLE; SetStdHandle( STD_OUTPUT_HANDLE, console_handle_map( handle )); } @@ -218,6 +225,7 @@ static BOOL init_console_std_handles(void) if (!std_out && !DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS )) return FALSE; + console_flags |= CONSOLE_ERROR_HANDLE; SetStdHandle( STD_ERROR_HANDLE, console_handle_map( handle )); } @@ -504,6 +512,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) RtlEnterCriticalSection( &console_section ); + if (console_flags & CONSOLE_INPUT_HANDLE) NtClose( GetStdHandle( STD_INPUT_HANDLE )); + if (console_flags & CONSOLE_OUTPUT_HANDLE) NtClose( GetStdHandle( STD_OUTPUT_HANDLE )); + if (console_flags & CONSOLE_ERROR_HANDLE) NtClose( GetStdHandle( STD_ERROR_HANDLE )); + console_flags = 0; + SERVER_START_REQ( free_console ) { ret = !wine_server_call_err( req );

1 0

Jacek Caban : kernelbase: Lock console critical section when changing current console.
by Alexandre Julliard July 30, 2020

July 30, 2020

Module: wine Branch: master Commit: e7550069ded02c1f8503a15e155127e1e2c26f6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7550069ded02c1f8503a15e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 30 17:15:45 2020 +0200 kernelbase: Lock console critical section when changing current console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 10b52df4e9..c3634c792f 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -178,6 +178,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH AttachConsole( DWORD pid ) TRACE( "(%x)\n", pid ); + RtlEnterCriticalSection( &console_section ); + SERVER_START_REQ( attach_console ) { req->pid = pid; @@ -189,6 +191,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH AttachConsole( DWORD pid ) } } SERVER_END_REQ; + + RtlLeaveCriticalSection( &console_section ); return ret; } @@ -211,11 +215,14 @@ BOOL WINAPI AllocConsole(void) TRACE("()\n"); + RtlEnterCriticalSection( &console_section ); + std_in = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); if (GetConsoleMode( std_in, &mode )) { /* we already have a console opened on this process, don't create a new one */ CloseHandle( std_in ); + RtlLeaveCriticalSection( &console_section ); return FALSE; } @@ -248,7 +255,7 @@ BOOL WINAPI AllocConsole(void) console_si.lpTitle = buffer; } - if (!(event = CreateEventW( &inheritable_attr, TRUE, FALSE, NULL ))) return FALSE; + if (!(event = CreateEventW( &inheritable_attr, TRUE, FALSE, NULL ))) goto error; swprintf( cmd, ARRAY_SIZE(cmd), L"wineconsole --use-event=%ld", (DWORD_PTR)event ); if ((ret = CreateProcessW( NULL, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &console_si, &pi ))) @@ -286,6 +293,7 @@ BOOL WINAPI AllocConsole(void) SetStdHandle( STD_INPUT_HANDLE, std_in ); SetStdHandle( STD_OUTPUT_HANDLE, std_out ); SetStdHandle( STD_ERROR_HANDLE, std_err ); + RtlLeaveCriticalSection( &console_section ); SetLastError( ERROR_SUCCESS ); return TRUE; @@ -295,6 +303,7 @@ error: if (std_out != INVALID_HANDLE_VALUE) CloseHandle(std_out); if (std_err != INVALID_HANDLE_VALUE) CloseHandle(std_err); FreeConsole(); + RtlLeaveCriticalSection( &console_section ); return FALSE; } @@ -468,12 +477,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) HANDLE event; BOOL ret; + RtlEnterCriticalSection( &console_section ); + SERVER_START_REQ( free_console ) { ret = !wine_server_call_err( req ); } SERVER_END_REQ; if ((event = InterlockedExchangePointer( &console_wait_event, NULL ))) NtClose( event ); + + RtlLeaveCriticalSection( &console_section ); return ret; }

1 0

Jacek Caban : kernel32/tests: Add more AllocConsole tests.
by Alexandre Julliard July 30, 2020

July 30, 2020

Module: wine Branch: master Commit: a09a268faeb29fb6cffd6e422843659793f09ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=a09a268faeb29fb6cffd6e42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 30 17:16:30 2020 +0200 kernel32/tests: Add more AllocConsole tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 106 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 47bfb8dbd3..c9b30e3b50 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3770,6 +3770,105 @@ static void test_AttachConsole(HANDLE console) ok(!memcmp(buf, "Child", 5), "Unexpected console output\n"); } +static void test_AllocConsole_child(void) +{ + HANDLE unbound_output; + HANDLE prev_output, prev_error; + STARTUPINFOW si; + DWORD mode; + BOOL res; + + GetStartupInfoW(&si); + + prev_output = GetStdHandle(STD_OUTPUT_HANDLE); + res = DuplicateHandle(GetCurrentProcess(), prev_output, GetCurrentProcess(), &unbound_output, + 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(res, "DuplicateHandle failed: %u\n", GetLastError()); + + res = GetConsoleMode(unbound_output, &mode); + ok(res, "GetConsoleMode failed: %u\n", GetLastError()); + + prev_error = GetStdHandle(STD_ERROR_HANDLE); + if (si.dwFlags & STARTF_USESTDHANDLES) + { + res = GetConsoleMode(prev_error, &mode); + ok(!res && GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode failed: %u\n", GetLastError()); + } + + FreeConsole(); + + ok(GetStdHandle(STD_OUTPUT_HANDLE) == prev_output, "GetStdHandle(STD_OUTPUT_HANDLE) = %p\n", GetStdHandle(STD_OUTPUT_HANDLE)); + ok(GetStdHandle(STD_ERROR_HANDLE) == prev_error, "GetStdHandle(STD_ERROR_HANDLE) = %p\n", GetStdHandle(STD_ERROR_HANDLE)); + res = GetConsoleMode(unbound_output, &mode); + todo_wine + ok(!res && GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode failed: %u\n", GetLastError()); + + res = AllocConsole(); + ok(res, "AllocConsole failed: %u\n", GetLastError()); + + if (si.dwFlags & STARTF_USESTDHANDLES) + { + ok(GetStdHandle(STD_OUTPUT_HANDLE) == prev_output, "GetStdHandle(STD_OUTPUT_HANDLE) = %p\n", GetStdHandle(STD_OUTPUT_HANDLE)); + ok(GetStdHandle(STD_ERROR_HANDLE) == prev_error, "GetStdHandle(STD_ERROR_HANDLE) = %p\n", GetStdHandle(STD_ERROR_HANDLE)); + } + + res = GetConsoleMode(unbound_output, &mode); + ok(res, "GetConsoleMode failed: %u\n", GetLastError()); + + FreeConsole(); + SetStdHandle(STD_OUTPUT_HANDLE, NULL); + SetStdHandle(STD_ERROR_HANDLE, NULL); + res = AllocConsole(); + ok(res, "AllocConsole failed: %u\n", GetLastError()); + + ok(GetStdHandle(STD_OUTPUT_HANDLE) != NULL, "GetStdHandle(STD_OUTPUT_HANDLE) = %p\n", GetStdHandle(STD_OUTPUT_HANDLE)); + ok(GetStdHandle(STD_ERROR_HANDLE) != NULL, "GetStdHandle(STD_ERROR_HANDLE) = %p\n", GetStdHandle(STD_ERROR_HANDLE)); + + res = GetConsoleMode(unbound_output, &mode); + ok(res, "GetConsoleMode failed: %u\n", GetLastError()); + res = GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &mode); + ok(res, "GetConsoleMode failed: %u\n", GetLastError()); + res = GetConsoleMode(GetStdHandle(STD_ERROR_HANDLE), &mode); + ok(res, "GetConsoleMode failed: %u\n", GetLastError()); + + res = CloseHandle(unbound_output); + ok(res, "CloseHandle failed: %u\n", GetLastError()); +} + +static void test_AllocConsole(void) +{ + SECURITY_ATTRIBUTES inheritable_attr = { sizeof(inheritable_attr), NULL, TRUE }; + STARTUPINFOA si = { sizeof(si) }; + PROCESS_INFORMATION info; + char **argv, buf[MAX_PATH]; + HANDLE pipe_read, pipe_write; + BOOL res; + + if (skip_nt) return; + + winetest_get_mainargs(&argv); + sprintf(buf, "\"%s\" console alloc_console", argv[0], GetCurrentProcessId()); + res = CreateProcessA(NULL, buf, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &info); + ok(res, "CreateProcess failed: %u\n", GetLastError()); + CloseHandle(info.hThread); + wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + + res = CreatePipe(&pipe_read, &pipe_write, &inheritable_attr, 0); + ok(res, "CreatePipe failed: %u\n", GetLastError()); + + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdError = pipe_write; + res = CreateProcessA(NULL, buf, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &info); + ok(res, "CreateProcess failed: %u\n", GetLastError()); + CloseHandle(info.hThread); + wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + + CloseHandle(pipe_read); + CloseHandle(pipe_write); +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -3796,6 +3895,12 @@ START_TEST(console) return; } + if (argc == 3 && !strcmp(argv[2], "alloc_console")) + { + test_AllocConsole_child(); + return; + } + /* be sure we have a clean console (and that's our own) * FIXME: this will make the test fail (currently) if we don't run * under X11 @@ -3938,5 +4043,6 @@ START_TEST(console) test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); test_AttachConsole(hConOut); + test_AllocConsole(); test_FreeConsole(); }

1 0

Gabriel Ivăncescu : ddraw/tests: Test non-primary video memory surface in test_lost_device().
by Alexandre Julliard July 30, 2020

July 30, 2020

Module: wine Branch: master Commit: 7e56c12c0f560fceb6dd7ac465ff63108c29f799 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e56c12c0f560fceb6dd7ac4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 30 17:00:27 2020 +0430 ddraw/tests: Test non-primary video memory surface in test_lost_device(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 99 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 99 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 104 +++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 104 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 402 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e56c12c0f560fceb6dd…

1 0

Gabriel Ivăncescu : ddraw: Return DDERR_WRONGMODE when attempting to restore surfaces of a lost device.
by Alexandre Julliard July 30, 2020

July 30, 2020

Module: wine Branch: master Commit: 6179ac14cbd80ab94d9ff7f3fee0866e7bc74479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6179ac14cbd80ab94d9ff7f3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 30 17:00:28 2020 +0430 ddraw: Return DDERR_WRONGMODE when attempting to restore surfaces of a lost device. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 +++++- dlls/ddraw/tests/ddraw1.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw2.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw4.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw7.c | 12 ++++++++++++ 5 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7b7f16e2a3..a5f032eabf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3785,9 +3785,13 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) } } + if (!ddraw_surface_can_be_lost(surface)) + return DD_OK; ddraw_update_lost_surfaces(surface->ddraw); - surface->is_lost = FALSE; + if (surface->ddraw->device_state == DDRAW_DEVICE_STATE_LOST) + return DDERR_WRONGMODE; + surface->is_lost = FALSE; for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) { if (surface->complex_array[i]) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2fc454a606..532065a479 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7381,12 +7381,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 311c7a159d..800dab0fe8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8334,12 +8334,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8eee655bba..d4f4f08e39 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9731,12 +9731,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface4_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 778b1738fa..5ea81903c4 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9489,12 +9489,24 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(sysmem_surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); if (vidmem_surface) { hr = IDirectDrawSurface7_IsLost(vidmem_surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(vidmem_surface); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(vidmem_surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); } ret = SetForegroundWindow(window1);

1 0

Zhiyi Zhang : winex11.drv: Migrate XRandR 1.0 display settings handler to a new interface.
by Alexandre Julliard July 30, 2020

July 30, 2020

Module: wine Branch: master Commit: 5491e939bc22f0ab479aec6b8a525be9c5ff5e35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5491e939bc22f0ab479aec6b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 27 16:01:15 2020 +0800 winex11.drv: Migrate XRandR 1.0 display settings handler to a new interface. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 278 ++++++++++++++++++++++++++-------------------- 1 file changed, 155 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5491e939bc22f0ab479a…

1 0

Zhiyi Zhang : winex11.drv: Remove the old display settings handler interface.
by Alexandre Julliard July 30, 2020

July 30, 2020

Module: wine Branch: master Commit: b45c04f4c352ef81df5312684008839f4eeee03d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b45c04f4c352ef81df531268… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 27 16:02:17 2020 +0800 winex11.drv: Remove the old display settings handler interface. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 228 -------------------------------------------- dlls/winex11.drv/x11drv.h | 16 ---- 2 files changed, 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b45c04f4c352ef81df53…

1 0