ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Use pipe_end state in FSCTL_PIPE_LISTEN implementation. 

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-17 17:40:44 +02:00 committed by Alexandre Julliard
parent cd1c681ee7
commit 290320a8fe
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ntdll/tests/pipe.c
View File

@ -1341,6 +1341,14 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state)
ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n",
is_server ? "server" : "client", state, status);
}
if (is_server && (state == FILE_PIPE_CLOSING_STATE || state == FILE_PIPE_CONNECTED_STATE))
{
memset(&io, 0xcc, sizeof(io));
status = listen_pipe(pipe, NULL, &io, FALSE);
ok(status == (state == FILE_PIPE_CLOSING_STATE ? STATUS_PIPE_CLOSING : STATUS_PIPE_CONNECTED),
"status = %x in %u state\n", status, state);
}
}
static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state)

34
server/named_pipe.c
View File

@ -990,27 +990,25 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as
switch(code)
{
case FSCTL_PIPE_LISTEN:
switch(server->state)
switch(server->pipe_end.state)
{
case ps_idle_server:
case ps_wait_connect:
fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT );
server->pipe_end.state = FILE_PIPE_LISTENING_STATE;
set_server_state( server, ps_wait_open );
async_wake_up( &server->pipe_end.pipe->waiters, STATUS_SUCCESS );
set_error( STATUS_PENDING );
return 1;
case ps_connected_server:
case FILE_PIPE_LISTENING_STATE:
case FILE_PIPE_DISCONNECTED_STATE:
break;
case FILE_PIPE_CONNECTED_STATE:
set_error( STATUS_PIPE_CONNECTED );
break;
case ps_wait_disconnect:
set_error( STATUS_NO_DATA_DETECTED );
break;
case ps_wait_open:
set_error( STATUS_INVALID_HANDLE );
break;
return 0;
case FILE_PIPE_CLOSING_STATE:
set_error( STATUS_PIPE_CLOSING );
return 0;
}
return 0;
fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT );
server->pipe_end.state = FILE_PIPE_LISTENING_STATE;
set_server_state( server, ps_wait_open );
async_wake_up( &server->pipe_end.pipe->waiters, STATUS_SUCCESS );
set_error( STATUS_PENDING );
return 1;
case FSCTL_PIPE_DISCONNECT:
switch(server->state)