Skip to content

W
wine-cw
Commit 3905af7c authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

ntdll: Combine the "if (alerted)" blocks in sock_recv().

There is no need to release the async_fileio structure before calling set_async_direct_result().
parent f994e0a6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
dlls/ntdll/unix/socket.c
View file @ 3905af7c
...@@ -852,9 +852,8 @@ static BOOL is_icmp_over_dgram( int fd ) ...@@ -852,9 +852,8 @@ static BOOL is_icmp_over_dgram( int fd )
static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io,
int fd, struct async_recv_ioctl *async, int force_async ) int fd, struct async_recv_ioctl *async, int force_async )
{ {
BOOL nonblocking, alerted;
ULONG_PTR information;
HANDLE wait_handle; HANDLE wait_handle;
BOOL nonblocking;
NTSTATUS status; NTSTATUS status;
unsigned int i; unsigned int i;
ULONG options; ULONG options;
...@@ -883,9 +882,10 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi ...@@ -883,9 +882,10 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi
/* the server currently will never succeed immediately */ /* the server currently will never succeed immediately */
assert(status == STATUS_ALERTED || status == STATUS_PENDING || NT_ERROR(status)); assert(status == STATUS_ALERTED || status == STATUS_PENDING || NT_ERROR(status));
alerted = status == STATUS_ALERTED; if (status == STATUS_ALERTED)
if (alerted)
{ {
ULONG_PTR information;
status = try_recv( fd, async, &information ); status = try_recv( fd, async, &information );
if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking))
status = STATUS_PENDING; status = STATUS_PENDING;
...@@ -894,12 +894,12 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi ...@@ -894,12 +894,12 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi
io->Status = status; io->Status = status;
io->Information = information; io->Information = information;
} }
set_async_direct_result( &wait_handle, status, information, FALSE );
} }
if (status != STATUS_PENDING) if (status != STATUS_PENDING)
release_fileio( &async->io ); release_fileio( &async->io );
if (alerted) set_async_direct_result( &wait_handle, status, information, FALSE );
if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT );
return status; return status;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment