From c0e4759d8d7566c6a6367394419b8a8085619ecb Mon Sep 17 00:00:00 2001 From: Bruno Jesus <00cpxxx@gmail.com> Date: Fri, 9 Jan 2015 23:49:46 -0200 Subject: [PATCH] ws2_32: Prefer SetLastError over WSASetLastError. --- dlls/ws2_32/socket.c | 100 +++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b4dcd76c920..5b9a4416530 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1822,7 +1822,7 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I if (*len < size || !buffer) { *len = size; - WSASetLastError(WSAENOBUFS); + SetLastError(WSAENOBUFS); return SOCKET_ERROR; } @@ -3635,7 +3635,7 @@ int WINAPI WSAHtonl(SOCKET s, WS_u_long hostlong, WS_u_long *lpnetlong) *lpnetlong = htonl(hostlong); return 0; } - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } @@ -3654,7 +3654,7 @@ int WINAPI WSAHtons(SOCKET s, WS_u_short hostshort, WS_u_short *lpnetshort) *lpnetshort = htons(hostshort); return 0; } - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } @@ -3825,7 +3825,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_FIONBIO: if (in_size != sizeof(WS_u_long) || IS_INTRESOURCE(in_buff)) { - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } TRACE("-> FIONBIO (%x)\n", *(WS_u_long*)in_buff); @@ -3845,7 +3845,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID { if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) { - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; @@ -3861,7 +3861,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID socklen_t oobsize = sizeof(int); if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) { - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; @@ -3896,7 +3896,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (!out_buff || !ret_size) { - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } @@ -4006,14 +4006,14 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (!ret_size) { - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } if (out_size && out_size < FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0])) { *ret_size = 0; - WSASetLastError(WSAEINVAL); + SetLastError(WSAEINVAL); return SOCKET_ERROR; } @@ -4138,7 +4138,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (!in_buff || in_size < sizeof(struct tcp_keepalive)) { - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } @@ -4182,7 +4182,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (!in_buff || in_size < sizeof(struct WS_sockaddr) || !out_buff || out_size < sizeof(struct WS_sockaddr_in) || !ret_size) { - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } if (daddr->sa_family != AF_INET) @@ -4233,7 +4233,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID FIXME("WS_SIO_UDP_CONNRESET stub\n"); break; case 0x667e: /* Netscape tries hard to use bogus ioctl 0x667e */ - WSASetLastError(WSAEOPNOTSUPP); + SetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; default: status = WSAEOPNOTSUPP; @@ -4698,7 +4698,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); if (err != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa ); - WSASetLastError( NtStatusToWSAError( err )); + SetLastError(NtStatusToWSAError( err )); return SOCKET_ERROR; } @@ -4713,7 +4713,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } else NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)ws2_async_apc, (ULONG_PTR)wsa, (ULONG_PTR)iosb, 0 ); - WSASetLastError(0); + SetLastError(ERROR_SUCCESS); return 0; } @@ -4779,14 +4779,14 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (lpNumberOfBytesSent) *lpNumberOfBytesSent = bytes_sent; if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); - WSASetLastError(0); + SetLastError(ERROR_SUCCESS); return 0; error: if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WARN(" -> ERROR %d\n", err); - WSASetLastError(err); + SetLastError(err); return SOCKET_ERROR; } @@ -5177,7 +5177,7 @@ int WINAPI WS_shutdown(SOCKET s, int how) error: release_sock_fd( s, fd ); _enable_event( SOCKET2HANDLE(s), 0, 0, clear_flags ); - WSASetLastError( err ); + SetLastError( err ); return SOCKET_ERROR; } @@ -5385,7 +5385,7 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) return NULL; } if( gethostname( hostname, 100) == -1) { - SetLastError( WSAENOBUFS); /* appropriate ? */ + SetLastError(WSAENOBUFS); /* appropriate ? */ return retval; } if( !name || !name[0]) { @@ -5656,7 +5656,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr if (punixhints->ai_socktype < 0) { - WSASetLastError(WSAESOCKTNOSUPPORT); + SetLastError(WSAESOCKTNOSUPPORT); HeapFree(GetProcessHeap(), 0, hostname); return SOCKET_ERROR; } @@ -5920,7 +5920,7 @@ int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, size = ws_sockaddr_ws2u(sa, salen, &sa_u); if (!size) { - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return WSA_NOT_ENOUGH_MEMORY; } ret = getnameinfo(&sa_u.addr, size, host, hostlen, serv, servlen, convert_niflag_w2u(flags)); @@ -6074,7 +6074,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, if ( lpOverlapped == NULL ) { ERR( "Invalid pointer\n" ); - WSASetLastError(WSA_INVALID_PARAMETER); + SetLastError(WSA_INVALID_PARAMETER); return FALSE; } @@ -6173,7 +6173,7 @@ SOCKET WINAPI WSASocketA(int af, int type, int protocol, if (!len) { - WSASetLastError( WSAEINVAL); + SetLastError(WSAEINVAL); return SOCKET_ERROR; } @@ -6716,7 +6716,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, SERVER_END_REQ; if (err != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa ); - WSASetLastError( NtStatusToWSAError( err )); + SetLastError(NtStatusToWSAError( err )); return SOCKET_ERROR; } @@ -6784,7 +6784,7 @@ error: if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WARN(" -> ERROR %d\n", err); - WSASetLastError( err ); + SetLastError( err ); return SOCKET_ERROR; } @@ -6926,7 +6926,7 @@ int WINAPI WSADuplicateSocketW( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOW int WINAPI WSAInstallServiceClassA(LPWSASERVICECLASSINFOA info) { FIXME("Request to install service %s\n",debugstr_a(info->lpszServiceClassName)); - WSASetLastError(WSAEACCES); + SetLastError(WSAEACCES); return SOCKET_ERROR; } @@ -6936,7 +6936,7 @@ int WINAPI WSAInstallServiceClassA(LPWSASERVICECLASSINFOA info) int WINAPI WSAInstallServiceClassW(LPWSASERVICECLASSINFOW info) { FIXME("Request to install service %s\n",debugstr_w(info->lpszServiceClassName)); - WSASetLastError(WSAEACCES); + SetLastError(WSAEACCES); return SOCKET_ERROR; } @@ -6946,7 +6946,7 @@ int WINAPI WSAInstallServiceClassW(LPWSASERVICECLASSINFOW info) int WINAPI WSARemoveServiceClass(LPGUID info) { FIXME("Request to remove service %p\n",info); - WSASetLastError(WSATYPE_NOT_FOUND); + SetLastError(WSATYPE_NOT_FOUND); return SOCKET_ERROR; } @@ -6963,7 +6963,7 @@ PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) TRACE("family %d, addr (%p), buffer (%p), len %ld\n", family, addr, buffer, len); if (!buffer) { - WSASetLastError( STATUS_INVALID_PARAMETER ); + SetLastError( STATUS_INVALID_PARAMETER ); return NULL; } @@ -6982,15 +6982,15 @@ PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) break; } default: - WSASetLastError( WSAEAFNOSUPPORT ); + SetLastError( WSAEAFNOSUPPORT ); return NULL; } - if (!pdst) WSASetLastError( STATUS_INVALID_PARAMETER ); + if (!pdst) SetLastError( STATUS_INVALID_PARAMETER ); return pdst; #else FIXME( "not supported on this platform\n" ); - WSASetLastError( WSAEAFNOSUPPORT ); + SetLastError( WSAEAFNOSUPPORT ); return NULL; #endif } @@ -7023,7 +7023,7 @@ INT WINAPI WS_inet_pton( INT family, PCSTR addr, PVOID buffer) return ret; #else FIXME( "not supported on this platform\n" ); - WSASetLastError( WSAEAFNOSUPPORT ); + SetLastError( WSAEAFNOSUPPORT ); return SOCKET_ERROR; #endif } @@ -7048,7 +7048,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, if (!AddressString) { - WSASetLastError(WSAEINVAL); + SetLastError(WSAEINVAL); return SOCKET_ERROR; } @@ -7059,7 +7059,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, strlen(AddressString) + 1); if (!workBuffer) { - WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + SetLastError(WSA_NOT_ENOUGH_MEMORY); return SOCKET_ERROR; } @@ -7165,7 +7165,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, HeapFree(GetProcessHeap(), 0, workBuffer); if (!res) return 0; - WSASetLastError(res); + SetLastError(res); return SOCKET_ERROR; } @@ -7201,7 +7201,7 @@ INT WINAPI WSAStringToAddressW(LPWSTR AddressString, if (!WideCharToMultiByte( CP_ACP, 0, lpProtocolInfo->szProtocol, -1, lpProtoInfoA->szProtocol, WSAPROTOCOL_LEN+1, NULL, NULL )) { - WSASetLastError( WSAEINVAL); + SetLastError(WSAEINVAL); return SOCKET_ERROR; } } @@ -7227,7 +7227,7 @@ INT WINAPI WSAStringToAddressW(LPWSTR AddressString, else res = WSAEINVAL; - WSASetLastError(res); + SetLastError(res); return SOCKET_ERROR; } @@ -7274,7 +7274,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, strcpy(buffer, "["); if (!WS_inet_ntop(WS_AF_INET6, &sockaddr6->sin6_addr, buffer+strlen(buffer), sizeof(buffer))) { - WSASetLastError(WSAEINVAL); + SetLastError(WSAEINVAL); return SOCKET_ERROR; } if ((sockaddr6->sin6_scope_id)) @@ -7285,7 +7285,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, } default: - WSASetLastError(WSAEINVAL); + SetLastError(WSAEINVAL); return SOCKET_ERROR; } @@ -7294,7 +7294,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, if (*lenstr < size) { *lenstr = size; - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } @@ -7344,7 +7344,7 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, if (*lenstr < size) { *lenstr = size; - WSASetLastError(WSAEFAULT); + SetLastError(WSAEFAULT); return SOCKET_ERROR; } @@ -7389,7 +7389,7 @@ INT WINAPI WSAGetServiceClassInfoA( LPGUID provider, LPGUID service, LPDWORD len { FIXME( "(%s %s %p %p) Stub!\n", debugstr_guid(provider), debugstr_guid(service), len, info ); - WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + SetLastError(WSA_NOT_ENOUGH_MEMORY); return SOCKET_ERROR; } @@ -7401,7 +7401,7 @@ INT WINAPI WSAGetServiceClassInfoW( LPGUID provider, LPGUID service, LPDWORD len { FIXME( "(%s %s %p %p) Stub!\n", debugstr_guid(provider), debugstr_guid(service), len, info ); - WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + SetLastError(WSA_NOT_ENOUGH_MEMORY); return SOCKET_ERROR; } @@ -7411,7 +7411,7 @@ INT WINAPI WSAGetServiceClassInfoW( LPGUID provider, LPGUID service, LPDWORD len INT WINAPI WSAGetServiceClassNameByClassIdA( LPGUID class, LPSTR service, LPDWORD len ) { FIXME( "(%s %p %p) Stub!\n", debugstr_guid(class), service, len ); - WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + SetLastError(WSA_NOT_ENOUGH_MEMORY); return SOCKET_ERROR; } @@ -7421,7 +7421,7 @@ INT WINAPI WSAGetServiceClassNameByClassIdA( LPGUID class, LPSTR service, LPDWOR INT WINAPI WSAGetServiceClassNameByClassIdW( LPGUID class, LPWSTR service, LPDWORD len ) { FIXME( "(%s %p %p) Stub!\n", debugstr_guid(class), service, len ); - WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + SetLastError(WSA_NOT_ENOUGH_MEMORY); return SOCKET_ERROR; } @@ -7434,7 +7434,7 @@ INT WINAPI WSALookupServiceBeginA( LPWSAQUERYSETA lpqsRestrictions, { FIXME("(%p 0x%08x %p) Stub!\n", lpqsRestrictions, dwControlFlags, lphLookup); - WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + SetLastError(WSA_NOT_ENOUGH_MEMORY); return SOCKET_ERROR; } @@ -7447,7 +7447,7 @@ INT WINAPI WSALookupServiceBeginW( LPWSAQUERYSETW lpqsRestrictions, { FIXME("(%p 0x%08x %p) Stub!\n", lpqsRestrictions, dwControlFlags, lphLookup); - WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + SetLastError(WSA_NOT_ENOUGH_MEMORY); return SOCKET_ERROR; } @@ -7466,7 +7466,7 @@ INT WINAPI WSALookupServiceEnd( HANDLE lookup ) INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETA results ) { FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results ); - WSASetLastError(WSA_E_NO_MORE); + SetLastError(WSA_E_NO_MORE); return SOCKET_ERROR; } @@ -7476,7 +7476,7 @@ INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSA INT WINAPI WSALookupServiceNextW( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETW results ) { FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results ); - WSASetLastError(WSA_E_NO_MORE); + SetLastError(WSA_E_NO_MORE); return SOCKET_ERROR; } @@ -7604,7 +7604,7 @@ INT WINAPI WSANSPIoctl( HANDLE hLookup, DWORD dwControlCode, LPVOID lpvInBuffer, { FIXME("(%p, 0x%08x, %p, 0x%08x, %p, 0x%08x, %p, %p) Stub!\n", hLookup, dwControlCode, lpvInBuffer, cbInBuffer, lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpCompletion); - WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + SetLastError(WSA_NOT_ENOUGH_MEMORY); return SOCKET_ERROR; }