system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 19:49:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

server: Improve named pipe read error handling.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2018-08-08 22:00:48 +02:00 committed by Alexandre Julliard
parent 0973b8d2c3
commit 91852564dc
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/ntdll/tests/pipe.c
View file

@ -1338,7 +1338,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state)
break; break;
} }
status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL); status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL);
todo_wine_if(state == FILE_PIPE_DISCONNECTED_STATE && !is_server)
ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n", ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n",
is_server ? "server" : "client", state, status); is_server ? "server" : "client", state, status);
} }
@ -1427,7 +1426,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state)
if (state == FILE_PIPE_CLOSING_STATE) if (state == FILE_PIPE_CLOSING_STATE)
expected_status = STATUS_SUCCESS; expected_status = STATUS_SUCCESS;
status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL); status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL);
todo_wine_if(state == FILE_PIPE_DISCONNECTED_STATE && status != STATUS_PIPE_DISCONNECTED)
ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n", ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n",
is_server ? "server" : "client", state, status); is_server ? "server" : "client", state, status);
} }

12
server/named_pipe.c
View file

@ -798,8 +798,18 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos )
{ {
struct pipe_end *pipe_end = get_fd_user( fd ); struct pipe_end *pipe_end = get_fd_user( fd );
if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) switch (pipe_end->state)
{ {
case FILE_PIPE_CONNECTED_STATE:
break;
case FILE_PIPE_DISCONNECTED_STATE:
set_error( STATUS_PIPE_DISCONNECTED );
return 0;
case FILE_PIPE_LISTENING_STATE:
set_error( STATUS_PIPE_LISTENING );
return 0;
case FILE_PIPE_CLOSING_STATE:
if (!list_empty( &pipe_end->message_queue )) break;
set_error( STATUS_PIPE_BROKEN ); set_error( STATUS_PIPE_BROKEN );
return 0; return 0;
} }