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

Jacek Caban : kernel32/tests: Fix tests on some broken Windows versions.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 7531091f33dcd0dc849cfb5df918e9a331f7a6b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7531091f33dcd0dc849cfb5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:46:26 2020 +0200 kernel32/tests: Fix tests on some broken Windows versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3a374c7797..e6c88e8c73 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2255,9 +2255,9 @@ static void check_region_(unsigned int line, const SMALL_RECT *region, unsigned else ok_(__FILE__,line)(region->Right == -right || region->Right == region->Left - 1, "Right = %u, expected %d\n", region->Right, right); - if (bottom >= 0) + if (bottom > 0) ok_(__FILE__,line)(region->Bottom == bottom, "Bottom = %u, expected %u\n", region->Bottom, bottom); - else + else if (bottom < 0) ok_(__FILE__,line)(region->Bottom == -bottom || region->Bottom == region->Top - 1, "Bottom = %u, expected %d\n", region->Bottom, bottom); } @@ -2862,7 +2862,7 @@ static void test_ReadConsoleOutput(HANDLE console) set_region(&region, 200, 7, 15, 211); ret = ReadConsoleOutputW(console, char_info_buf, size, coord, &region); ok(!ret, "ReadConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); - check_region(&region, 200, 7, -15, -211); + check_region(&region, 200, 7, -15, 0); size.X = 23; size.Y = 17;

1 0

Jacek Caban : server: Introduce console server object.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 0267a04547770fe75147aa025e11045aca5c4ed9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0267a04547770fe75147aa02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:48:08 2020 +0200 server: Introduce console server object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/server/console.c b/server/console.c index 4509905c2c..670ee23ee7 100644 --- a/server/console.c +++ b/server/console.c @@ -178,6 +178,40 @@ static const struct fd_ops console_input_events_fd_ops = default_fd_reselect_async /* reselect_async */ }; +struct console_server +{ + struct object obj; /* object header */ +}; + +static void console_server_dump( struct object *obj, int verbose ); +static void console_server_destroy( struct object *obj ); +static int console_server_signaled( struct object *obj, struct wait_queue_entry *entry ); +static struct object *console_server_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); + +static const struct object_ops console_server_ops = +{ + sizeof(struct console_server), /* size */ + console_server_dump, /* dump */ + no_get_type, /* get_type */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + console_server_signaled, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + default_fd_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + console_server_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + fd_close_handle, /* close_handle */ + console_server_destroy /* destroy */ +}; + struct font_info { short int width; @@ -1469,6 +1503,38 @@ static void scroll_console_output( struct screen_buffer *screen_buffer, int xsrc console_input_events_append( screen_buffer->input, &evt ); } +static void console_server_dump( struct object *obj, int verbose ) +{ + assert( obj->ops == &console_server_ops ); + fprintf( stderr, "Console server\n" ); +} + +static void console_server_destroy( struct object *obj ) +{ + assert( obj->ops == &console_server_ops ); +} + +static int console_server_signaled( struct object *obj, struct wait_queue_entry *entry ) +{ + assert( obj->ops == &console_server_ops ); + return 0; +} + +static struct object *console_server_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + +static struct object *create_console_server( void ) +{ + struct console_server *server; + + if (!(server = alloc_object( &console_server_ops ))) return NULL; + + return &server->obj; +} + static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct console_input *console = get_fd_user( fd ); @@ -1901,6 +1967,7 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; static const WCHAR rendererW[] = {'R','e','n','d','e','r','e','r'}; static const WCHAR screen_bufferW[] = {'S','c','r','e','e','n','B','u','f','f','e','r'}; + static const WCHAR serverW[] = {'S','e','r','v','e','r'}; if (name->len == sizeof(current_inW) && !memcmp( name->str, current_inW, name->len )) { @@ -1947,6 +2014,12 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return create_console_output( current->process->console, -1 ); } + if (name->len == sizeof(serverW) && !memcmp( name->str, serverW, name->len )) + { + name->len = 0; + return create_console_server(); + } + return NULL; }

1 0

Jacek Caban : server: Support creating console reference from console server.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 5f0d268fffc741171fcf9006012c310128846de5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f0d268fffc741171fcf9006… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:48:21 2020 +0200 server: Support creating console reference from console server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index 670ee23ee7..148f9f1f9c 100644 --- a/server/console.c +++ b/server/console.c @@ -59,6 +59,7 @@ struct console_input int recnum; /* number of input records */ INPUT_RECORD *records; /* input records */ struct console_input_events *evt; /* synchronization event with renderer */ + struct console_server *server; /* console server object */ WCHAR *title; /* console title */ data_size_t title_len; /* length of console title */ struct history_line **history; /* lines history */ @@ -181,11 +182,13 @@ static const struct fd_ops console_input_events_fd_ops = struct console_server { struct object obj; /* object header */ + struct console_input *console; /* attached console */ }; static void console_server_dump( struct object *obj, int verbose ); static void console_server_destroy( struct object *obj ); static int console_server_signaled( struct object *obj, struct wait_queue_entry *entry ); +static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *console_server_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -203,7 +206,7 @@ static const struct object_ops console_server_ops = default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ - no_lookup_name, /* lookup_name */ + console_server_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ console_server_open_file, /* open_file */ @@ -485,6 +488,7 @@ static struct object *create_console_input( int fd ) console_input->recnum = 0; console_input->records = NULL; console_input->evt = NULL; + console_input->server = NULL; console_input->title = NULL; console_input->title_len = 0; console_input->history_size = 50; @@ -1148,6 +1152,13 @@ static void console_input_destroy( struct object *obj ) int i; assert( obj->ops == &console_input_ops ); + + if (console_in->server) + { + assert( console_in->server->console == console_in ); + console_in->server->console = NULL; + } + free( console_in->title ); free( console_in->records ); @@ -1511,13 +1522,51 @@ static void console_server_dump( struct object *obj, int verbose ) static void console_server_destroy( struct object *obj ) { + struct console_server *server = (struct console_server *)obj; assert( obj->ops == &console_server_ops ); + if (server->console) + { + assert( server->console->server == server ); + server->console->server = NULL; + } +} + +static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +{ + struct console_server *server = (struct console_server*)obj; + static const WCHAR referenceW[] = {'R','e','f','e','r','e','n','c','e'}; + assert( obj->ops == &console_server_ops ); + + if (name->len == sizeof(referenceW) && !memcmp( name->str, referenceW, name->len )) + { + struct screen_buffer *screen_buffer; + name->len = 0; + if (server->console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + if (!(server->console = (struct console_input *)create_console_input( -1 ))) return NULL; + if (!(screen_buffer = (struct screen_buffer *)create_console_output( server->console, -1 ))) + { + release_object( server->console ); + server->console = NULL; + return NULL; + } + release_object( screen_buffer ); + server->console->server = server; + + return &server->console->obj; + } + + return NULL; } static int console_server_signaled( struct object *obj, struct wait_queue_entry *entry ) { + struct console_server *server = (struct console_server*)obj; assert( obj->ops == &console_server_ops ); - return 0; + return !server->console; } static struct object *console_server_open_file( struct object *obj, unsigned int access, @@ -1531,6 +1580,7 @@ static struct object *create_console_server( void ) struct console_server *server; if (!(server = alloc_object( &console_server_ops ))) return NULL; + server->console = NULL; return &server->obj; }

1 0

Jacek Caban : kernelbase: Add CreatePseudoConsole implementation.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 7ea9f9edeed417a241d607bac282d68bdf5abd36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ea9f9edeed417a241d607ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:48:54 2020 +0200 kernelbase: Add CreatePseudoConsole implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 116 ++++++++++++++++++++++++++++++++++++++++++- dlls/kernelbase/kernelbase.h | 7 +++ 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index e5a9fbd501..cb85061fc9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -174,6 +174,40 @@ static COORD get_largest_console_window_size( HANDLE handle ) return c; } +static HANDLE create_console_server( void ) +{ + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + IO_STATUS_BLOCK iosb; + HANDLE handle; + NTSTATUS status; + + RtlInitUnicodeString( &string, L"\\Device\\ConDrv\\Server" ); + attr.ObjectName = &string; + attr.Attributes = OBJ_INHERIT; + status = NtCreateFile( &handle, FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | SYNCHRONIZE, + &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + return set_ntstatus( status ) ? handle : NULL; +} + +static HANDLE create_console_reference( HANDLE root ) +{ + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + IO_STATUS_BLOCK iosb; + HANDLE handle; + NTSTATUS status; + + RtlInitUnicodeString( &string, L"Reference" ); + attr.RootDirectory = root; + attr.ObjectName = &string; + status = NtCreateFile( &handle, FILE_READ_DATA | FILE_WRITE_DATA | FILE_WRITE_PROPERTIES | + FILE_READ_PROPERTIES | SYNCHRONIZE, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, + 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + return set_ntstatus( status ) ? handle : NULL; +} + static BOOL init_console_std_handles(void) { HANDLE std_out = NULL, std_err = NULL, handle; @@ -1578,13 +1612,91 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWS return ret; } +static HANDLE create_pseudo_console( COORD size, HANDLE input, HANDLE output, HANDLE signal, + DWORD flags, HANDLE *process ) +{ + WCHAR cmd[MAX_PATH], conhost_path[MAX_PATH]; + PROCESS_INFORMATION pi; + HANDLE server, console; + STARTUPINFOEXW si; + void *redir; + BOOL res; + + if (!(server = create_console_server())) return NULL; + + console = create_console_reference( server ); + if (!console) + { + NtClose( server ); + return NULL; + } + + memset( &si, 0, sizeof(si) ); + si.StartupInfo.cb = sizeof(STARTUPINFOEXW); + si.StartupInfo.hStdInput = input; + si.StartupInfo.hStdOutput = output; + si.StartupInfo.hStdError = output; + si.StartupInfo.dwFlags = STARTF_USESTDHANDLES; + swprintf( conhost_path, ARRAY_SIZE(conhost_path), L"%s\\conhost.exe", system_dir ); + swprintf( cmd, ARRAY_SIZE(cmd), + L"\"%s\" --headless %s--width %u --height %u --signal 0x%x --server 0x%x", + conhost_path, (flags & PSEUDOCONSOLE_INHERIT_CURSOR) ? L"--inheritcursor " : L"", + size.X, size.Y, signal, server ); + + Wow64DisableWow64FsRedirection( &redir ); + res = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, + &si.StartupInfo, &pi ); + Wow64RevertWow64FsRedirection( redir ); + NtClose( server ); + if (!res) + { + NtClose( console ); + return NULL; + } + + NtClose( pi.hThread ); + *process = pi.hProcess; + return console; +} + /****************************************************************************** * CreatePseudoConsole (kernelbase.@) */ HRESULT WINAPI CreatePseudoConsole( COORD size, HANDLE input, HANDLE output, DWORD flags, HPCON *ret ) { - FIXME( "(%u,%u) %p %p %x %p\n", size.X, size.Y, input, output, flags, ret ); - return E_NOTIMPL; + SECURITY_ATTRIBUTES inherit_attr = { sizeof(inherit_attr), NULL, TRUE }; + struct pseudo_console *pseudo_console; + HANDLE signal = NULL; + WCHAR pipe_name[64]; + + TRACE( "(%u,%u) %p %p %x %p\n", size.X, size.Y, input, output, flags, ret ); + + if (!size.X || !size.Y || !ret) return E_INVALIDARG; + + if (!(pseudo_console = HeapAlloc( GetProcessHeap(), 0, HEAP_ZERO_MEMORY ))) return E_OUTOFMEMORY; + + swprintf( pipe_name, ARRAY_SIZE(pipe_name), L"\\\\.\\pipe\\wine_pty_signal_pipe%x", + GetCurrentThreadId() ); + signal = CreateNamedPipeW( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE, + PIPE_UNLIMITED_INSTANCES, 4096, 4096, NMPWAIT_USE_DEFAULT_WAIT, &inherit_attr ); + if (signal == INVALID_HANDLE_VALUE) + { + HeapFree( GetProcessHeap(), 0, pseudo_console ); + return HRESULT_FROM_WIN32( GetLastError() ); + } + pseudo_console->signal = CreateFileW( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL ); + if (pseudo_console->signal != INVALID_HANDLE_VALUE) + pseudo_console->reference = create_pseudo_console( size, input, output, signal, flags, + &pseudo_console->process ); + NtClose( signal ); + if (!pseudo_console->reference) + { + ClosePseudoConsole( pseudo_console ); + return HRESULT_FROM_WIN32( GetLastError() ); + } + + *ret = pseudo_console; + return S_OK; } /****************************************************************************** diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index 59265bab2c..551542e572 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -24,6 +24,13 @@ #include "windef.h" #include "winbase.h" +struct pseudo_console +{ + HANDLE signal; + HANDLE reference; + HANDLE process; +}; + extern WCHAR *file_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; extern void init_startup_info( RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : kernelbase: Add ClosePseudoConsole implementation.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 0ec191eb0fd161e3bbd9e92270282d3d81e2cf11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ec191eb0fd161e3bbd9e922… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:49:00 2020 +0200 kernelbase: Add ClosePseudoConsole implementation. 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, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index cb85061fc9..42dc971227 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1704,7 +1704,18 @@ HRESULT WINAPI CreatePseudoConsole( COORD size, HANDLE input, HANDLE output, DWO */ void WINAPI ClosePseudoConsole( HPCON handle ) { - FIXME( "%p\n", handle ); + struct pseudo_console *pseudo_console = handle; + + TRACE( "%p\n", handle ); + + if (!pseudo_console) return; + if (pseudo_console->signal) CloseHandle( pseudo_console->signal ); + if (pseudo_console->process) + { + WaitForSingleObject( pseudo_console->process, INFINITE ); + CloseHandle( pseudo_console->process ); + } + if (pseudo_console->reference) CloseHandle( pseudo_console->reference ); } /******************************************************************************

1 0

Jacek Caban : kernel32/tests: Add CreatePseudoConsole tests.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 36663d9abd0fc085c1197429a78dfbe86c1dc56a URL: https://source.winehq.org/git/wine.git/?a=commit;h=36663d9abd0fc085c1197429… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:49:09 2020 +0200 kernel32/tests: Add CreatePseudoConsole tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e6c88e8c73..20dd66e70e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -24,6 +24,8 @@ #include <winternl.h> #include <stdio.h> +static void (WINAPI *pClosePseudoConsole)(HPCON); +static HRESULT (WINAPI *pCreatePseudoConsole)(COORD,HANDLE,HANDLE,DWORD,HPCON*); static BOOL (WINAPI *pGetConsoleInputExeNameA)(DWORD, LPSTR); static DWORD (WINAPI *pGetConsoleProcessList)(LPDWORD, DWORD); static HANDLE (WINAPI *pOpenConsoleW)(LPCWSTR,DWORD,BOOL,DWORD); @@ -68,6 +70,8 @@ static void init_function_pointers(void) if(!p##func) trace("GetProcAddress(hKernel32, '%s') failed\n", #func); hKernel32 = GetModuleHandleA("kernel32.dll"); + KERNEL32_GET_PROC(ClosePseudoConsole); + KERNEL32_GET_PROC(CreatePseudoConsole); KERNEL32_GET_PROC(GetConsoleInputExeNameA); KERNEL32_GET_PROC(GetConsoleProcessList); KERNEL32_GET_PROC(OpenConsoleW); @@ -3941,6 +3945,59 @@ static void test_AllocConsole(void) CloseHandle(pipe_write); } +static DWORD WINAPI read_pipe_proc( void *handle ) +{ + char buf[64]; + DWORD size; + while (ReadFile(handle, buf, sizeof(buf), &size, NULL)); + ok(GetLastError() == ERROR_BROKEN_PIPE, "ReadFile returned %u\n", GetLastError()); + CloseHandle(handle); + return 0; +} + +static void test_pseudo_console(void) +{ + HANDLE console_pipe, console_pipe2, thread; + HPCON pseudo_console; + COORD size; + HRESULT hres; + + if (!pCreatePseudoConsole) + { + win_skip("CreatePseudoConsole not available\n"); + return; + } + + console_pipe = CreateNamedPipeW(L"\\\\.\\pipe\\pseudoconsoleconn", PIPE_ACCESS_DUPLEX, + PIPE_WAIT | PIPE_TYPE_BYTE, 1, 4096, 4096, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(console_pipe != INVALID_HANDLE_VALUE, "CreateNamedPipeW failed: %u\n", GetLastError()); + + console_pipe2 = CreateFileW(L"\\\\.\\pipe\\pseudoconsoleconn", GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + ok(console_pipe2 != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + + thread = CreateThread( NULL, 0, read_pipe_proc, console_pipe, 0, NULL ); + CloseHandle(thread); + + size.X = 0; + size.Y = 30; + hres = pCreatePseudoConsole(size, console_pipe2, console_pipe2, 0, &pseudo_console); + ok(hres == E_INVALIDARG, "CreatePseudoConsole failed: %08x\n", hres); + + size.X = 40; + size.Y = 0; + hres = pCreatePseudoConsole(size, console_pipe2, console_pipe2, 0, &pseudo_console); + ok(hres == E_INVALIDARG, "CreatePseudoConsole failed: %08x\n", hres); + + size.X = 40; + size.Y = 30; + hres = pCreatePseudoConsole(size, console_pipe2, console_pipe2, 0, &pseudo_console); + ok(hres == S_OK, "CreatePseudoConsole failed: %08x\n", hres); + CloseHandle(console_pipe2); + + pClosePseudoConsole(pseudo_console); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -4123,5 +4180,6 @@ START_TEST(console) test_AttachConsole(hConOut); test_AllocConsole(); test_FreeConsole(); + test_pseudo_console(); } }

1 0

Jacek Caban : kernelbase: Support PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 76037ffbeefc7b15b764b4d6079bb6c939176523 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76037ffbeefc7b15b764b4d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:49:22 2020 +0200 kernelbase: Support PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/process.c | 12 ++++++++++++ dlls/kernelbase/process.c | 17 +++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 20dd66e70e..d568bac709 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3957,9 +3957,14 @@ static DWORD WINAPI read_pipe_proc( void *handle ) static void test_pseudo_console(void) { + STARTUPINFOEXA startup = {{ sizeof(startup) }}; HANDLE console_pipe, console_pipe2, thread; + char **argv, cmdline[MAX_PATH]; + PROCESS_INFORMATION info; HPCON pseudo_console; + SIZE_T attr_size; COORD size; + BOOL ret; HRESULT hres; if (!pCreatePseudoConsole) @@ -3995,6 +4000,22 @@ static void test_pseudo_console(void) ok(hres == S_OK, "CreatePseudoConsole failed: %08x\n", hres); CloseHandle(console_pipe2); + InitializeProcThreadAttributeList(NULL, 1, 0, &attr_size); + startup.lpAttributeList = HeapAlloc(GetProcessHeap(), 0, attr_size); + InitializeProcThreadAttributeList(startup.lpAttributeList, 1, 0, &attr_size); + UpdateProcThreadAttribute(startup.lpAttributeList, 0, PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE, pseudo_console, + sizeof(pseudo_console), NULL, NULL); + + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" %s --pseudo-console", argv[0], argv[1]); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, EXTENDED_STARTUPINFO_PRESENT, NULL, NULL, &startup.StartupInfo, &info); + ok(ret, "CreateProcessW failed: %u\n", GetLastError()); + + CloseHandle(info.hThread); + HeapFree(GetProcessHeap(), 0, startup.lpAttributeList); + wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + pClosePseudoConsole(pseudo_console); } @@ -4003,6 +4024,7 @@ START_TEST(console) HANDLE hConIn, hConOut; BOOL ret, test_current; CONSOLE_SCREEN_BUFFER_INFO sbi; + BOOL using_pseudo_console; DWORD size; char **argv; int argc; @@ -4026,8 +4048,9 @@ START_TEST(console) } test_current = argc >= 3 && !strcmp(argv[2], "--current"); + using_pseudo_console = argc >= 3 && !strcmp(argv[2], "--pseudo-console"); - if (!test_current) + if (!test_current && !using_pseudo_console) { static const char font_name[] = "Lucida Console"; HKEY console_key; @@ -4093,6 +4116,19 @@ START_TEST(console) ok(hConIn != INVALID_HANDLE_VALUE, "Opening ConIn\n"); ok(hConOut != INVALID_HANDLE_VALUE, "Opening ConOut\n"); + if (using_pseudo_console) + { + DWORD mode; + + ret = GetConsoleMode(hConIn, &mode); + ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); + todo_wine + ok(mode == (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | + ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION), + "mode = %x\n", mode); + return; + } + ret = GetConsoleScreenBufferInfo(hConOut, &sbi); ok(ret, "Getting sb info\n"); if (!ret) return; diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 3162ba3c53..b794c8f0c0 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3887,6 +3887,18 @@ static void test_ProcThreadAttributeList(void) expect_list.count++; } + ret = pUpdateProcThreadAttribute(&list, 0, PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE, handles, sizeof(PROCESSOR_NUMBER), NULL, NULL); + ok(ret || broken(GetLastError() == ERROR_NOT_SUPPORTED), "got %d gle %d\n", ret, GetLastError()); + + if (ret) + { + unsigned int i = expect_list.count++; + expect_list.mask |= 1 << ProcThreadAttributePseudoConsole; + expect_list.attrs[i].attr = PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE; + expect_list.attrs[i].size = sizeof(HPCON); + expect_list.attrs[i].value = handles; + } + ok(!memcmp(&list, &expect_list, size), "mismatch\n"); pDeleteProcThreadAttributeList(&list); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 0081b6bf9c..648174b2a7 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "wincontypes.h" #include "winternl.h" #include "kernelbase.h" @@ -568,6 +569,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR handle_list = &attrs->attrs[i]; TRACE("PROC_THREAD_ATTRIBUTE_HANDLE_LIST handle count %Iu.\n", attrs->attrs[i].size / sizeof(HANDLE)); break; + case PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE: + { + struct pseudo_console *console = attrs->attrs[i].value; + TRACE( "PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE %p reference %p\n", + console, console->reference ); + params->ConsoleHandle = console->reference; + break; + } default: FIXME("Unsupported attribute %#Ix.\n", attrs->attrs[i].attr); break; @@ -1730,6 +1739,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH UpdateProcThreadAttribute( struct _PROC_THREAD_ATT } break; + case PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE: + if (size != sizeof(HPCON)) + { + SetLastError( ERROR_BAD_LENGTH ); + return FALSE; + } + break; + default: SetLastError( ERROR_NOT_SUPPORTED ); FIXME( "Unhandled attribute %lu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER );

1 0

Jacek Caban : conhost: Add initial main loop implementation.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: e24ba09f8f35b146de178e492c8071d1923bfa88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e24ba09f8f35b146de178e49… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:49:46 2020 +0200 conhost: Add initial main loop implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 131 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 125 insertions(+), 6 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 706cb5e983..27283e415b 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -16,18 +16,137 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include <stdlib.h> +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winternl.h> + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(conhost); -int __cdecl wmain(int argc, WCHAR *argv[]) +struct console { - int i; + HANDLE server; /* console server handle */ +}; + +static int main_loop( struct console *console, HANDLE signal ) +{ + HANDLE signal_event = NULL; + HANDLE wait_handles[2]; + unsigned int wait_cnt = 0; + unsigned short signal_id; + IO_STATUS_BLOCK signal_io; + NTSTATUS status; + DWORD res; + + if (signal) + { + if (!(signal_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) return 1; + status = NtReadFile( signal, signal_event, NULL, NULL, &signal_io, &signal_id, + sizeof(signal_id), NULL, NULL ); + if (status && status != STATUS_PENDING) return 1; + } - WINE_FIXME("stub:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + wait_handles[wait_cnt++] = console->server; + if (signal) wait_handles[wait_cnt++] = signal_event; + + for (;;) + { + res = WaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE ); + + switch (res) + { + case WAIT_OBJECT_0: + FIXME( "console ioctls not yet implemented\n" ); + return 1; + + case WAIT_OBJECT_0 + 1: + if (signal_io.Status || signal_io.Information != sizeof(signal_id)) + { + TRACE( "signaled quit\n" ); + return 0; + } + FIXME( "unimplemented signal %x\n", signal_id ); + status = NtReadFile( signal, signal_event, NULL, NULL, &signal_io, &signal_id, + sizeof(signal_id), NULL, NULL ); + if (status && status != STATUS_PENDING) return 1; + break; + + default: + TRACE( "wait failed, quit\n"); + return 0; + } + } return 0; } + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int headless = 0, i, width = 80, height = 150; + HANDLE signal = NULL; + WCHAR *end; + + static struct console console; + + for (i = 0; i < argc; i++) TRACE("%s ", wine_dbgstr_w(argv[i])); + TRACE("\n"); + + for (i = 1; i < argc; i++) + { + if (!wcscmp( argv[i], L"--headless")) + { + headless = 1; + continue; + } + if (!wcscmp( argv[i], L"--width" )) + { + if (++i == argc) return 1; + width = wcstol( argv[i], &end, 0 ); + if (!width || width > 0xffff || *end) return 1; + continue; + } + if (!wcscmp( argv[i], L"--height" )) + { + if (++i == argc) return 1; + height = wcstol( argv[i], &end, 0 ); + if (!height || height > 0xffff || *end) return 1; + continue; + } + if (!wcscmp( argv[i], L"--signal" )) + { + if (++i == argc) return 1; + signal = ULongToHandle( wcstol( argv[i], &end, 0 )); + if (*end) return 1; + continue; + } + if (!wcscmp( argv[i], L"--server" )) + { + if (++i == argc) return 1; + console.server = ULongToHandle( wcstol( argv[i], &end, 0 )); + if (*end) return 1; + continue; + } + FIXME( "unknown option %s\n", debugstr_w(argv[i]) ); + return 1; + } + + if (!headless) + { + FIXME( "windowed mode not supported\n" ); + return 0; + } + + if (!console.server) + { + ERR( "no server handle\n" ); + return 1; + } + + return main_loop( &console, signal ); +}

1 0

Jacek Caban : server: Queue console ioctls for execution in host when console server is attached.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: d902c333066e57ba3587ffd72e6a2bf08f9319ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=d902c333066e57ba3587ffd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:50:20 2020 +0200 server: Queue console ioctls for execution in host when console server is attached. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 + server/console.c | 87 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 81 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d568bac709..42fd26efe5 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4121,6 +4121,7 @@ START_TEST(console) DWORD mode; ret = GetConsoleMode(hConIn, &mode); + todo_wine ok(ret, "GetConsoleMode failed: %u\n", GetLastError()); todo_wine ok(mode == (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | diff --git a/server/console.c b/server/console.c index 148f9f1f9c..96eab356fa 100644 --- a/server/console.c +++ b/server/console.c @@ -72,6 +72,7 @@ struct console_input user_handle_t win; /* window handle if backend supports it */ struct event *event; /* event to wait on for input queue */ struct fd *fd; /* for bare console, attached input fd */ + struct async_queue ioctl_q; /* ioctl queue */ struct async_queue read_q; /* read queue */ }; @@ -179,10 +180,18 @@ static const struct fd_ops console_input_events_fd_ops = default_fd_reselect_async /* reselect_async */ }; +struct console_host_ioctl +{ + unsigned int code; /* ioctl code */ + struct async *async; /* ioctl async */ + struct list entry; /* list entry */ +}; + struct console_server { struct object obj; /* object header */ struct console_input *console; /* attached console */ + struct list queue; /* ioctl queue */ }; static void console_server_dump( struct object *obj, int verbose ); @@ -501,6 +510,7 @@ static struct object *create_console_input( int fd ) console_input->win = 0; console_input->event = create_event( NULL, NULL, 0, 1, 0, NULL ); console_input->fd = NULL; + init_async_queue( &console_input->ioctl_q ); init_async_queue( &console_input->read_q ); if (!console_input->history || !console_input->event) @@ -529,6 +539,53 @@ static struct object *create_console_input( int fd ) return &console_input->obj; } +static void console_host_ioctl_terminate( struct console_host_ioctl *call, unsigned int status ) +{ + if (call->async) + { + async_terminate( call->async, status ); + release_object( call->async ); + } + free( call ); +} + +static int queue_host_ioctl( struct console_server *server, unsigned int code, + struct async *async, struct async_queue *queue ) +{ + struct console_host_ioctl *ioctl; + + if (!(ioctl = mem_alloc( sizeof(*ioctl) ))) return 0; + ioctl->code = code; + ioctl->async = NULL; + if (async) + { + ioctl->async = (struct async *)grab_object( async ); + queue_async( queue, async ); + } + list_add_tail( &server->queue, &ioctl->entry ); + wake_up( &server->obj, 0 ); + if (async) set_error( STATUS_PENDING ); + return 0; +} + +static void disconnect_console_server( struct console_server *server ) +{ + while (!list_empty( &server->queue )) + { + struct console_host_ioctl *call = LIST_ENTRY( list_head( &server->queue ), struct console_host_ioctl, entry ); + list_remove( &call->entry ); + console_host_ioctl_terminate( call, STATUS_CANCELLED ); + } + + if (server->console) + { + assert( server->console->server == server ); + server->console->server = NULL; + server->console = NULL; + wake_up( &server->obj, 0 ); + } +} + static void generate_sb_initial_events( struct console_input *console_input ) { struct screen_buffer *screen_buffer = console_input->active; @@ -1156,7 +1213,7 @@ static void console_input_destroy( struct object *obj ) if (console_in->server) { assert( console_in->server->console == console_in ); - console_in->server->console = NULL; + disconnect_console_server( console_in->server ); } free( console_in->title ); @@ -1170,6 +1227,7 @@ static void console_input_destroy( struct object *obj ) if (curr->input == console_in) curr->input = NULL; } + free_async_queue( &console_in->ioctl_q ); free_async_queue( &console_in->read_q ); if (console_in->evt) console_in->evt->console = NULL; @@ -1524,11 +1582,7 @@ static void console_server_destroy( struct object *obj ) { struct console_server *server = (struct console_server *)obj; assert( obj->ops == &console_server_ops ); - if (server->console) - { - assert( server->console->server == server ); - server->console->server = NULL; - } + disconnect_console_server( server ); } static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) @@ -1566,7 +1620,7 @@ static int console_server_signaled( struct object *obj, struct wait_queue_entry { struct console_server *server = (struct console_server*)obj; assert( obj->ops == &console_server_ops ); - return !server->console; + return !server->console || !list_empty( &server->queue ); } static struct object *console_server_open_file( struct object *obj, unsigned int access, @@ -1581,6 +1635,7 @@ static struct object *create_console_server( void ) if (!(server = alloc_object( &console_server_ops ))) return NULL; server->console = NULL; + list_init( &server->queue ); return &server->obj; } @@ -1592,6 +1647,8 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * switch (code) { case IOCTL_CONDRV_GET_MODE: + if (console->server) + return queue_host_ioctl( console->server, code, async, &console->ioctl_q ); if (get_reply_max_size() != sizeof(console->mode)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1600,6 +1657,8 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * return set_reply_data( &console->mode, sizeof(console->mode) ) != NULL; case IOCTL_CONDRV_SET_MODE: + if (console->server) + return queue_host_ioctl( console->server, code, async, &console->ioctl_q ); if (get_req_data_size() != sizeof(console->mode)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1611,6 +1670,8 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * case IOCTL_CONDRV_READ_INPUT: { int blocking = 0; + if (console->server) + return queue_host_ioctl( console->server, code, async, &console->ioctl_q ); if (get_reply_max_size() % sizeof(INPUT_RECORD)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1635,9 +1696,13 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * } case IOCTL_CONDRV_WRITE_INPUT: + if (console->server) + return queue_host_ioctl( console->server, code, async, &console->ioctl_q ); return write_console_input( console, get_req_data_size() / sizeof(INPUT_RECORD), get_req_data() ); case IOCTL_CONDRV_PEEK: + if (console->server) + return queue_host_ioctl( console->server, code, async, &console->ioctl_q ); if (get_reply_max_size() % sizeof(INPUT_RECORD)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1649,6 +1714,8 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * case IOCTL_CONDRV_GET_INPUT_INFO: { struct condrv_input_info info; + if (console->server) + return queue_host_ioctl( console->server, code, async, &console->ioctl_q ); if (get_reply_max_size() != sizeof(info)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1668,6 +1735,8 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * case IOCTL_CONDRV_SET_INPUT_INFO: { const struct condrv_input_info_params *params = get_req_data(); + if (console->server) + return queue_host_ioctl( console->server, code, async, &console->ioctl_q ); if (get_req_data_size() != sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER ); @@ -1725,6 +1794,8 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * } case IOCTL_CONDRV_GET_TITLE: + if (console->server) + return queue_host_ioctl( console->server, code, async, &console->ioctl_q ); if (!console->title_len) return 1; return set_reply_data( console->title, min( console->title_len, get_reply_max_size() )) != NULL; @@ -1734,6 +1805,8 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * struct condrv_renderer_event evt; WCHAR *title = NULL; + if (console->server) + return queue_host_ioctl( console->server, code, async, &console->ioctl_q ); if (len % sizeof(WCHAR)) { set_error( STATUS_INVALID_PARAMETER );

1 0

Jacek Caban : server: Introduce get_next_console_request request.
by Alexandre Julliard 21 Aug '20

21 Aug '20

Module: wine Branch: master Commit: 898e121b2e1628e91ebe9dee1c1cf8f959f7cd4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=898e121b2e1628e91ebe9dee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:50:47 2020 +0200 server: Introduce get_next_console_request request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 23 ++++++++++- server/console.c | 87 ++++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 13 +++++++ server/request.h | 9 +++++ server/trace.c | 18 +++++++++ 5 files changed, 149 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=898e121b2e1628e91ebe…

1 0