Changeset 70196 in vbox

Timestamp:

Dec 18, 2017 1:40:49 PM (7 years ago)

Author:

vboxsync

Message:

VBoxService: Made it work on NT 3.51.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService-win.cpp (modified) (6 diffs)
• VBoxServiceInternal.h (modified) (1 diff)
• VBoxServiceVMInfo-win.cpp (modified) (1 diff)
• VBoxServiceVMInfo.cpp (modified) (12 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp

@@ -26 +26 @@
 #include <VBox/VBoxGuestLib.h>
 
+#define WIN32_NO_STATUS
+#include <iprt/win/ws2tcpip.h>
+#include <iprt/win/winsock2.h>
+#undef WIN32_NO_STATUS
 #include <iprt/nt/nt-and-windows.h>
+#include <iprt/win/iphlpapi.h>
 #include <process.h>
 #include <aclapi.h>
@@ -58 +63 @@
 decltype(RegisterServiceCtrlHandlerExA) *g_pfnRegisterServiceCtrlHandlerExA;    /**< W2K+ */
 decltype(ChangeServiceConfig2A)         *g_pfnChangeServiceConfig2A;            /**< W2K+ */
+decltype(GetNamedSecurityInfoA)         *g_pfnGetNamedSecurityInfoA;            /**< NT4+ */
+decltype(SetEntriesInAclA)              *g_pfnSetEntriesInAclA;                 /**< NT4+ */
+decltype(SetNamedSecurityInfoA)         *g_pfnSetNamedSecurityInfoA;            /**< NT4+ */
 /** @} */
 
@@ -74 +82 @@
 /** @} */
 
+/** @name API from IPHLPAPI.DLL
+ * @{ */
+decltype(GetAdaptersInfo)               *g_pfnGetAdaptersInfo;
+/** @} */
+
+/** @name APIs from WS2_32.DLL
+ * @note WSAIoctl is not present in wsock32.dll, so no point in trying the
+ *       fallback here.
+ * @{ */
+decltype(WSAStartup)                    *g_pfnWSAStartup;
+decltype(WSACleanup)                    *g_pfnWSACleanup;
+decltype(WSASocketA)                    *g_pfnWSASocketA;
+decltype(WSAIoctl)                      *g_pfnWSAIoctl;
+decltype(WSAGetLastError)               *g_pfnWSAGetLastError;
+decltype(closesocket)                   *g_pfnclosesocket;
+decltype(inet_ntoa)                     *g_pfninet_ntoa;
+
+/** @} */
 
 /**
@@ -90 +116 @@
         RESOLVE_SYMBOL(RegisterServiceCtrlHandlerExA);
         RESOLVE_SYMBOL(ChangeServiceConfig2A);
+        RESOLVE_SYMBOL(GetNamedSecurityInfoA);
+        RESOLVE_SYMBOL(SetEntriesInAclA);
+        RESOLVE_SYMBOL(SetNamedSecurityInfoA);
         RTLdrClose(hLdrMod);
     }
@@ -114 +143 @@
         RTLdrClose(hLdrMod);
     }
-}
-
-
-/**
- * @todo Format code style.
+
+    /* From IPHLPAPI.DLL: */
+    rc = RTLdrLoadSystem("iphlpapi.dll", false /*fNoUnload*/, &hLdrMod);
+    if (RT_SUCCESS(rc))
+    {
+        RESOLVE_SYMBOL(GetAdaptersInfo);
+        RTLdrClose(hLdrMod);
+    }
+
+    /* From WS2_32.DLL: */
+    rc = RTLdrLoadSystem("ws2_32.dll", false /*fNoUnload*/, &hLdrMod);
+    if (RT_SUCCESS(rc))
+    {
+        RESOLVE_SYMBOL(WSAStartup);
+        RESOLVE_SYMBOL(WSACleanup);
+        RESOLVE_SYMBOL(WSASocketA);
+        RESOLVE_SYMBOL(WSAIoctl);
+        RESOLVE_SYMBOL(WSAGetLastError);
+        RESOLVE_SYMBOL(closesocket);
+        RESOLVE_SYMBOL(inet_ntoa);
+        RTLdrClose(hLdrMod);
+    }
+}
+
+
+/**
  * @todo Add full unicode support.
  * @todo Add event log capabilities / check return values.
  */
-static DWORD vgsvcWinAddAceToObjectsSecurityDescriptor(LPTSTR pszObjName,
-                                                       SE_OBJECT_TYPE ObjectType,
-                                                       LPTSTR pszTrustee,
-                                                       TRUSTEE_FORM TrusteeForm,
-                                                       DWORD dwAccessRights,
-                                                       ACCESS_MODE AccessMode,
-                                                       DWORD dwInheritance)
-{
-    PACL pOldDACL = NULL, pNewDACL = NULL;
-    PSECURITY_DESCRIPTOR pSD = NULL;
-    EXPLICIT_ACCESS ea;
-
-    if (NULL == pszObjName)
-        return ERROR_INVALID_PARAMETER;
-
-    /* Get a pointer to the existing DACL. */
-    DWORD dwRes = GetNamedSecurityInfo(pszObjName, ObjectType, DACL_SECURITY_INFORMATION, NULL, NULL, &pOldDACL, NULL, &pSD);
-    if (ERROR_SUCCESS != dwRes)
-    {
-        if (dwRes == ERROR_FILE_NOT_FOUND)
-            VGSvcError("AddAceToObjectsSecurityDescriptor: Object not found/installed: %s\n", pszObjName);
+static int vgsvcWinAddAceToObjectsSecurityDescriptor(LPTSTR pszObjName, SE_OBJECT_TYPE enmObjectType, const char *pszTrustee,
+                                                     TRUSTEE_FORM enmTrusteeForm, DWORD dwAccessRights, ACCESS_MODE fAccessMode,
+                                                     DWORD dwInheritance)
+{
+    int rc;
+    if (   g_pfnGetNamedSecurityInfoA
+        && g_pfnSetEntriesInAclA
+        && g_pfnSetNamedSecurityInfoA)
+    {
+        /* Get a pointer to the existing DACL. */
+        PSECURITY_DESCRIPTOR    pSD      = NULL;
+        PACL                    pOldDACL = NULL;
+        DWORD rcWin = g_pfnGetNamedSecurityInfoA(pszObjName, enmObjectType, DACL_SECURITY_INFORMATION,
+                                                 NULL, NULL, &pOldDACL, NULL, &pSD);
+        if (rcWin == ERROR_SUCCESS)
+        {
+            /* Initialize an EXPLICIT_ACCESS structure for the new ACE. */
+            EXPLICIT_ACCESSA ExplicitAccess;
+            RT_ZERO(ExplicitAccess);
+            ExplicitAccess.grfAccessPermissions = dwAccessRights;
+            ExplicitAccess.grfAccessMode        = fAccessMode;
+            ExplicitAccess.grfInheritance       = dwInheritance;
+            ExplicitAccess.Trustee.TrusteeForm  = enmTrusteeForm;
+            ExplicitAccess.Trustee.ptstrName    = (char *)pszTrustee;
+
+            /* Create a new ACL that merges the new ACE into the existing DACL. */
+            PACL pNewDACL = NULL;
+            rcWin = g_pfnSetEntriesInAclA(1, &ExplicitAccess, pOldDACL, &pNewDACL);
+            if (rcWin == ERROR_SUCCESS)
+            {
+                /* Attach the new ACL as the object's DACL. */
+                rcWin = g_pfnSetNamedSecurityInfoA(pszObjName, enmObjectType, DACL_SECURITY_INFORMATION,
+                                                   NULL, NULL, pNewDACL, NULL);
+                if (rcWin == ERROR_SUCCESS)
+                    rc = VINF_SUCCESS;
+                else
+                {
+                    VGSvcError("AddAceToObjectsSecurityDescriptor: SetNamedSecurityInfo: Error %u\n", rcWin);
+                    rc = RTErrConvertFromWin32(rcWin);
+                }
+                if (pNewDACL)
+                    LocalFree(pNewDACL);
+            }
+            else
+            {
+                VGSvcError("AddAceToObjectsSecurityDescriptor: SetEntriesInAcl: Error %u\n", rcWin);
+                rc = RTErrConvertFromWin32(rcWin);
+            }
+            if (pSD)
+                LocalFree(pSD);
+        }
         else
-            VGSvcError("AddAceToObjectsSecurityDescriptor: GetNamedSecurityInfo: Error %u\n", dwRes);
-        goto l_Cleanup;
-    }
-
-    /* Initialize an EXPLICIT_ACCESS structure for the new ACE. */
-    ZeroMemory(&ea, sizeof(EXPLICIT_ACCESS));
-    ea.grfAccessPermissions = dwAccessRights;
-    ea.grfAccessMode = AccessMode;
-    ea.grfInheritance= dwInheritance;
-    ea.Trustee.TrusteeForm = TrusteeForm;
-    ea.Trustee.ptstrName = pszTrustee;
-
-    /* Create a new ACL that merges the new ACE into the existing DACL. */
-    dwRes = SetEntriesInAcl(1, &ea, pOldDACL, &pNewDACL);
-    if (ERROR_SUCCESS != dwRes)
-    {
-        VGSvcError("AddAceToObjectsSecurityDescriptor: SetEntriesInAcl: Error %u\n", dwRes);
-        goto l_Cleanup;
-    }
-
-    /* Attach the new ACL as the object's DACL. */
-    dwRes = SetNamedSecurityInfo(pszObjName, ObjectType, DACL_SECURITY_INFORMATION, NULL, NULL, pNewDACL, NULL);
-    if (ERROR_SUCCESS != dwRes)
-    {
-        VGSvcError("AddAceToObjectsSecurityDescriptor: SetNamedSecurityInfo: Error %u\n", dwRes);
-        goto l_Cleanup;
-    }
-
-    /** @todo get rid of that spaghetti jump ... */
-l_Cleanup:
-
-    if(pSD != NULL)
-        LocalFree((HLOCAL) pSD);
-    if(pNewDACL != NULL)
-        LocalFree((HLOCAL) pNewDACL);
-
-    return dwRes;
+        {
+            if (rcWin == ERROR_FILE_NOT_FOUND)
+                VGSvcError("AddAceToObjectsSecurityDescriptor: Object not found/installed: %s\n", pszObjName);
+            else
+                VGSvcError("AddAceToObjectsSecurityDescriptor: GetNamedSecurityInfo: Error %u\n", rcWin);
+            rc = RTErrConvertFromWin32(rcWin);
+        }
+    }
+    else
+        rc = VINF_SUCCESS; /* fake it */
+    return rc;
 }
 
@@ -381 +435 @@
     int rc = VINF_SUCCESS;
 
-    /* Create a well-known SID for the "Builtin Users" group. */
+    /*
+     * Create a well-known SID for the "Builtin Users" group and modify the ACE
+     * for the shared folders miniport redirector DN (whatever DN means).
+     */
     PSID                     pBuiltinUsersSID = NULL;
     SID_IDENTIFIER_AUTHORITY SIDAuthWorld     = SECURITY_LOCAL_SID_AUTHORITY;
     if (AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_LOCAL_RID, 0, 0, 0, 0, 0, 0, 0, &pBuiltinUsersSID))
     {
-        DWORD dwRes = vgsvcWinAddAceToObjectsSecurityDescriptor(TEXT("\\\\.\\VBoxMiniRdrDN"),
-                                                                SE_FILE_OBJECT,
-                                                                (LPTSTR)pBuiltinUsersSID,
-                                                                TRUSTEE_IS_SID,
-                                                                FILE_GENERIC_READ | FILE_GENERIC_WRITE,
-                                                                SET_ACCESS,
-                                                                NO_INHERITANCE);
-        if (dwRes != ERROR_SUCCESS)
-        {
-            if (dwRes == ERROR_FILE_NOT_FOUND)
-            {
-                /* If we don't find our "VBoxMiniRdrDN" (for Shared Folders) object above,
-                   don't report an error; it just might be not installed. Otherwise this
-                  would cause the SCM to hang on starting up the service. */
-                rc = VINF_SUCCESS;
-            }
-            else
-                rc = RTErrConvertFromWin32(dwRes);
-        }
+        rc = vgsvcWinAddAceToObjectsSecurityDescriptor(TEXT("\\\\.\\VBoxMiniRdrDN"), SE_FILE_OBJECT,
+                                                       (LPTSTR)pBuiltinUsersSID, TRUSTEE_IS_SID,
+                                                       FILE_GENERIC_READ | FILE_GENERIC_WRITE, SET_ACCESS, NO_INHERITANCE);
+        /* If we don't find our "VBoxMiniRdrDN" (for Shared Folders) object above,
+           don't report an error; it just might be not installed. Otherwise this
+           would cause the SCM to hang on starting up the service. */
+        if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
+            rc = VINF_SUCCESS;
+
+        FreeSid(pBuiltinUsersSID);
     }
     else
         rc = RTErrConvertFromWin32(GetLastError());
-
     if (RT_SUCCESS(rc))
     {
+        /*
+         * Start the service.
+         */
         vgsvcWinSetStatus(SERVICE_START_PENDING, 0);
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -212 +212 @@
 extern decltype(ZwQuerySystemInformation)      *g_pfnZwQuerySystemInformation;
 # endif
-#endif
-
-#ifdef RT_OS_WINDOWS
+extern ULONG (WINAPI *g_pfnGetAdaptersInfo)(struct _IP_ADAPTER_INFO *, PULONG);
+#ifdef WINSOCK_VERSION
+extern decltype(WSAStartup)                    *g_pfnWSAStartup;
+extern decltype(WSACleanup)                    *g_pfnWSACleanup;
+extern decltype(WSASocketA)                    *g_pfnWSASocketA;
+extern decltype(WSAIoctl)                      *g_pfnWSAIoctl;
+extern decltype(WSAGetLastError)               *g_pfnWSAGetLastError;
+extern decltype(closesocket)                   *g_pfnclosesocket;
+extern decltype(inet_ntoa)                     *g_pfninet_ntoa;
+# endif /* WINSOCK_VERSION */
+
 # ifdef VBOX_WITH_GUEST_PROPS
 extern int                      VGSvcVMInfoWinWriteUsers(PVBOXSERVICEVEPROPCACHE pCache, char **ppszUserList, uint32_t *pcUsersInList);
 extern int                      VGSvcVMInfoWinGetComponentVersions(uint32_t uClientID);
 # endif /* VBOX_WITH_GUEST_PROPS */
+
 #endif /* RT_OS_WINDOWS */
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -219 +219 @@
     if (!GetVersionExA((OSVERSIONINFO *)&g_WinVersion))
     {
-        AssertFailed();
         RT_ZERO(g_WinVersion);
         g_WinVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
         if (!GetVersionExA((OSVERSIONINFO *)&g_WinVersion))
+        {
+            AssertFailed();
             RT_ZERO(g_WinVersion);
+        }
     }
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -553 +553 @@
 
 #ifdef RT_OS_WINDOWS
-# ifndef TARGET_NT4
     rc = VGSvcVMInfoWinWriteUsers(&g_VMInfoPropCache, &pszUserList, &cUsersInList);
-# else
-    rc = VERR_NOT_IMPLEMENTED;
-# endif
 
 #elif defined(RT_OS_FREEBSD)
@@ -936 +932 @@
 
 #ifdef RT_OS_WINDOWS
-    IP_ADAPTER_INFO *pAdpInfo = NULL;
-
-# ifndef TARGET_NT4
-    ULONG cbAdpInfo = sizeof(*pAdpInfo);
-    pAdpInfo = (IP_ADAPTER_INFO *)RTMemAlloc(cbAdpInfo);
+    /* */
+    if (   !g_pfnGetAdaptersInfo
+        && (   !g_pfnWSAIoctl
+            || !g_pfnWSASocketA
+            || !g_pfnWSAGetLastError
+            || !g_pfninet_ntoa
+            || !g_pfnclosesocket) )
+           return VINF_SUCCESS;
+
+    ULONG            cbAdpInfo = sizeof(IP_ADAPTER_INFO);
+    IP_ADAPTER_INFO *pAdpInfo  = (IP_ADAPTER_INFO *)RTMemAlloc(cbAdpInfo);
     if (!pAdpInfo)
     {
@@ -946 +948 @@
         return VERR_NO_MEMORY;
     }
-    DWORD dwRet = GetAdaptersInfo(pAdpInfo, &cbAdpInfo);
+    DWORD dwRet = g_pfnGetAdaptersInfo ? g_pfnGetAdaptersInfo(pAdpInfo, &cbAdpInfo) : ERROR_NO_DATA;
     if (dwRet == ERROR_BUFFER_OVERFLOW)
     {
@@ -953 +955 @@
         {
             pAdpInfo = pAdpInfoNew;
-            dwRet = GetAdaptersInfo(pAdpInfo, &cbAdpInfo);
+            dwRet = g_pfnGetAdaptersInfo(pAdpInfo, &cbAdpInfo);
         }
     }
@@ -964 +966 @@
         dwRet = ERROR_SUCCESS;
     }
-
     if (dwRet != ERROR_SUCCESS)
     {
-        if (pAdpInfo)
-            RTMemFree(pAdpInfo);
+        RTMemFree(pAdpInfo);
         VGSvcError("VMInfo/Network: Failed to get adapter info: Error %d\n", dwRet);
         return RTErrConvertFromWin32(dwRet);
     }
-# endif /* !TARGET_NT4 */
-
-    SOCKET sd = WSASocket(AF_INET, SOCK_DGRAM, 0, 0, 0, 0);
+
+    SOCKET sd = g_pfnWSASocketA(AF_INET, SOCK_DGRAM, 0, 0, 0, 0);
     if (sd == SOCKET_ERROR) /* Socket invalid. */
     {
-        int wsaErr = WSAGetLastError();
+        int wsaErr = g_pfnWSAGetLastError();
         /* Don't complain/bail out with an error if network stack is not up; can happen
          * on NT4 due to start up when not connected shares dialogs pop up. */
@@ -992 +991 @@
     }
 
-    INTERFACE_INFO aInterfaces[20] = {0};
-    DWORD cbReturned = 0;
-# ifdef TARGET_NT4
+    INTERFACE_INFO  aInterfaces[20] = {0};
+    DWORD           cbReturned      = 0;
+# ifdef RT_ARCH_x86
     /* Workaround for uninitialized variable used in memcpy in GetTcpipInterfaceList
        (NT4SP1 at least).  It seems to be happy enough with garbages, no failure
@@ -1012 +1011 @@
     }
 # endif
-    if (   WSAIoctl(sd,
-                    SIO_GET_INTERFACE_LIST,
-                    NULL,                /* pvInBuffer */
-                    0,                   /* cbInBuffer */
-                    &aInterfaces[0],     /* pvOutBuffer */
-                    sizeof(aInterfaces), /* cbOutBuffer */
-                    &cbReturned,
-                    NULL,                /* pOverlapped */
-                    NULL)                /* pCompletionRoutine */
-        == SOCKET_ERROR)
-    {
-        VGSvcError("VMInfo/Network: Failed to WSAIoctl() on socket: Error: %d\n", WSAGetLastError());
+    int rc = g_pfnWSAIoctl(sd,
+                           SIO_GET_INTERFACE_LIST,
+                           NULL,                /* pvInBuffer */
+                           0,                   /* cbInBuffer */
+                           &aInterfaces[0],     /* pvOutBuffer */
+                           sizeof(aInterfaces), /* cbOutBuffer */
+                           &cbReturned,
+                           NULL,                /* pOverlapped */
+                           NULL);               /* pCompletionRoutine */
+    if (rc == SOCKET_ERROR)
+    {
+        VGSvcError("VMInfo/Network: Failed to WSAIoctl() on socket: Error: %d\n", g_pfnWSAGetLastError());
         if (pAdpInfo)
             RTMemFree(pAdpInfo);
-        return RTErrConvertFromWin32(WSAGetLastError());
-    }
+        g_pfnclosesocket(sd);
+        return RTErrConvertFromWin32(g_pfnWSAGetLastError());
+    }
+    g_pfnclosesocket(sd);
     int cIfacesSystem = cbReturned / sizeof(INTERFACE_INFO);
 
@@ -1041 +1042 @@
         Assert(pAddress);
         char szIp[32];
-        RTStrPrintf(szIp, sizeof(szIp), "%s", inet_ntoa(pAddress->sin_addr));
+        RTStrPrintf(szIp, sizeof(szIp), "%s", g_pfninet_ntoa(pAddress->sin_addr));
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/V4/IP", cIfsReported);
         VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szIp);
@@ -1047 +1048 @@
         pAddress = (sockaddr_in *) & (aInterfaces[i].iiBroadcastAddress);
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/V4/Broadcast", cIfsReported);
-        VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
+        VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", g_pfninet_ntoa(pAddress->sin_addr));
 
         pAddress = (sockaddr_in *)&(aInterfaces[i].iiNetmask);
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/V4/Netmask", cIfsReported);
-        VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", inet_ntoa(pAddress->sin_addr));
+        VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", g_pfninet_ntoa(pAddress->sin_addr));
 
         RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/Status", cIfsReported);
         VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, nFlags & IFF_UP ? "Up" : "Down");
 
-# ifndef TARGET_NT4
-        IP_ADAPTER_INFO *pAdp;
-        for (pAdp = pAdpInfo; pAdp; pAdp = pAdp->Next)
-            if (!strcmp(pAdp->IpAddressList.IpAddress.String, szIp))
-                break;
-
-        RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/MAC", cIfsReported);
-        if (pAdp)
-        {
-            char szMac[32];
-            RTStrPrintf(szMac, sizeof(szMac), "%02X%02X%02X%02X%02X%02X",
-                        pAdp->Address[0], pAdp->Address[1], pAdp->Address[2],
-                        pAdp->Address[3], pAdp->Address[4], pAdp->Address[5]);
-            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szMac);
-        }
-        else
-            VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, NULL);
-# endif /* !TARGET_NT4 */
+        if (pAdpInfo)
+        {
+            IP_ADAPTER_INFO *pAdp;
+            for (pAdp = pAdpInfo; pAdp; pAdp = pAdp->Next)
+                if (!strcmp(pAdp->IpAddressList.IpAddress.String, szIp))
+                    break;
+
+            RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%RU32/MAC", cIfsReported);
+            if (pAdp)
+            {
+                char szMac[32];
+                RTStrPrintf(szMac, sizeof(szMac), "%02X%02X%02X%02X%02X%02X",
+                            pAdp->Address[0], pAdp->Address[1], pAdp->Address[2],
+                            pAdp->Address[3], pAdp->Address[4], pAdp->Address[5]);
+                VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, "%s", szMac);
+            }
+            else
+                VGSvcPropCacheUpdate(&g_VMInfoPropCache, szPropPath, NULL);
+        }
 
         cIfsReported++;
@@ -1079 +1081 @@
     if (pAdpInfo)
         RTMemFree(pAdpInfo);
-    closesocket(sd);
 
 #elif defined(RT_OS_HAIKU)
@@ -1450 +1451 @@
 #ifdef RT_OS_WINDOWS
     /* Required for network information (must be called per thread). */
-    WSADATA wsaData;
-    if (WSAStartup(MAKEWORD(2, 2), &wsaData))
-        VGSvcError("VMInfo/Network: WSAStartup failed! Error: %Rrc\n", RTErrConvertFromWin32(WSAGetLastError()));
-#endif /* RT_OS_WINDOWS */
+    if (g_pfnWSAStartup)
+    {
+        WSADATA wsaData;
+        RT_ZERO(wsaData);
+        if (g_pfnWSAStartup(MAKEWORD(2, 2), &wsaData))
+            VGSvcError("VMInfo/Network: WSAStartup failed! Error: %Rrc\n", RTErrConvertFromWin32(g_pfnWSAGetLastError()));
+    }
+#endif
 
     /*
@@ -1596 +1601 @@
 
 #ifdef RT_OS_WINDOWS
-    WSACleanup();
+    if (g_pfnWSACleanup)
+        g_pfnWSACleanup();
 #endif