September 2020 - Wine-devel

[PATCH 1/3] server: Report named pipe device files as type "File".
by Zebediah Figura 21 Sep '20

21 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/om.c | 10 ++++------ server/named_pipe.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 29c777e91e6..916ac8cbe76 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1227,9 +1227,8 @@ static BOOL compare_unicode_string( const UNICODE_STRING *string, const WCHAR *e && !wcsnicmp( string->Buffer, expect, string->Length / sizeof(WCHAR) ); } -#define test_object_type(a,b) _test_object_type(__LINE__,a,b,FALSE) -#define test_object_type_todo(a,b) _test_object_type(__LINE__,a,b,TRUE) -static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expected_name, BOOL todo ) +#define test_object_type(a,b) _test_object_type(__LINE__,a,b) +static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expected_name ) { char buffer[1024]; UNICODE_STRING *str = (UNICODE_STRING *)buffer, expect; @@ -1243,8 +1242,7 @@ static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expect ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); ok_(__FILE__,line)( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); ok_(__FILE__,line)( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length, "unexpected len %u\n", len ); - todo_wine_if (todo) - ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer )); + ok_(__FILE__,line)(compare_unicode_string( str, expected_name ), "wrong name %s\n", debugstr_w( str->Buffer )); } #define test_object_name(a,b,c) _test_object_name(__LINE__,a,b,c) @@ -1463,7 +1461,7 @@ static void test_query_object(void) ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); test_object_name( handle, L"\\Device\\NamedPipe", TRUE ); - test_object_type_todo( handle, L"File" ); + test_object_type( handle, L"File" ); test_file_info( handle ); pNtClose( handle ); diff --git a/server/named_pipe.c b/server/named_pipe.c index b259abb8de4..e7e5436c0e5 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -273,7 +273,7 @@ static const struct object_ops named_pipe_device_file_ops = { sizeof(struct named_pipe_device_file), /* size */ named_pipe_device_file_dump, /* dump */ - no_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ -- 2.27.0

3 4

[PATCH 13/14] kernelbase: Use conhost to handle Unix consoles.
by Jacek Caban 21 Sep '20

21 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 60 +++++++++++++++++++++++++++++++++++---- dlls/ntdll/unix/env.c | 29 +++++++++++++++---- 2 files changed, 77 insertions(+), 12 deletions(-)

1 0

[PATCH 12/14] ntdll: Fill console size in get_initial_console.
by Jacek Caban 21 Sep '20

21 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/env.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)

1 0

[PATCH 11/14] ntdll: Pass RTL_USER_PROCESS_PARAMETERS to get_initial_console.
by Jacek Caban 21 Sep '20

21 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/env.c | 3 +-- dlls/ntdll/unix/env.c | 12 ++++++------ dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 5 ++--- include/wine/condrv.h | 1 + 5 files changed, 11 insertions(+), 12 deletions(-)

1 0

[PATCH 10/14] kernelbase: Move force override logic to init_console_std_handles callers.
by Jacek Caban 21 Sep '20

21 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)

1 0

[PATCH 09/14] conhost: Use IOCTL_CONDRV_SETUP_INPUT to initialize input in Unix mode.
by Jacek Caban 21 Sep '20

21 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)

1 0

[PATCH 08/14] server: Introduce IOCTL_CONDRV_SETUP_INPUT ioctl.
by Jacek Caban 21 Sep '20

21 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 5 +++- server/console.c | 59 +++++++++++++++++++++++++++++++++++++++++++ server/trace.c | 1 + 3 files changed, 64 insertions(+), 1 deletion(-)

1 0

[PATCH 07/14] conhost: Delay creating input thread in Unix mode.
by Jacek Caban 21 Sep '20

21 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)

1 0

[PATCH 06/14] conhost: Force using relative cursor positioning in update_read_output.
by Jacek Caban 21 Sep '20

21 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)

1 0

[PATCH 05/14] conhost: Use CP_UNIXCP in Unix mode.
by Jacek Caban 21 Sep '20

21 Sep '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)

1 0