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

server: Always return STATUS_PENDING when an async I/O operation has been queued.

This commit is contained in:
Alexandre Julliard 2007-03-26 19:13:21 +02:00
parent cc578af7b1
commit 589ce2bb8d
5 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/ntdll/file.c
View File

@ -282,14 +282,13 @@ static ULONG fileio_queue_async(async_fileio* fileio, IO_STATUS_BLOCK* iosb,
}
SERVER_END_REQ;
if ( status ) iosb->u.Status = status;
if ( iosb->u.Status != STATUS_PENDING )
if (status != STATUS_PENDING)
{
iosb->u.Status = status;
(apc)( fileio, iosb, iosb->u.Status );
return iosb->u.Status;
}
NtCurrentTeb()->num_async_io++;
return STATUS_SUCCESS;
else NtCurrentTeb()->num_async_io++;
return status;
}
/***********************************************************************
@ -531,7 +530,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent,
io_status->u.Status = STATUS_PENDING;
ret = fileio_queue_async(fileio, io_status, TRUE);
if (ret != STATUS_SUCCESS)
if (ret != STATUS_PENDING)
{
if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent);
return ret;
@ -762,7 +761,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent,
io_status->Information = 0;
io_status->u.Status = STATUS_PENDING;
ret = fileio_queue_async(fileio, io_status, FALSE);
if (ret != STATUS_SUCCESS)
if (ret != STATUS_PENDING)
{
if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent);
return ret;

20
dlls/ws2_32/socket.c
View File

@ -1150,6 +1150,7 @@ static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb)
default: FIXME("Unknown internal mode (%d)\n", wsa->mode); return STATUS_INVALID_PARAMETER;
}
iosb->u.Status = STATUS_PENDING;
SERVER_START_REQ( register_async )
{
req->handle = wsa->hSocket;
@ -1163,18 +1164,13 @@ static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb)
}
SERVER_END_REQ;
if ( status ) iosb->u.Status = status;
if ( iosb->u.Status != STATUS_PENDING )
if (status != STATUS_PENDING)
{
/* Note: we get here a non zero status when we couldn't queue the async
* in the server. Therefore, we simply terminate the async.
*/
status = iosb->u.Status;
iosb->u.Status = status;
ws2_async_terminate(wsa, iosb);
return status;
}
NtCurrentTeb()->num_async_io++;
return STATUS_SUCCESS;
else NtCurrentTeb()->num_async_io++;
return status;
}
/***********************************************************************
@ -1500,7 +1496,7 @@ static int WS2_register_async_shutdown( SOCKET s, enum ws2_mode mode )
/* Hack: this will cause ws2_async_terminate() to free the overlapped structure */
wsa->user_overlapped = NULL;
if ( (ret = ws2_queue_async( wsa, iosb )) )
if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING)
{
err = NtStatusToWSAError( ret );
goto out;
@ -2843,7 +2839,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
goto err_free;
}
if ( ( ret = ws2_queue_async( wsa, iosb ) ) )
if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING)
{
err = NtStatusToWSAError( ret );
@ -4349,7 +4345,7 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
goto err_free;
}
if ( ( ret = ws2_queue_async( wsa, iosb )) )
if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING)
{
err = NtStatusToWSAError( ret );

5
server/fd.c
View File

@ -1742,6 +1742,7 @@ void fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type,
}
if (!create_async( current, timeout, queue, data )) return;
set_error( STATUS_PENDING );
/* Check if the new pending request can be served immediately */
events = check_fd_events( fd, fd->fd_ops->get_poll_events( fd ) );
@ -1937,9 +1938,7 @@ DECL_HANDLER(register_async)
* 3. Carry out any operations necessary to adjust the object's poll events
* Usually: set_elect_events (obj, obj->ops->get_poll_events()).
* 4. When the async request is triggered, then send back (with a proper APC)
* the trigger (STATUS_ALERTED) to the thread that posted the request.
* async_destroy() is to be called: it will both notify the sender about
* the trigger and destroy the request by itself
* the trigger (STATUS_ALERTED) to the thread that posted the request.
* See also the implementations in file.c, serial.c, and sock.c.
*/

1
server/serial.c
View File

@ -273,6 +273,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ
add_timeout( &when, timeout );
if (!create_async( current, timeout ? &when : NULL, queue, data )) return;
set_error( STATUS_PENDING );
/* Check if the new pending request can be served immediately */
events = check_fd_events( fd, serial_get_poll_events( fd ) );

1
server/sock.c
View File

@ -545,6 +545,7 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type,
else
{
if (!create_async( current, NULL, queue, data )) return;
set_error( STATUS_PENDING );
}
pollev = sock_reselect( sock );