Skip to content

W
wine-cw
Commit 57e93b72 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

ws2_32: Use register_async for WS2_async_recv.

This changes behaviour in case when winsock attempts to use both completion routine and completion value. Tests from previous patch show that it should fail anyway. It will be possible to properly return error once APCs are passed to server in register_async request. Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent b9f6f389
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 12 deletions
dlls/ws2_32/socket.c
View file @ 57e93b72
......@@ -7792,18 +7792,12 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
iosb->u.Status = STATUS_PENDING;
iosb->Information = 0;
SERVER_START_REQ( register_async )
{
req->type = ASYNC_TYPE_READ;
req->async.handle = wine_server_obj_handle( wsa->hSocket );
req->async.callback = wine_server_client_ptr( WS2_async_recv );
req->async.iosb = wine_server_client_ptr( iosb );
req->async.arg = wine_server_client_ptr( wsa );
req->async.event = wine_server_obj_handle( lpCompletionRoutine ? 0 : lpOverlapped->hEvent );
req->async.cvalue = cvalue;
err = wine_server_call( req );
}
SERVER_END_REQ;
if (wsa->completion_func)
err = register_async( ASYNC_TYPE_READ, wsa->hSocket, WS2_async_recv, wsa, NULL,
ws2_async_apc, wsa, iosb );
else
err = register_async( ASYNC_TYPE_READ, wsa->hSocket, WS2_async_recv, wsa, lpOverlapped->hEvent,
NULL, (void *)cvalue, iosb );
if (err != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa );
SetLastError(NtStatusToWSAError( err ));
......
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