wininet: Don't include ws2tcpip.h after zlib.h.

dlls/wininet/http.c

@@ -30,11 +30,11 @@
 #include "config.h"
 
 #ifdef HAVE_ZLIB
-#  define Z_SOLO
 #  include <zlib.h>
 #endif
 
-#include "ws2tcpip.h"
+#include "winsock2.h"
+#include "ws2ipdef.h"
 
 #include <stdarg.h>
 #include <stdio.h>

dlls/wininet/internet.h

@@ -37,7 +37,7 @@ typedef struct {
     INTERNET_PORT port;
     BOOL is_https;
     struct sockaddr_storage addr;
-    socklen_t addr_len;
+    int addr_len;
     char addr_str[INET6_ADDRSTRLEN];
 
     WCHAR *scheme_host_port;