Skip to content

W
wine-cw
Commit 4a8961ce authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

winsock: Fix two Windows to Unix mapping issues.

Handle wildcard address family hint in getaddrinfo. Convert flags too in getnameinfo.
parent 39be679a
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
dlls/winsock/socket.c
View file @ 4a8961ce
...@@ -3146,6 +3146,9 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr ...@@ -3146,6 +3146,9 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr
memset(&unixhints, 0, sizeof(unixhints)); memset(&unixhints, 0, sizeof(unixhints));
punixhints->ai_flags = convert_aiflag_w2u(hints->ai_flags); punixhints->ai_flags = convert_aiflag_w2u(hints->ai_flags);
if (hints->ai_family == 0) /* wildcard, specific to getaddrinfo() */
punixhints->ai_family = 0;
else
punixhints->ai_family = convert_af_w2u(hints->ai_family); punixhints->ai_family = convert_af_w2u(hints->ai_family);
if (hints->ai_socktype == 0) /* wildcard, specific to getaddrinfo() */ if (hints->ai_socktype == 0) /* wildcard, specific to getaddrinfo() */
punixhints->ai_socktype = 0; punixhints->ai_socktype = 0;
...@@ -3252,7 +3255,7 @@ int WINAPI WS_getnameinfo(const SOCKADDR *sa, socklen_t salen, PCHAR host, ...@@ -3252,7 +3255,7 @@ int WINAPI WS_getnameinfo(const SOCKADDR *sa, socklen_t salen, PCHAR host,
WSASetLastError(WSAEFAULT); WSASetLastError(WSAEFAULT);
return WSA_NOT_ENOUGH_MEMORY; return WSA_NOT_ENOUGH_MEMORY;
} }
ret = getnameinfo(sa_u, size, host, hostlen, serv, servlen, flags); ret = getnameinfo(sa_u, size, host, hostlen, serv, servlen, convert_aiflag_w2u(flags));
ws_sockaddr_free(sa_u, sa); ws_sockaddr_free(sa_u, sa);
return convert_eai_u2w(ret); return convert_eai_u2w(ret);
......
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