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

winhttp: Move close callback call to task_socket_close(). 

Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2022-01-25 03:08:00 +03:00 committed by Alexandre Julliard
parent f6ce4e23fa
commit 07639a02d3
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/winhttp/request.c
View File

@ -3734,57 +3734,52 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r
return ret; return ret;
} }
static DWORD socket_close( struct socket *socket, BOOL async ) static DWORD socket_close( struct socket *socket )
{ {
DWORD ret, count; DWORD ret, count;
if ((ret = socket_drain( socket ))) goto done; if ((ret = socket_drain( socket ))) return ret;
while (1) while (1)
{ {
if ((ret = receive_frame( socket, &count, &socket->opcode ))) goto done; if ((ret = receive_frame( socket, &count, &socket->opcode ))) return ret;
if (socket->opcode == SOCKET_OPCODE_CLOSE) break; if (socket->opcode == SOCKET_OPCODE_CLOSE) break;
socket->read_size = count; socket->read_size = count;
if ((ret = socket_drain( socket ))) goto done; if ((ret = socket_drain( socket ))) return ret;
} }
if ((count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason)))) if ((count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason))))
{ return ERROR_WINHTTP_INVALID_SERVER_RESPONSE;
ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE;
goto done;
}
if (count) if (count)
{ {
DWORD reason_len = count - sizeof(socket->status); DWORD reason_len = count - sizeof(socket->status);
if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &count, TRUE ))) goto done; if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &count, TRUE ))) return ret;
socket->status = RtlUshortByteSwap( socket->status ); socket->status = RtlUshortByteSwap( socket->status );
if ((ret = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len, TRUE ))) goto done; if ((ret = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len, TRUE ))) return ret;
} }
socket->state = SOCKET_STATE_CLOSED; socket->state = SOCKET_STATE_CLOSED;
done: return ERROR_SUCCESS;
if (async)
{
if (!ret) send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NULL, 0 );
else
{
WINHTTP_WEB_SOCKET_ASYNC_RESULT result;
result.AsyncResult.dwResult = API_READ_DATA; /* FIXME */
result.AsyncResult.dwError = ret;
result.Operation = WINHTTP_WEB_SOCKET_CLOSE_OPERATION;
send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) );
}
}
return ret;
} }
static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work )
{ {
struct socket_shutdown *s = ctx; struct socket_shutdown *s = ctx;
DWORD ret;
socket_close( s->socket, TRUE ); ret = socket_close( s->socket );
if (!ret) send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NULL, 0 );
else
{
WINHTTP_WEB_SOCKET_ASYNC_RESULT result;
result.AsyncResult.dwResult = API_READ_DATA; /* FIXME */
result.AsyncResult.dwError = ret;
result.Operation = WINHTTP_WEB_SOCKET_CLOSE_OPERATION;
send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) );
}
TRACE("running %p\n", work); TRACE("running %p\n", work);
release_object( &s->socket->hdr ); release_object( &s->socket->hdr );
@ -3829,7 +3824,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas
free( s ); free( s );
} }
} }
else ret = socket_close( socket, FALSE ); else ret = socket_close( socket );
done: done:
release_object( &socket->hdr ); release_object( &socket->hdr );