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

winsock: Fix two Windows to Unix mapping issues. 

Handle wildcard address family hint in getaddrinfo.
Convert flags too in getnameinfo.
This commit is contained in:
Hans Leidekker 2006-02-25 20:31:32 +01:00 committed by Alexandre Julliard
parent 39be679a45
commit 4a8961ce3d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/winsock/socket.c
View File

@ -3146,7 +3146,10 @@ 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);
punixhints->ai_family = convert_af_w2u(hints->ai_family); if (hints->ai_family == 0) /* wildcard, specific to getaddrinfo() */
punixhints->ai_family = 0;
else
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;
else else
@ -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);