Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
1b9db994
Commit
1b9db994
authored
Feb 21, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Return the correct IOSB information when creating a named pipe.
parent
d74b084e
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
7 deletions
+11
-7
om.c
dlls/ntdll/tests/om.c
+0
-4
file.c
dlls/ntdll/unix/file.c
+5
-1
server_protocol.h
include/wine/server_protocol.h
+2
-2
named_pipe.c
server/named_pipe.c
+1
-0
protocol.def
server/protocol.def
+1
-0
request.h
server/request.h
+1
-0
trace.c
server/trace.c
+1
-0
No files found.
dlls/ntdll/tests/om.c
View file @
1b9db994
...
@@ -379,7 +379,6 @@ static void test_name_collisions(void)
...
@@ -379,7 +379,6 @@ static void test_name_collisions(void)
FILE_OPEN_IF
,
FILE_PIPE_FULL_DUPLEX
,
FILE_OPEN_IF
,
FILE_PIPE_FULL_DUPLEX
,
FALSE
,
FALSE
,
FALSE
,
10
,
256
,
256
,
&
timeout
);
FALSE
,
FALSE
,
FALSE
,
10
,
256
,
256
,
&
timeout
);
ok
(
status
==
STATUS_SUCCESS
,
"failed to create pipe %08lx
\n
"
,
status
);
ok
(
status
==
STATUS_SUCCESS
,
"failed to create pipe %08lx
\n
"
,
status
);
todo_wine
ok
(
iosb
.
Information
==
FILE_CREATED
,
"wrong info %Ix
\n
"
,
iosb
.
Information
);
ok
(
iosb
.
Information
==
FILE_CREATED
,
"wrong info %Ix
\n
"
,
iosb
.
Information
);
pNtClose
(
h
);
pNtClose
(
h
);
...
@@ -389,7 +388,6 @@ static void test_name_collisions(void)
...
@@ -389,7 +388,6 @@ static void test_name_collisions(void)
FILE_CREATE
,
FILE_PIPE_FULL_DUPLEX
,
FILE_CREATE
,
FILE_PIPE_FULL_DUPLEX
,
FALSE
,
FALSE
,
FALSE
,
10
,
256
,
256
,
&
timeout
);
FALSE
,
FALSE
,
FALSE
,
10
,
256
,
256
,
&
timeout
);
ok
(
status
==
STATUS_SUCCESS
,
"failed to create pipe %08lx
\n
"
,
status
);
ok
(
status
==
STATUS_SUCCESS
,
"failed to create pipe %08lx
\n
"
,
status
);
todo_wine
ok
(
iosb
.
Information
==
FILE_CREATED
,
"wrong info %Ix
\n
"
,
iosb
.
Information
);
ok
(
iosb
.
Information
==
FILE_CREATED
,
"wrong info %Ix
\n
"
,
iosb
.
Information
);
memset
(
&
iosb
,
0xcc
,
sizeof
(
iosb
)
);
memset
(
&
iosb
,
0xcc
,
sizeof
(
iosb
)
);
...
@@ -398,7 +396,6 @@ static void test_name_collisions(void)
...
@@ -398,7 +396,6 @@ static void test_name_collisions(void)
FILE_OPEN
,
FILE_PIPE_FULL_DUPLEX
,
FILE_OPEN
,
FILE_PIPE_FULL_DUPLEX
,
FALSE
,
FALSE
,
FALSE
,
10
,
256
,
256
,
&
timeout
);
FALSE
,
FALSE
,
FALSE
,
10
,
256
,
256
,
&
timeout
);
ok
(
status
==
STATUS_SUCCESS
,
"failed to create pipe %08lx
\n
"
,
status
);
ok
(
status
==
STATUS_SUCCESS
,
"failed to create pipe %08lx
\n
"
,
status
);
todo_wine
ok
(
iosb
.
Information
==
FILE_OPENED
,
"wrong info %Ix
\n
"
,
iosb
.
Information
);
ok
(
iosb
.
Information
==
FILE_OPENED
,
"wrong info %Ix
\n
"
,
iosb
.
Information
);
pNtClose
(
h1
);
pNtClose
(
h1
);
...
@@ -408,7 +405,6 @@ static void test_name_collisions(void)
...
@@ -408,7 +405,6 @@ static void test_name_collisions(void)
FILE_OPEN_IF
,
FILE_PIPE_FULL_DUPLEX
,
FILE_OPEN_IF
,
FILE_PIPE_FULL_DUPLEX
,
FALSE
,
FALSE
,
FALSE
,
10
,
256
,
256
,
&
timeout
);
FALSE
,
FALSE
,
FALSE
,
10
,
256
,
256
,
&
timeout
);
ok
(
status
==
STATUS_SUCCESS
,
"failed to create pipe %08lx
\n
"
,
status
);
ok
(
status
==
STATUS_SUCCESS
,
"failed to create pipe %08lx
\n
"
,
status
);
todo_wine
ok
(
iosb
.
Information
==
FILE_OPENED
,
"wrong info %Ix
\n
"
,
iosb
.
Information
);
ok
(
iosb
.
Information
==
FILE_OPENED
,
"wrong info %Ix
\n
"
,
iosb
.
Information
);
pNtClose
(
h1
);
pNtClose
(
h1
);
...
...
dlls/ntdll/unix/file.c
View file @
1b9db994
...
@@ -4144,7 +4144,11 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTR
...
@@ -4144,7 +4144,11 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTR
req
->
insize
=
inbound_quota
;
req
->
insize
=
inbound_quota
;
req
->
timeout
=
timeout
->
QuadPart
;
req
->
timeout
=
timeout
->
QuadPart
;
wine_server_add_data
(
req
,
objattr
,
len
);
wine_server_add_data
(
req
,
objattr
,
len
);
if
(
!
(
status
=
wine_server_call
(
req
)))
*
handle
=
wine_server_ptr_handle
(
reply
->
handle
);
if
(
!
(
status
=
wine_server_call
(
req
)))
{
*
handle
=
wine_server_ptr_handle
(
reply
->
handle
);
io
->
Information
=
reply
->
created
?
FILE_CREATED
:
FILE_OPENED
;
}
}
}
SERVER_END_REQ
;
SERVER_END_REQ
;
...
...
include/wine/server_protocol.h
View file @
1b9db994
...
@@ -3086,7 +3086,7 @@ struct create_named_pipe_reply
...
@@ -3086,7 +3086,7 @@ struct create_named_pipe_reply
{
{
struct
reply_header
__header
;
struct
reply_header
__header
;
obj_handle_t
handle
;
obj_handle_t
handle
;
char
__pad_12
[
4
]
;
int
created
;
};
};
...
@@ -6356,7 +6356,7 @@ union generic_reply
...
@@ -6356,7 +6356,7 @@ union generic_reply
/* ### protocol_version begin ### */
/* ### protocol_version begin ### */
#define SERVER_PROTOCOL_VERSION 7
59
#define SERVER_PROTOCOL_VERSION 7
60
/* ### protocol_version end ### */
/* ### protocol_version end ### */
...
...
server/named_pipe.c
View file @
1b9db994
...
@@ -1437,6 +1437,7 @@ DECL_HANDLER(create_named_pipe)
...
@@ -1437,6 +1437,7 @@ DECL_HANDLER(create_named_pipe)
GROUP_SECURITY_INFORMATION
|
GROUP_SECURITY_INFORMATION
|
DACL_SECURITY_INFORMATION
|
DACL_SECURITY_INFORMATION
|
SACL_SECURITY_INFORMATION
);
SACL_SECURITY_INFORMATION
);
reply
->
created
=
1
;
}
}
else
else
{
{
...
...
server/protocol.def
View file @
1b9db994
...
@@ -2279,6 +2279,7 @@ enum message_type
...
@@ -2279,6 +2279,7 @@ enum message_type
VARARG(objattr,object_attributes); /* object attributes */
VARARG(objattr,object_attributes); /* object attributes */
@REPLY
@REPLY
obj_handle_t handle; /* handle to the pipe */
obj_handle_t handle; /* handle to the pipe */
int created;
@END
@END
/* flags in create_named_pipe and get_named_pipe_info */
/* flags in create_named_pipe and get_named_pipe_info */
...
...
server/request.h
View file @
1b9db994
...
@@ -1459,6 +1459,7 @@ C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, timeout) == 40 );
...
@@ -1459,6 +1459,7 @@ C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, timeout) == 40 );
C_ASSERT
(
FIELD_OFFSET
(
struct
create_named_pipe_request
,
flags
)
==
48
);
C_ASSERT
(
FIELD_OFFSET
(
struct
create_named_pipe_request
,
flags
)
==
48
);
C_ASSERT
(
sizeof
(
struct
create_named_pipe_request
)
==
56
);
C_ASSERT
(
sizeof
(
struct
create_named_pipe_request
)
==
56
);
C_ASSERT
(
FIELD_OFFSET
(
struct
create_named_pipe_reply
,
handle
)
==
8
);
C_ASSERT
(
FIELD_OFFSET
(
struct
create_named_pipe_reply
,
handle
)
==
8
);
C_ASSERT
(
FIELD_OFFSET
(
struct
create_named_pipe_reply
,
created
)
==
12
);
C_ASSERT
(
sizeof
(
struct
create_named_pipe_reply
)
==
16
);
C_ASSERT
(
sizeof
(
struct
create_named_pipe_reply
)
==
16
);
C_ASSERT
(
FIELD_OFFSET
(
struct
set_named_pipe_info_request
,
handle
)
==
12
);
C_ASSERT
(
FIELD_OFFSET
(
struct
set_named_pipe_info_request
,
handle
)
==
12
);
C_ASSERT
(
FIELD_OFFSET
(
struct
set_named_pipe_info_request
,
flags
)
==
16
);
C_ASSERT
(
FIELD_OFFSET
(
struct
set_named_pipe_info_request
,
flags
)
==
16
);
...
...
server/trace.c
View file @
1b9db994
...
@@ -2873,6 +2873,7 @@ static void dump_create_named_pipe_request( const struct create_named_pipe_reque
...
@@ -2873,6 +2873,7 @@ static void dump_create_named_pipe_request( const struct create_named_pipe_reque
static
void
dump_create_named_pipe_reply
(
const
struct
create_named_pipe_reply
*
req
)
static
void
dump_create_named_pipe_reply
(
const
struct
create_named_pipe_reply
*
req
)
{
{
fprintf
(
stderr
,
" handle=%04x"
,
req
->
handle
);
fprintf
(
stderr
,
" handle=%04x"
,
req
->
handle
);
fprintf
(
stderr
,
", created=%d"
,
req
->
created
);
}
}
static
void
dump_set_named_pipe_info_request
(
const
struct
set_named_pipe_info_request
*
req
)
static
void
dump_set_named_pipe_info_request
(
const
struct
set_named_pipe_info_request
*
req
)
...
...
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