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
584ffc23
Commit
584ffc23
authored
Aug 08, 2018
by
Jacek Caban
Committed by
Alexandre Julliard
Aug 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Don't use set_no_fd_status for error handling in pipe objects.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
41e39c6a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
24 deletions
+0
-24
pipe.c
dlls/ntdll/tests/pipe.c
+0
-2
fd.c
server/fd.c
+0
-6
file.h
server/file.h
+0
-1
named_pipe.c
server/named_pipe.c
+0
-15
No files found.
dlls/ntdll/tests/pipe.c
View file @
584ffc23
...
...
@@ -1481,14 +1481,12 @@ static void pipe_for_each_state(HANDLE (*create_server)(void),
ok
(
ret
,
"DisconnectNamedPipe failed: %u
\n
"
,
GetLastError
());
test
(
server
,
TRUE
,
FILE_PIPE_DISCONNECTED_STATE
);
if
(
broken
(
1
))
{
/* FIXME: Remove once Wine can handle this case */
status
=
listen_pipe
(
server
,
event
,
&
iosb
,
FALSE
);
ok
(
status
==
STATUS_PENDING
,
"listen_pipe returned %x
\n
"
,
status
);
client
=
connect_client
(
server
);
test
(
server
,
TRUE
,
FILE_PIPE_CONNECTED_STATE
);
test
(
client
,
FALSE
,
FILE_PIPE_CONNECTED_STATE
);
CloseHandle
(
client
);
}
CloseHandle
(
server
);
CloseHandle
(
event
);
...
...
server/fd.c
View file @
584ffc23
...
...
@@ -1713,12 +1713,6 @@ struct fd *get_fd_object_for_mapping( struct fd *fd, unsigned int access, unsign
return
NULL
;
}
/* set the status to return when the fd has no associated unix fd */
void
set_no_fd_status
(
struct
fd
*
fd
,
unsigned
int
status
)
{
fd
->
no_fd_status
=
status
;
}
/* sets the user of an fd that previously had no user */
void
set_fd_user
(
struct
fd
*
fd
,
const
struct
fd_ops
*
user_ops
,
struct
object
*
user
)
{
...
...
server/file.h
View file @
584ffc23
...
...
@@ -78,7 +78,6 @@ struct fd_ops
extern
struct
fd
*
alloc_pseudo_fd
(
const
struct
fd_ops
*
fd_user_ops
,
struct
object
*
user
,
unsigned
int
options
);
extern
void
set_no_fd_status
(
struct
fd
*
fd
,
unsigned
int
status
);
extern
struct
fd
*
open_fd
(
struct
fd
*
root
,
const
char
*
name
,
int
flags
,
mode_t
*
mode
,
unsigned
int
access
,
unsigned
int
sharing
,
unsigned
int
options
);
extern
struct
fd
*
create_anonymous_fd
(
const
struct
fd_ops
*
fd_user_ops
,
...
...
server/named_pipe.c
View file @
584ffc23
...
...
@@ -338,20 +338,6 @@ static struct fd *pipe_end_get_fd( struct object *obj )
static
void
set_server_state
(
struct
pipe_server
*
server
,
enum
pipe_state
state
)
{
server
->
state
=
state
;
switch
(
state
)
{
case
ps_connected_server
:
case
ps_wait_disconnect
:
break
;
case
ps_wait_open
:
case
ps_idle_server
:
set_no_fd_status
(
server
->
pipe_end
.
fd
,
STATUS_PIPE_LISTENING
);
break
;
case
ps_wait_connect
:
set_no_fd_status
(
server
->
pipe_end
.
fd
,
STATUS_PIPE_DISCONNECTED
);
break
;
}
}
...
...
@@ -1232,7 +1218,6 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc
if
((
client
=
create_pipe_client
(
options
,
pipe
->
flags
,
pipe
->
outsize
,
options
)))
{
set_no_fd_status
(
server
->
pipe_end
.
fd
,
STATUS_BAD_DEVICE_TYPE
);
allow_fd_caching
(
server
->
pipe_end
.
fd
);
if
(
server
->
state
==
ps_wait_open
)
fd_async_wake_up
(
server
->
pipe_end
.
fd
,
ASYNC_TYPE_WAIT
,
STATUS_SUCCESS
);
...
...
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