Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
aaea13a1
Commit
aaea13a1
authored
Aug 16, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Aug 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Report named pipe device files as type "File".
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9012096b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
om.c
dlls/ntdll/tests/om.c
+3
-5
named_pipe.c
server/named_pipe.c
+1
-1
No files found.
dlls/ntdll/tests/om.c
View file @
aaea13a1
...
@@ -1227,9 +1227,8 @@ static BOOL compare_unicode_string( const UNICODE_STRING *string, const WCHAR *e
...
@@ -1227,9 +1227,8 @@ static BOOL compare_unicode_string( const UNICODE_STRING *string, const WCHAR *e
&&
!
wcsnicmp
(
string
->
Buffer
,
expect
,
string
->
Length
/
sizeof
(
WCHAR
)
);
&&
!
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(a,b) _test_object_type(__LINE__,a,b)
#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
)
static
void
_test_object_type
(
unsigned
line
,
HANDLE
handle
,
const
WCHAR
*
expected_name
,
BOOL
todo
)
{
{
char
buffer
[
1024
];
char
buffer
[
1024
];
UNICODE_STRING
*
str
=
(
UNICODE_STRING
*
)
buffer
,
expect
;
UNICODE_STRING
*
str
=
(
UNICODE_STRING
*
)
buffer
,
expect
;
...
@@ -1243,7 +1242,6 @@ static void _test_object_type( unsigned line, HANDLE handle, const WCHAR *expect
...
@@ -1243,7 +1242,6 @@ 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
)(
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
(
UNICODE_STRING
),
"unexpected len %u
\n
"
,
len
);
ok_
(
__FILE__
,
line
)(
len
>=
sizeof
(
OBJECT_TYPE_INFORMATION
)
+
str
->
Length
,
"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
));
}
}
...
@@ -1463,7 +1461,7 @@ static void test_query_object(void)
...
@@ -1463,7 +1461,7 @@ static void test_query_object(void)
ok
(
handle
!=
INVALID_HANDLE_VALUE
,
"CreateFile failed (%d)
\n
"
,
GetLastError
()
);
ok
(
handle
!=
INVALID_HANDLE_VALUE
,
"CreateFile failed (%d)
\n
"
,
GetLastError
()
);
test_object_name
(
handle
,
L"
\\
Device
\\
NamedPipe"
,
TRUE
);
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
);
test_file_info
(
handle
);
pNtClose
(
handle
);
pNtClose
(
handle
);
...
...
server/named_pipe.c
View file @
aaea13a1
...
@@ -273,7 +273,7 @@ static const struct object_ops named_pipe_device_file_ops =
...
@@ -273,7 +273,7 @@ static const struct object_ops named_pipe_device_file_ops =
{
{
sizeof
(
struct
named_pipe_device_file
),
/* size */
sizeof
(
struct
named_pipe_device_file
),
/* size */
named_pipe_device_file_dump
,
/* dump */
named_pipe_device_file_dump
,
/* dump */
no_get_type
,
/* get_type */
file_get_type
,
/* get_type */
add_queue
,
/* add_queue */
add_queue
,
/* add_queue */
remove_queue
,
/* remove_queue */
remove_queue
,
/* remove_queue */
default_fd_signaled
,
/* signaled */
default_fd_signaled
,
/* signaled */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment