Commit a0f00bd6 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

webservices: Use set_blocking in more places.

parent 74f425e7
...@@ -2245,7 +2245,6 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ ...@@ -2245,7 +2245,6 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_
static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *ret ) static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *ret )
{ {
HANDLE handles[] = { wait, cancel }; HANDLE handles[] = { wait, cancel };
ULONG nonblocking = 0;
HRESULT hr = S_OK; HRESULT hr = S_OK;
if (WSAEventSelect( socket, handles[0], FD_ACCEPT )) return HRESULT_FROM_WIN32( WSAGetLastError() ); if (WSAEventSelect( socket, handles[0], FD_ACCEPT )) return HRESULT_FROM_WIN32( WSAGetLastError() );
...@@ -2256,7 +2255,7 @@ static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *r ...@@ -2256,7 +2255,7 @@ static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *r
if ((*ret = accept( socket, NULL, NULL )) != -1) if ((*ret = accept( socket, NULL, NULL )) != -1)
{ {
WSAEventSelect( *ret, NULL, 0 ); WSAEventSelect( *ret, NULL, 0 );
ioctlsocket( *ret, FIONBIO, &nonblocking ); set_blocking( *ret, TRUE );
break; break;
} }
hr = HRESULT_FROM_WIN32( WSAGetLastError() ); hr = HRESULT_FROM_WIN32( WSAGetLastError() );
...@@ -2296,7 +2295,6 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE ...@@ -2296,7 +2295,6 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE
static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel )
{ {
HANDLE handles[] = { wait, cancel }; HANDLE handles[] = { wait, cancel };
ULONG nonblocking = 0;
HRESULT hr; HRESULT hr;
if (WSAEventSelect( socket, handles[0], FD_READ )) return HRESULT_FROM_WIN32( WSAGetLastError() ); if (WSAEventSelect( socket, handles[0], FD_READ )) return HRESULT_FROM_WIN32( WSAGetLastError() );
...@@ -2317,7 +2315,7 @@ static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) ...@@ -2317,7 +2315,7 @@ static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel )
} }
WSAEventSelect( socket, NULL, 0 ); WSAEventSelect( socket, NULL, 0 );
ioctlsocket( socket, FIONBIO, &nonblocking ); set_blocking( socket, TRUE );
return hr; return hr;
} }
......
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