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

Jacek Caban : conhost: Add initial main loop implementation.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

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 : kernelbase: Support PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

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 : kernelbase: Add CreatePseudoConsole implementation.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

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 : server: Support creating console reference from console server.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

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

Martin Storsjo : include: Update ARM64 context flag definitions to match current SDKs.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

Module: wine Branch: master Commit: 5b3842451ba6c7a37a24e0f16707d8a19020287d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b3842451ba6c7a37a24e0f1… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 21 15:02:03 2020 +0300 include: Update ARM64 context flag definitions to match current SDKs. CONTEXT_FLOATING_POINT should be included in CONTEXT_FULL, and there's a new flag CONTEXT_ARM64_X18 (not available without the arch specific prefix) that only is part of CONTEXT_ALL. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 7 ++++--- include/winnt.h | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index e3102f7bdf..134e40545f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -97,7 +97,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "mov x1, sp\n\t" "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ - "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ + "movk w1, #0x7\n\t" /* CONTEXT_FULL */ "str w1, [x0]\n\t" /* context->ContextFlags */ "mrs x1, NZCV\n\t" "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 52f00323a0..a4454af71e 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -311,7 +311,8 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) { DWORD i; - context->ContextFlags = CONTEXT_FULL; + context->ContextFlags = (CONTEXT_FULL & ~CONTEXT_FLOATING_POINT) | + CONTEXT_ARM64; context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ context->u.s.Lr = LR_sig(sigcontext); /* Link register */ context->Sp = SP_sig(sigcontext); /* Stack pointer */ @@ -664,7 +665,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "csel x0, x19, x0, lo\n\t" "mov sp, x0\n\t" "mov w2, #0x400000\n\t" /* context.ContextFlags = CONTEXT_FULL */ - "movk w2, #3\n\t" + "movk w2, #7\n\t" "mov x1, x19\n\t" "str w2, [x19]\n\t" "mov x0, #~1\n\t" @@ -1039,7 +1040,7 @@ PCONTEXT DECLSPEC_HIDDEN get_initial_context( LPTHREAD_START_ROUTINE entry, void init_thread_context( ctx, entry, arg, relay ); } pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); - ctx->ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT; + ctx->ContextFlags = CONTEXT_FULL; return ctx; } diff --git a/include/winnt.h b/include/winnt.h index 8c5f24aff8..63567ba62e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1928,11 +1928,12 @@ NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,DWORD,DWORD,RUNTIME_FUNCTION*,CONTE #define CONTEXT_INTEGER (CONTEXT_ARM64 | 0x00000002) #define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x00000004) #define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x00000008) +#define CONTEXT_ARM64_X18 (CONTEXT_ARM64 | 0x00000010) #define CONTEXT_UNWOUND_TO_CALL 0x20000000 -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) -#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_ARM64_X18) #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1

1 0

Jacek Caban : server: Introduce get_next_console_request request.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

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

Jacek Caban : kernelbase: Add ClosePseudoConsole implementation.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

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 : conhost: Implement IOCTL_CONDRV_GET_MODE.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

Module: wine Branch: master Commit: 3c9d10d756746ea21ec83f78de42ede871a0222a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9d10d756746ea21ec83f78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 20 23:51:17 2020 +0200 conhost: Implement IOCTL_CONDRV_GET_MODE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 -- programs/conhost/conhost.c | 24 ++++++++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 42fd26efe5..b45e707ac8 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4121,9 +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 | ENABLE_INSERT_MODE | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION), "mode = %x\n", mode); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 2014ca2260..dae30d1576 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -25,6 +25,7 @@ #include <winuser.h> #include <winternl.h> +#include "wine/condrv.h" #include "wine/server.h" #include "wine/debug.h" @@ -33,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(conhost); struct console { HANDLE server; /* console server handle */ + unsigned int mode; /* input mode */ }; static void *ioctl_buffer; @@ -53,8 +55,22 @@ static void *alloc_ioctl_buffer( size_t size ) static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const void *in_data, size_t in_size, size_t *out_size ) { - FIXME( "unsupported ioctl %x\n", code ); - return STATUS_NOT_SUPPORTED; + switch (code) + { + case IOCTL_CONDRV_GET_MODE: + { + DWORD *mode; + TRACE( "returning mode %x\n", console->mode ); + if (in_size || *out_size != sizeof(*mode)) return STATUS_INVALID_PARAMETER; + if (!(mode = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; + *mode = console->mode; + return STATUS_SUCCESS; + } + + default: + FIXME( "unsupported ioctl %x\n", code ); + return STATUS_NOT_SUPPORTED; + } } static NTSTATUS process_console_ioctls( struct console *console ) @@ -162,6 +178,10 @@ int __cdecl wmain(int argc, WCHAR *argv[]) for (i = 0; i < argc; i++) TRACE("%s ", wine_dbgstr_w(argv[i])); TRACE("\n"); + console.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; + for (i = 1; i < argc; i++) { if (!wcscmp( argv[i], L"--headless"))

1 0

Nikolay Sivov : ole32: Use public symbol for maximum moniker comparison data length.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

Module: wine Branch: master Commit: d3502f92c035d2b8ef4f206ac724f3f63e8cb16b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3502f92c035d2b8ef4f206a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 21 11:38:19 2020 +0300 ole32: Use public symbol for maximum moniker comparison data length. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/moniker.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index e0cdd865c8..4421219ac1 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -44,11 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -/* see MSDN docs for IROTData::GetComparisonData, which states what this - * constant is - */ -#define MAX_COMPARISON_DATA 2048 - static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *eptr) { return I_RpcExceptionFilter(eptr->ExceptionRecord->ExceptionCode); @@ -245,7 +240,7 @@ static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MonikerComparison hr = IMoniker_QueryInterface(pMoniker, &IID_IROTData, (void *)&pROTData); if (SUCCEEDED(hr)) { - ULONG size = MAX_COMPARISON_DATA; + ULONG size = ROT_COMPARE_MAX; *moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MonikerComparisonData, abData[size])); if (!*moniker_data) {

1 0

Nikolay Sivov : combase: Move CoGetCurrentProcess().
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

Module: wine Branch: master Commit: a1ff0d9b78fcfa6130b90d6b822c170e6d1d4980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1ff0d9b78fcfa6130b90d6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 21 11:37:20 2020 +0300 combase: Move CoGetCurrentProcess(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 4 + dlls/combase/combase.c | 16 ++++ dlls/combase/combase.spec | 2 +- dlls/combase/combase_private.h | 3 + dlls/{ole32 => combase}/irpcss.idl | 0 dlls/combase/rpc.c | 155 +++++++++++++++++++++++++++++++++++++ dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 16 ---- dlls/ole32/compobj_private.h | 2 - dlls/ole32/moniker.c | 44 ----------- dlls/ole32/ole32.spec | 2 +- 11 files changed, 180 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1ff0d9b78fcfa6130b9…

1 0