Changeset 70205 in vbox for trunk/src/VBox/Runtime/r3/socket.cpp

Timestamp:

Dec 18, 2017 3:13:28 PM (7 years ago)

Author:

vboxsync

Message:

IPRT/socket.cpp: Initialize winsock before creating sockets.

File:

• trunk/src/VBox/Runtime/r3/socket.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -460 +460 @@
     AssertReturn(g_pfnsocket, VERR_NOT_SUPPORTED);
     AssertReturn(g_pfnclosesocket, VERR_NOT_SUPPORTED);
+    AssertReturn(g_pfnWSAStartup, VERR_NOT_SUPPORTED);
+
+    /* Initialize WinSock. */
+    WORD const  wVersionRequested = MAKEWORD(1, 1);
+    WSADATA     wsaData;
+    RT_ZERO(wsaData);
+    int rcWsa = g_pfnWSAStartup(wVersionRequested, &wsaData);
+    AssertMsgReturn(wsaData.wVersion >= wVersionRequested && rcWsa == 0,
+                    ("Wrong winsock version %#x rcWsa=%#x (%d)\n", wsaData.wVersion, rcWsa, rcWsa),
+                    VERR_NOT_SUPPORTED);
 #endif
 
@@ -688 +698 @@
         || !g_pfngethostbyname)
         return VERR_NOT_SUPPORTED;
-    WORD    wVersionRequested = MAKEWORD(1, 1);
-    WSADATA wsaData;
+    WORD const  wVersionRequested = MAKEWORD(1, 1);
+    WSADATA     wsaData;
     RT_ZERO(wsaData);
-    rc = g_pfnWSAStartup(wVersionRequested, &wsaData);
-    if (wsaData.wVersion != wVersionRequested)
-    {
-        AssertMsgFailed(("Wrong winsock version\n"));
-        return VERR_NOT_SUPPORTED;
-    }
+    int rcWsa = g_pfnWSAStartup(wVersionRequested, &wsaData);
+    AssertMsgReturn(wsaData.wVersion >= wVersionRequested && rcWsa == 0,
+                    ("Wrong winsock version %#x rcWsa=%#x (%d)\n", wsaData.wVersion, rcWsa, rcWsa),
+                    VERR_NOT_SUPPORTED);
 # define gethostbyname g_pfngethostbyname
 #endif
@@ -780 +788 @@
         return VERR_NOT_SUPPORTED;
     /** @todo someone should check if we really need 2, 2 here */
-    WORD    wVersionRequested = MAKEWORD(2, 2);
-    WSADATA wsaData;
-    RT_ZERO(wszData);
-    rc = WSAStartup(wVersionRequested, &wsaData);
-    if (wsaData.wVersion != wVersionRequested)
-    {
-        AssertMsgFailed(("Wrong winsock version\n"));
-        return VERR_NOT_SUPPORTED;
-    }
+    WORD const  wVersionRequested = MAKEWORD(2, 2);
+    WSADATA     wsaData;
+    RT_ZERO(wsaData);
+    int rcWsa = g_pfnWSAStartup(wVersionRequested, &wsaData);
+    AssertMsgReturn(wsaData.wVersion >= wVersionRequested && rcWsa == 0,
+                    ("Wrong winsock version %#x rcWsa=%#x (%d)\n", wsaData.wVersion, rcWsa, rcWsa),
+                    VERR_NOT_SUPPORTED);
 #  define getaddrinfo  g_pfngetaddrinfo
 #  define freeaddrinfo g_pfnfreeaddrinfo