Module: wine Branch: master Commit: a0f00bd6d710d5739f409a96cf3c01591f3c9b4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f00bd6d710d5739f409a96c...
Author: Hans Leidekker hans@codeweavers.com Date: Tue Nov 27 14:13:06 2018 +0100
webservices: Use set_blocking in more places.
Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/webservices/channel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index b945c7f..5394aa6 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -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 ) { HANDLE handles[] = { wait, cancel }; - ULONG nonblocking = 0; HRESULT hr = S_OK;
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 if ((*ret = accept( socket, NULL, NULL )) != -1) { WSAEventSelect( *ret, NULL, 0 ); - ioctlsocket( *ret, FIONBIO, &nonblocking ); + set_blocking( *ret, TRUE ); break; } hr = HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -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 ) { HANDLE handles[] = { wait, cancel }; - ULONG nonblocking = 0; HRESULT hr;
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 ) }
WSAEventSelect( socket, NULL, 0 ); - ioctlsocket( socket, FIONBIO, &nonblocking ); + set_blocking( socket, TRUE ); return hr; }