Module: wine Branch: master Commit: 8b913427c0798a04ba3f99d8bf1bb5ae38b30310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b913427c0798a04ba3f99d8bf...
Author: André Hentschel nerv@dawncrow.de Date: Thu Nov 18 20:46:49 2010 +0100
ws2_32: Map AI_ADDRCONFIG.
---
dlls/ws2_32/socket.c | 4 +--- include/ws2tcpip.h | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cb58015..0bc773e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -430,9 +430,7 @@ static const int ws_aiflag_map[][2] = MAP_OPTION( AI_PASSIVE ), MAP_OPTION( AI_CANONNAME ), MAP_OPTION( AI_NUMERICHOST ), - /* Linux/UNIX knows a lot more. But Windows only - * has 3 as far as I could see. -Marcus - */ + MAP_OPTION( AI_ADDRCONFIG ), };
static const int ws_niflag_map[][2] = diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 0461a81..b1c296c 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -60,9 +60,13 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO;
/* Possible Windows flags for getaddrinfo() */ #ifndef USE_WS_PREFIX -# define AI_PASSIVE 0x0001 -# define AI_CANONNAME 0x0002 -# define AI_NUMERICHOST 0x0004 +# define AI_PASSIVE 0x00000001 +# define AI_CANONNAME 0x00000002 +# define AI_NUMERICHOST 0x00000004 +# define AI_ADDRCONFIG 0x00000400 +# define AI_NON_AUTHORITATIVE 0x00004000 +# define AI_SECURE 0x00008000 +# define AI_RETURN_PREFERRED_NAMES 0x00010000 /* getaddrinfo error codes */ # define EAI_AGAIN WSATRY_AGAIN # define EAI_BADFLAGS WSAEINVAL @@ -74,9 +78,13 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define EAI_SERVICE WSATYPE_NOT_FOUND # define EAI_SOCKTYPE WSAESOCKTNOSUPPORT #else -# define WS_AI_PASSIVE 0x0001 -# define WS_AI_CANONNAME 0x0002 -# define WS_AI_NUMERICHOST 0x0004 +# define WS_AI_PASSIVE 0x00000001 +# define WS_AI_CANONNAME 0x00000002 +# define WS_AI_NUMERICHOST 0x00000004 +# define WS_AI_ADDRCONFIG 0x00000400 +# define WS_AI_NON_AUTHORITATIVE 0x00004000 +# define WS_AI_SECURE 0x00008000 +# define WS_AI_RETURN_PREFERRED_NAMES 0x00010000 /* getaddrinfo error codes */ # define WS_EAI_AGAIN WSATRY_AGAIN # define WS_EAI_BADFLAGS WSAEINVAL