system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 11:14:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: Report named pipe device files as type "File".

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-08-16 19:36:03 -05:00 committed by Alexandre Julliard
parent 9012096b47
commit aaea13a128
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/ntdll/tests/om.c
View file

@ -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 );

2
server/named_pipe.c
View file

@ -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 */