Alexandre Julliard : jsproxy: Build with Windows sockets.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5831a0bfea22b4375fdf0ee2b6aa35162d553bcc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5831a0bfea22b4375fdf0ee2b...

Author: Alexandre Julliard 
Date:   Thu Jun  6 09:21:25 2019 +0200

jsproxy: Build with Windows sockets.

Signed-off-by: Alexandre Julliard

---

dlls/jsproxy/Makefile.in |  2 +-
 dlls/jsproxy/main.c      | 24 +-----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in
index 8ae2a38..07f1fb5 100644
--- a/dlls/jsproxy/Makefile.in
+++ b/dlls/jsproxy/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = jsproxy.dll
-IMPORTS   = uuid oleaut32 ole32
+IMPORTS   = uuid oleaut32 ole32 ws2_32
 IMPORTLIB = jsproxy

C_SRCS = \
diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c
index 26f43c5..13f34b2 100644
--- a/dlls/jsproxy/main.c
+++ b/dlls/jsproxy/main.c
@@ -21,29 +21,12 @@

#include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-#if defined(__MINGW32__) || defined (_MSC_VER)
-# include <ws2tcpip.h>
-#else
-# define closesocket close
-# define ioctlsocket ioctl
-#endif

#include "windef.h"
 #include "winbase.h"
-#ifndef __MINGW32__
-#define USE_WS_PREFIX
-#endif
 #include "winsock2.h"
 #include "ws2ipdef.h"
+#include "ws2tcpip.h"
 #include "winnls.h"
 #include "wininet.h"
 #define COBJMACROS
@@ -327,7 +310,6 @@ static void printf_addr( const WCHAR *fmt, WCHAR *buf, struct sockaddr_in *addr

static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result )
 {
-#ifdef HAVE_GETADDRINFO
         static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0};
         WCHAR addr[16];
         struct addrinfo *ai, *elem;
@@ -356,10 +338,6 @@ static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result )
         V_VT( result ) = VT_BSTR;
         V_BSTR( result ) = SysAllocString( addr );
         return S_OK;
-#else
-        FIXME("getaddrinfo not found at build time\n");
-        return S_FALSE;
-#endif
 }

static HRESULT WINAPI dispex_InvokeEx(