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

ws2_32: Add a separate structure for async shutdowns. 

Conflicts:
	dlls/ws2_32/socket.c
This commit is contained in:
Alexandre Julliard 2015-03-03 15:30:13 +09:00
parent 9fa69b5868
commit e23233d791
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/ws2_32/socket.c
View File

@ -335,11 +335,18 @@ struct ws2_async_io
struct ws2_async_io *next; struct ws2_async_io *next;
}; };
struct ws2_async_shutdown
{
struct ws2_async_io io;
HANDLE hSocket;
IO_STATUS_BLOCK iosb;
int type;
};
struct ws2_async struct ws2_async
{ {
struct ws2_async_io io; struct ws2_async_io io;
HANDLE hSocket; HANDLE hSocket;
int type;
LPWSAOVERLAPPED user_overlapped; LPWSAOVERLAPPED user_overlapped;
LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_func; LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_func;
IO_STATUS_BLOCK local_iosb; IO_STATUS_BLOCK local_iosb;
@ -2266,7 +2273,7 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu
*/ */
static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc ) static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc )
{ {
struct ws2_async *wsa = user; struct ws2_async_shutdown *wsa = user;
int fd, err = 1; int fd, err = 1;
switch (status) switch (status)
@ -2297,25 +2304,24 @@ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS
*/ */
static int WS2_register_async_shutdown( SOCKET s, int type ) static int WS2_register_async_shutdown( SOCKET s, int type )
{ {
struct ws2_async *wsa; struct ws2_async_shutdown *wsa;
NTSTATUS status; NTSTATUS status;
TRACE("s %04lx type %d\n", s, type); TRACE("s %04lx type %d\n", s, type);
wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct ws2_async, iovec[1] )); wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) );
if ( !wsa ) if ( !wsa )
return WSAEFAULT; return WSAEFAULT;
wsa->hSocket = SOCKET2HANDLE(s); wsa->hSocket = SOCKET2HANDLE(s);
wsa->type = type; wsa->type = type;
wsa->completion_func = NULL;
SERVER_START_REQ( register_async ) SERVER_START_REQ( register_async )
{ {
req->type = type; req->type = type;
req->async.handle = wine_server_obj_handle( wsa->hSocket ); req->async.handle = wine_server_obj_handle( wsa->hSocket );
req->async.callback = wine_server_client_ptr( WS2_async_shutdown ); req->async.callback = wine_server_client_ptr( WS2_async_shutdown );
req->async.iosb = wine_server_client_ptr( &wsa->local_iosb ); req->async.iosb = wine_server_client_ptr( &wsa->iosb );
req->async.arg = wine_server_client_ptr( wsa ); req->async.arg = wine_server_client_ptr( wsa );
req->async.cvalue = 0; req->async.cvalue = 0;
status = wine_server_call( req ); status = wine_server_call( req );