PATCH: getaddrinfo, revised

[Marcus Meissner]

Hi,

This is basically Mikes patch + configure checks.
I have used the HAVE_GETADDRINFO for freeaddrinfo too.

Ciao, Marcus

Changelog:
	Mike Hearn <mh at codeweavers.com>
	Marcus Meissner <meissner at suse.de>
	Implement getaddrinfo/freeaddrinfo for MSN Messenger 7 and Opera.

Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.412
diff -u -r1.412 configure.ac
--- configure.ac	31 Oct 2005 21:10:38 -0000	1.412
+++ configure.ac	10 Nov 2005 12:39:06 -0000
@@ -1158,6 +1158,7 @@
 	ftruncate \
 	futimes \
 	futimesat \
+	getaddrinfo \
 	getnetbyname \
 	getopt_long \
 	getpagesize \
Index: dlls/winsock/socket.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/socket.c,v
retrieving revision 1.193
diff -u -r1.193 socket.c
--- dlls/winsock/socket.c	5 Nov 2005 10:43:27 -0000	1.193
+++ dlls/winsock/socket.c	10 Nov 2005 12:39:06 -0000
@@ -3,6 +3,7 @@
  * (ftp.microsoft.com:/Advsys/winsock/spec11/WINSOCK.TXT)
  *
  * Copyright (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka.
+ *           (C) 2005 Mike Hearn
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -2865,6 +2866,57 @@
     return retval;
 }
 
+int WINAPI GetAddrInfoA(CHAR *nodename, CHAR *servname,
+                        const struct addrinfo *hints, struct addrinfo **res)
+{
+#if HAVE_GETADDRINFO
+    BOOL  node_lowered = FALSE, serv_lowered = FALSE;
+    int   result;
+    
+    if (nodename)
+    {
+        if (!(nodename = strdup_lower(nodename))) return WSA_NOT_ENOUGH_MEMORY;
+        node_lowered = TRUE;
+    }
+    
+    if (servname)
+    {
+        if (!(servname = strdup_lower(servname))) return WSA_NOT_ENOUGH_MEMORY;
+        serv_lowered = TRUE;
+    }
+
+    /* getaddrinfo(3) is thread safe, no need to wrap in CS */
+    result = getaddrinfo(nodename, servname, hints, res);
+
+    TRACE("%s, %s %p -> %p %d\n", nodename, servname, hints, res, result);
+
+    if (node_lowered) HeapFree(GetProcessHeap(), 0, nodename);
+    if (serv_lowered) HeapFree(GetProcessHeap(), 0, servname);
+
+    return result;
+#else
+    FIXME("getaddrinfo() failed, not found during buildtime.\n");
+    return EAI_FAIL;
+#endif
+}
+
+int WINAPI GetAddrInfoW(WCHAR *nodename, WCHAR *servname,
+                        const struct addrinfo *hints, struct addrinfo **res)
+{
+    FIXME("stub\n");
+    return EAI_FAIL;
+}
+
+
+void WINAPI WS_freeaddrinfo(struct addrinfo *res)
+{
+#if HAVE_GETADDRINFO
+    freeaddrinfo(res);
+#else
+    FIXME("(), stub, getaddrinfo() support not found during configure!\n");
+#endif
+}
+
 
 /***********************************************************************
  *		getservbyport		(WS2_32.56)
Index: dlls/winsock/ws2_32.spec
===================================================================
RCS file: /home/wine/wine/dlls/winsock/ws2_32.spec,v
retrieving revision 1.42
diff -u -r1.42 ws2_32.spec
--- dlls/winsock/ws2_32.spec	1 Aug 2005 10:56:49 -0000	1.42
+++ dlls/winsock/ws2_32.spec	10 Nov 2005 12:39:06 -0000
@@ -113,6 +113,8 @@
 @ stub    WSCUpdateProvider
 @ stub    WSCWriteNameSpaceOrder
 @ stdcall WSCWriteProviderOrder(ptr long)
-@ stub    freeaddrinfo
-@ stub    getaddrinfo
+@ stdcall freeaddrinfo(ptr) WS_freeaddrinfo
+@ stdcall getaddrinfo(str str ptr ptr) GetAddrInfoA
+@ stdcall GetAddrInfoW(wstr wstr ptr ptr)
+@ stdcall GetAddrInfoA(str str ptr ptr)
 @ stub    getnameinfo