winhttp(2/5): Simplify netconn_resolve when using getaddrinfo

[Juan Lang]

--Juan
-------------- next part --------------
From 672b1cd6aa656108074b548712fe1a33cf8fa958 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang at gmail.com>
Date: Tue, 7 Jul 2009 13:57:44 -0700
Subject: [PATCH 2/5] Simplify netconn_resolve when using getaddrinfo

---
 dlls/winhttp/net.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index f362a8b..1239aaf 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -590,17 +590,14 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa,
         TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret));
         return FALSE;
     }
-    if (*sa_len < sizeof(struct sockaddr_in))
+    if (*sa_len < res->ai_addrlen)
     {
         WARN("address too small\n");
         freeaddrinfo( res );
         return FALSE;
     }
-    *sa_len = sizeof(struct sockaddr_in);
-    memset( sa, 0, sizeof(struct sockaddr_in) );
-    memcpy( &((struct sockaddr_in *)sa)->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) );
-    ((struct sockaddr_in *)sa)->sin_family = res->ai_family;
-    ((struct sockaddr_in *)sa)->sin_port = htons( port );
+    *sa_len = res->ai_addrlen;
+    memcpy( sa, res->ai_addr, res->ai_addrlen );
 
     freeaddrinfo( res );
 #else
-- 
1.6.3.2