Changeset 70195 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119769

Message:

IPRT/R3: Made the core work on NT 3.51 (still experimental).

Location:

trunk/src/VBox/Runtime/r3

Files:

• nt/RTPathQueryInfo-nt.cpp (modified) (2 diffs)
• nt/pathint-nt.cpp (modified) (5 diffs)
• socket.cpp (modified) (58 diffs)
• win/errvars-win.cpp (modified) (4 diffs)
• win/init-win.cpp (modified) (5 diffs)
• win/internal-r3-win.h (modified) (1 diff)
• win/process-win.cpp (modified) (1 diff)
• win/vcc100-kernel32-fakes.cpp (modified) (6 diffs)
• win/vcc100-kernel32-fakesA.asm (modified) (1 diff)

trunk/src/VBox/Runtime/r3/nt/RTPathQueryInfo-nt.cpp

@@ -46 +46 @@
     (   (a_UniStr)->Length == sizeof(a_wszType) - sizeof(RTUTF16) \
      && memcmp((a_UniStr)->Buffer, a_wszType, sizeof(a_wszType) - sizeof(RTUTF16)) == 0)
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+extern decltype(NtQueryFullAttributesFile) *g_pfnNtQueryFullAttributesFile; /* init-win.cpp */
 
 
@@ -378 +384 @@
      */
     int rc = VINF_TRY_AGAIN;
-    if (enmAddAttr != RTFSOBJATTRADD_UNIX)
+    if (   enmAddAttr != RTFSOBJATTRADD_UNIX
+        && g_pfnNtQueryFullAttributesFile)
     {
         InitializeObjectAttributes(&ObjAttr, pNtName, OBJ_CASE_INSENSITIVE, hRootDir, NULL);
-        rcNt = NtQueryFullAttributesFile(&ObjAttr, &uBuf.NetOpenInfo);
+        rcNt = g_pfnNtQueryFullAttributesFile(&ObjAttr, &uBuf.NetOpenInfo);
         if (NT_SUCCESS(rcNt))
         {

trunk/src/VBox/Runtime/r3/nt/pathint-nt.cpp

@@ -38 +38 @@
 #include <iprt/assert.h>
 
+#include "../win/internal-r3-win.h"
+
 
 /*********************************************************************************************************************************
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-static char const g_szPrefixUnc[] = "\\??\\UNC\\";
-static char const g_szPrefix[]    = "\\??\\";
+static char const g_szPrefixUnc[]      = "\\??\\UNC\\";
+static char const g_szPrefix[]         = "\\??\\";
+static char const g_szPrefixNt3xUnc[]  = "\\DosDevices\\UNC\\";
+static char const g_szPrefixNt3x[]     = "\\DosDevices\\";
 
 
@@ -64 +68 @@
         if (cwcLen < _32K - 1)
         {
-            pwszPath[0] = '\\';
-            pwszPath[1] = '?';
-            pwszPath[2] = '?';
-            pwszPath[3] = '\\';
-
+            *phRootDir = NULL;
+            if (   g_enmWinVer >=  kRTWinOSType_NT4
+                || g_enmWinVer == kRTWinOSType_UNKNOWN)
+            {
+                pwszPath[0] = '\\';
+                pwszPath[1] = '?';
+                pwszPath[2] = '?';
+                pwszPath[3] = '\\';
+
+                pNtName->Buffer = pwszPath;
+                pNtName->Length = (uint16_t)(cwcLen * sizeof(RTUTF16));
+                pNtName->MaximumLength = pNtName->Length + sizeof(RTUTF16);
+                return VINF_SUCCESS;
+            }
+
+            rc = RTUtf16Realloc(&pwszPath, cwcLen + sizeof(g_szPrefixNt3x));
+            if (RT_SUCCESS(rc))
+            {
+                memmove(&pwszPath[sizeof(g_szPrefixNt3x) - 1], &pwszPath[4], (cwcLen - 4 + 1) * sizeof(RTUTF16));
+                for (uint32_t i = 0; i < sizeof(g_szPrefixNt3x) - 1; i++)
+                    pwszPath[i] = g_szPrefixNt3x[i];
+
+                pNtName->Buffer = pwszPath;
+                pNtName->Length = (uint16_t)((cwcLen - 4 + sizeof(g_szPrefixNt3x) - 1) * sizeof(RTUTF16));
+                pNtName->MaximumLength = pNtName->Length + sizeof(RTUTF16);
+                return VINF_SUCCESS;
+            }
+        }
+
+        RTUtf16Free(pwszPath);
+        rc = VERR_FILENAME_TOO_LONG;
+    }
+    return rc;
+}
+
+
+/**
+ * Handles the pass thru case for UTF-16 input.
+ * Win32 path uses "\\?\" prefix which is converted to "\??\" NT prefix.
+ *
+ * @returns IPRT status code.
+ * @param   pNtName             Where to return the NT name.
+ * @param   phRootDir           Stores NULL here, as we don't use it.
+ * @param   pwszWinPath         The UTF-16 windows-style path.
+ * @param   cwcWinPath          The length of the windows-style input path.
+ */
+static int rtNtPathFromWinUtf16PassThru(struct _UNICODE_STRING *pNtName, PHANDLE phRootDir,
+                                        PCRTUTF16 pwszWinPath, size_t cwcWinPath)
+{
+    /* Check length and allocate memory for it. */
+    int rc;
+    if (cwcWinPath < _32K - 1)
+    {
+        size_t const cwcExtraPrefix =  g_enmWinVer >=  kRTWinOSType_NT4 || g_enmWinVer == kRTWinOSType_UNKNOWN
+                                    ? 0 : sizeof(g_szPrefixNt3x) - 1 - 4;
+        PRTUTF16 pwszNtPath = (PRTUTF16)RTUtf16Alloc((cwcExtraPrefix + cwcWinPath + 1) * sizeof(RTUTF16));
+        if (pwszNtPath)
+        {
+            /* Intialize the path. */
+            if (!cwcExtraPrefix)
+            {
+                pwszNtPath[0] = '\\';
+                pwszNtPath[1] = '?';
+                pwszNtPath[2] = '?';
+                pwszNtPath[3] = '\\';
+            }
+            else
+                for (uint32_t i = 0; i < sizeof(g_szPrefixNt3x) - 1; i++)
+                    pwszNtPath[i] = g_szPrefixNt3x[i];
+            memcpy(pwszNtPath + cwcExtraPrefix + 4, pwszWinPath + 4, (cwcWinPath - 4) * sizeof(RTUTF16));
+            pwszNtPath[cwcExtraPrefix + cwcWinPath] = '\0';
+
+            /* Initialize the return values. */
+            pNtName->Buffer = pwszNtPath;
+            pNtName->Length = (uint16_t)(cwcExtraPrefix + cwcWinPath * sizeof(RTUTF16));
+            pNtName->MaximumLength = pNtName->Length + sizeof(RTUTF16);
+            *phRootDir = NULL;
+
+            rc = VINF_SUCCESS;
+        }
+        else
+            rc = VERR_NO_UTF16_MEMORY;
+    }
+    else
+        rc = VERR_FILENAME_TOO_LONG;
+    return rc;
+}
+
+
+
+
+
+/**
+ * Converts the path to UTF-16 and sets all the return values.
+ *
+ * @returns IPRT status code.
+ * @param   pNtName             Where to return the NT name.
+ * @param   phRootDir           Where to return the root handle, if applicable.
+ * @param   pszPath             The UTF-8 path.
+ */
+static int rtNtPathUtf8ToUniStr(struct _UNICODE_STRING *pNtName, PHANDLE phRootDir, const char *pszPath)
+{
+    PRTUTF16 pwszPath = NULL;
+    size_t   cwcLen;
+    int rc = RTStrToUtf16Ex(pszPath, RTSTR_MAX, &pwszPath, 0, &cwcLen);
+    if (RT_SUCCESS(rc))
+    {
+        if (cwcLen < _32K - 1)
+        {
             pNtName->Buffer = pwszPath;
             pNtName->Length = (uint16_t)(cwcLen * sizeof(RTUTF16));
@@ -84 +192 @@
 
 /**
- * Handles the pass thru case for UTF-16 input.
- * Win32 path uses "\\?\" prefix which is converted to "\??\" NT prefix.
- *
- * @returns IPRT status code.
- * @param   pNtName             Where to return the NT name.
- * @param   phRootDir           Stores NULL here, as we don't use it.
- * @param   pwszWinPath         The UTF-16 windows-style path.
- * @param   cwcWinPath          The length of the windows-style input path.
- */
-static int rtNtPathFromWinUtf16PassThru(struct _UNICODE_STRING *pNtName, PHANDLE phRootDir,
-                                        PCRTUTF16 pwszWinPath, size_t cwcWinPath)
-{
-    /* Check length and allocate memory for it. */
-    int rc;
-    if (cwcWinPath < _32K - 1)
-    {
-        PRTUTF16 pwszNtPath = (PRTUTF16)RTUtf16Alloc((cwcWinPath + 1) * sizeof(RTUTF16));
-        if (pwszNtPath)
-        {
-            /* Intialize the path. */
-            pwszNtPath[0] = '\\';
-            pwszNtPath[1] = '?';
-            pwszNtPath[2] = '?';
-            pwszNtPath[3] = '\\';
-            memcpy(pwszNtPath + 4, pwszWinPath + 4, (cwcWinPath - 4) * sizeof(RTUTF16));
-            pwszNtPath[cwcWinPath] = '\0';
-
-            /* Initialize the return values. */
-            pNtName->Buffer = pwszNtPath;
-            pNtName->Length = (uint16_t)(cwcWinPath * sizeof(RTUTF16));
-            pNtName->MaximumLength = pNtName->Length + sizeof(RTUTF16);
-            *phRootDir = NULL;
-
-            rc = VINF_SUCCESS;
-        }
-        else
-            rc = VERR_NO_UTF16_MEMORY;
-    }
-    else
-        rc = VERR_FILENAME_TOO_LONG;
-    return rc;
-}
-
-
-
-
-
-/**
- * Converts the path to UTF-16 and sets all the return values.
- *
- * @returns IPRT status code.
- * @param   pNtName             Where to return the NT name.
- * @param   phRootDir           Where to return the root handle, if applicable.
- * @param   pszPath             The UTF-8 path.
- */
-static int rtNtPathUtf8ToUniStr(struct _UNICODE_STRING *pNtName, PHANDLE phRootDir, const char *pszPath)
-{
-    PRTUTF16 pwszPath = NULL;
-    size_t   cwcLen;
-    int rc = RTStrToUtf16Ex(pszPath, RTSTR_MAX, &pwszPath, 0, &cwcLen);
-    if (RT_SUCCESS(rc))
-    {
-        if (cwcLen < _32K - 1)
-        {
-            pNtName->Buffer = pwszPath;
-            pNtName->Length = (uint16_t)(cwcLen * sizeof(RTUTF16));
-            pNtName->MaximumLength = pNtName->Length + sizeof(RTUTF16);
-            *phRootDir = NULL;
-            return VINF_SUCCESS;
-        }
-
-        RTUtf16Free(pwszPath);
-        rc = VERR_FILENAME_TOO_LONG;
-    }
-    return rc;
-}
-
-
-/**
  * Converts a windows-style path to NT format and encoding.
  *
@@ -179 +208 @@
      * Very simple conversion of a win32-like path into an NT path.
      */
-    const char *pszPrefix = g_szPrefix;
-    size_t      cchPrefix = sizeof(g_szPrefix) - 1;
+    const char *pszPrefix;
+    size_t      cchPrefix;
+    if (   g_enmWinVer >=  kRTWinOSType_NT4
+        || g_enmWinVer == kRTWinOSType_UNKNOWN)
+    {
+        pszPrefix = g_szPrefix;
+        cchPrefix = sizeof(g_szPrefix) - 1;
+    }
+    else
+    {
+        pszPrefix = g_szPrefixNt3x;
+        cchPrefix = sizeof(g_szPrefixNt3x) - 1;
+    }
+
     size_t      cchSkip   = 0;
-
     if (   RTPATH_IS_SLASH(pszPath[0])
         && RTPATH_IS_SLASH(pszPath[1])
@@ -211 +251 @@
         {
             /* UNC */
-            pszPrefix = g_szPrefixUnc;
-            cchPrefix = sizeof(g_szPrefixUnc) - 1;
+            if (   g_enmWinVer >=  kRTWinOSType_NT4
+                || g_enmWinVer == kRTWinOSType_UNKNOWN)
+            {
+                pszPrefix = g_szPrefixUnc;
+                cchPrefix = sizeof(g_szPrefixUnc) - 1;
+            }
+            else
+            {
+                pszPrefix = g_szPrefixNt3xUnc;
+                cchPrefix = sizeof(g_szPrefixNt3xUnc) - 1;
+            }
             cchSkip   = 2;
         }

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

@@ -71 +71 @@
 #include "internal/socket.h"
 #include "internal/string.h"
+#ifdef RT_OS_WINDOWS
+# include "win/internal-r3-win.h"
+#endif
 
 
@@ -187 +190 @@
 {
 #ifdef RT_OS_WINDOWS
-    return RTErrConvertFromWin32(WSAGetLastError());
+    if (g_pfnWSAGetLastError)
+        return RTErrConvertFromWin32(g_pfnWSAGetLastError());
+    return VERR_NET_IO_ERROR;
 #else
     return RTErrConvertFromErrno(errno);
@@ -200 +205 @@
 {
 #ifdef RT_OS_WINDOWS
-    WSASetLastError(0);
+    if (g_pfnWSASetLastError)
+        g_pfnWSASetLastError(0);
 #else
     errno = 0;
@@ -215 +221 @@
 {
 #ifdef RT_OS_WINDOWS
-    return RTErrConvertFromWin32(WSAGetLastError());
+    if (g_pfnWSAGetLastError)
+        return RTErrConvertFromWin32(g_pfnWSAGetLastError());
+    return VERR_UNRESOLVED_ERROR;
 #else
     switch (h_errno)
@@ -355 +363 @@
 {
 #ifdef RT_OS_WINDOWS
-    u_long  uBlocking = fBlocking ? 0 : 1;
-    if (ioctlsocket(pThis->hNative, FIONBIO, &uBlocking))
+    AssertReturn(g_pfnioctlsocket, VERR_NOT_SUPPORTED);
+    u_long uBlocking = fBlocking ? 0 : 1;
+    if (g_pfnioctlsocket(pThis->hNative, FIONBIO, &uBlocking))
         return rtSocketError();
 
 #else
-    int     fFlags    = fcntl(pThis->hNative, F_GETFL, 0);
+    int fFlags = fcntl(pThis->hNative, F_GETFL, 0);
     if (fFlags == -1)
         return rtSocketError();
@@ -448 +457 @@
 DECLHIDDEN(int) rtSocketCreate(PRTSOCKET phSocket, int iDomain, int iType, int iProtocol)
 {
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnsocket, VERR_NOT_SUPPORTED);
+    AssertReturn(g_pfnclosesocket, VERR_NOT_SUPPORTED);
+#endif
+
     /*
      * Create the socket.
      */
+#ifdef RT_OS_WINDOWS
+    RTSOCKETNATIVE hNative = g_pfnsocket(iDomain, iType, iProtocol);
+#else
     RTSOCKETNATIVE hNative = socket(iDomain, iType, iProtocol);
+#endif
     if (hNative == NIL_RTSOCKETNATIVE)
         return rtSocketError();
@@ -462 +480 @@
     {
 #ifdef RT_OS_WINDOWS
-        closesocket(hNative);
+        g_pfnclosesocket(hNative);
 #else
         close(hNative);
@@ -510 +528 @@
 
 #ifdef RT_OS_WINDOWS
-            if (closesocket(hNative))
+            AssertReturn(g_pfnclosesocket, VERR_NOT_SUPPORTED);
+            if (g_pfnclosesocket(hNative))
 #else
             if (close(hNative))
@@ -532 +551 @@
         {
             pThis->hEvent = WSA_INVALID_EVENT;
-            WSACloseEvent(hEvent);
+            Assert(g_pfnWSACloseEvent);
+            if (g_pfnWSACloseEvent)
+                g_pfnWSACloseEvent(hEvent);
         }
 #endif
@@ -644 +665 @@
     AssertPtrNullReturn(pszAddress, VERR_INVALID_POINTER);
 
-#ifdef RT_OS_WINDOWS
-    /*
-     * Initialize WinSock and check version.
-     */
-    WORD    wVersionRequested = MAKEWORD(1, 1);
-    WSADATA wsaData;
-    rc = WSAStartup(wVersionRequested, &wsaData);
-    if (wsaData.wVersion != wVersionRequested)
-    {
-        AssertMsgFailed(("Wrong winsock version\n"));
-        return VERR_NOT_SUPPORTED;
-    }
-#endif
-
     /*
      * Resolve the address. Pretty crude at the moment, but we have to make
@@ -676 +683 @@
     }
 
+#ifdef RT_OS_WINDOWS
+    /* Initialize WinSock and check version before we call gethostbyname. */
+    if (   !g_pfnWSAStartup
+        || !g_pfngethostbyname)
+        return VERR_NOT_SUPPORTED;
+    WORD    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;
+    }
+# define gethostbyname g_pfngethostbyname
+#endif
+
     struct hostent *pHostEnt;
     pHostEnt = gethostbyname(pszAddress);
@@ -696 +720 @@
         return VERR_NET_ADDRESS_FAMILY_NOT_SUPPORTED;
 
+#ifdef RT_OS_WINDOWS
+# undef gethostbyname
+#endif
     return VINF_SUCCESS;
 }
@@ -748 +775 @@
      * Winsock2 init
      */
+    if (   !g_pfnWSAStartup
+        || !g_pfngetaddrinfo
+        || !g_pfnfreeaddrinfo)
+        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)
@@ -757 +789 @@
         return VERR_NOT_SUPPORTED;
     }
+#  define getaddrinfo  g_pfngetaddrinfo
+#  define freeaddrinfo g_pfnfreeaddrinfo
 # endif
 
     /** @todo r=bird: getaddrinfo and freeaddrinfo breaks the additions on NT4. */
     struct addrinfo *pgrResults = NULL;
-    rc = getaddrinfo(pszHost, "", &grHints, &pgrResults);
+    rc = g_pfngetaddrinfo(pszHost, "", &grHints, &pgrResults);
     if (rc != 0)
         return VERR_NET_ADDRESS_NOT_AVAILABLE;
@@ -822 +856 @@
         *penmAddrType = enmAddrType;
     return rc;
+
+# ifdef RT_OS_WINDOWS
+#  undef getaddrinfo
+#  undef freeaddrinfo
+# endif
 #endif /* !RT_OS_OS2 */
 }
@@ -836 +875 @@
     AssertReturn(cbBuffer > 0, VERR_INVALID_PARAMETER);
     AssertPtr(pvBuffer);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnrecv, VERR_NOT_SUPPORTED);
+# define recv g_pfnrecv
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -890 +933 @@
 
     rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef recv
+#endif
     return rc;
 }
@@ -905 +951 @@
     AssertPtr(pvBuffer);
     AssertPtr(pcbRead);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnrecvfrom, VERR_NOT_SUPPORTED);
+# define recvfrom g_pfnrecvfrom
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -944 +994 @@
 
     rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef recvfrom
+#endif
     return rc;
 }
@@ -956 +1009 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnsend, VERR_NOT_SUPPORTED);
+# define send g_pfnsend
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -1013 +1070 @@
 
     rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef send
+#endif
     return rc;
 }
@@ -1025 +1085 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnsendto, VERR_NOT_SUPPORTED);
+# define sendto g_pfnsendto
+#endif
 
     /* no locking since UDP reads may be done concurrently to writes, and
@@ -1066 +1130 @@
         rc = VERR_TOO_MUCH_DATA;
 
-    rtSocketUnlock(pThis);
+    ///@todo rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef sendto
+#endif
     return rc;
 }
@@ -1079 +1146 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnsendto, VERR_NOT_SUPPORTED);
+# define sendto g_pfnsendto
+#endif
 
     /* no locking since UDP reads may be done concurrently to writes, and
@@ -1120 +1191 @@
         rc = VERR_TOO_MUCH_DATA;
 
-    rtSocketUnlock(pThis);
+    /// @todo rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef sendto
+#endif
     return rc;
 }
@@ -1146 +1220 @@
     rc = VERR_NO_TMP_MEMORY;
 #ifdef RT_OS_WINDOWS
-    AssertCompileSize(WSABUF, sizeof(RTSGSEG));
-    AssertCompileMemberSize(WSABUF, buf, RT_SIZEOFMEMB(RTSGSEG, pvSeg));
-
-    LPWSABUF paMsg = (LPWSABUF)RTMemTmpAllocZ(pSgBuf->cSegs * sizeof(WSABUF));
-    if (paMsg)
-    {
-        for (unsigned i = 0; i < pSgBuf->cSegs; i++)
+    if (g_pfnWSASend)
+    {
+        AssertCompileSize(WSABUF, sizeof(RTSGSEG));
+        AssertCompileMemberSize(WSABUF, buf, RT_SIZEOFMEMB(RTSGSEG, pvSeg));
+
+        LPWSABUF paMsg = (LPWSABUF)RTMemTmpAllocZ(pSgBuf->cSegs * sizeof(WSABUF));
+        if (paMsg)
         {
-            paMsg[i].buf = (char *)pSgBuf->paSegs[i].pvSeg;
-            paMsg[i].len = (u_long)pSgBuf->paSegs[i].cbSeg;
+            for (unsigned i = 0; i < pSgBuf->cSegs; i++)
+            {
+                paMsg[i].buf = (char *)pSgBuf->paSegs[i].pvSeg;
+                paMsg[i].len = (u_long)pSgBuf->paSegs[i].cbSeg;
+            }
+
+            DWORD dwSent;
+            int hrc = g_pfnWSASend(pThis->hNative, paMsg, pSgBuf->cSegs, &dwSent, MSG_NOSIGNAL, NULL, NULL);
+            if (!hrc)
+                rc = VINF_SUCCESS;
+    /** @todo check for incomplete writes */
+            else
+                rc = rtSocketError();
+
+            RTMemTmpFree(paMsg);
         }
-
-        DWORD dwSent;
-        int hrc = WSASend(pThis->hNative, paMsg, pSgBuf->cSegs, &dwSent,
-                          MSG_NOSIGNAL, NULL, NULL);
-        if (!hrc)
-            rc = VINF_SUCCESS;
-/** @todo check for incomplete writes */
-        else
-            rc = rtSocketError();
-
-        RTMemTmpFree(paMsg);
-    }
+    }
+    else if (g_pfnsend)
+    {
+        rc = VINF_SUCCESS;
+        for (uint32_t iSeg = 0; iSeg < pSgBuf->cSegs; iSeg++)
+        {
+            uint8_t const *pbSeg = (uint8_t const *)pSgBuf->paSegs[iSeg].pvSeg;
+            size_t         cbSeg = pSgBuf->paSegs[iSeg].cbSeg;
+            int            cbNow;
+            ssize_t        cbWritten;
+            for (;;)
+            {
+                cbNow = cbSeg >= RTSOCKET_MAX_WRITE ? RTSOCKET_MAX_WRITE : (int)cbSeg;
+                cbWritten = g_pfnsend(pThis->hNative, (const char *)pbSeg, cbNow, MSG_NOSIGNAL);
+                if ((size_t)cbWritten >= cbSeg || cbWritten < 0)
+                    break;
+                pbSeg += cbWritten;
+                cbSeg -= cbWritten;
+            }
+            if (cbWritten < 0)
+            {
+                rc = rtSocketError();
+                break;
+            }
+        }
+    }
+    else
+        rc = VERR_NOT_SUPPORTED;
 
 #else  /* !RT_OS_WINDOWS */
@@ -1246 +1349 @@
     AssertPtr(pvBuffer);
     AssertPtrReturn(pcbRead, VERR_INVALID_PARAMETER);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnrecv, VERR_NOT_SUPPORTED);
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -1260 +1366 @@
 
 #ifdef RT_OS_WINDOWS
-    int cbRead = recv(pThis->hNative, (char *)pvBuffer, cbNow, MSG_NOSIGNAL);
+    int cbRead = g_pfnrecv(pThis->hNative, (char *)pvBuffer, cbNow, MSG_NOSIGNAL);
     if (cbRead >= 0)
     {
@@ -1309 +1415 @@
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
     AssertPtrReturn(pcbWritten, VERR_INVALID_PARAMETER);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnsend, VERR_NOT_SUPPORTED);
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -1322 +1431 @@
     size_t cbNow = cbBuffer;
 # endif
-    int cbWritten = send(pThis->hNative, (const char *)pvBuffer, cbNow, MSG_NOSIGNAL);
+    int cbWritten = g_pfnsend(pThis->hNative, (const char *)pvBuffer, cbNow, MSG_NOSIGNAL);
     if (cbWritten >= 0)
     {
@@ -1381 +1490 @@
     rc = VERR_NO_TMP_MEMORY;
 #ifdef RT_OS_WINDOWS
-    LPWSABUF paMsg = NULL;
-
-    RTSgBufMapToNative(paMsg, pSgBuf, WSABUF, buf, char *, len, u_long, cSegsToSend);
-    if (paMsg)
-    {
-        DWORD dwSent = 0;
-        int hrc = WSASend(pThis->hNative, paMsg, cSegsToSend, &dwSent,
-                          MSG_NOSIGNAL, NULL, NULL);
-        if (!hrc)
-            rc = VINF_SUCCESS;
-        else
-            rc = rtSocketError();
-
-        *pcbWritten = dwSent;
-
-        RTMemTmpFree(paMsg);
-    }
+    if (g_pfnWSASend)
+    {
+        LPWSABUF paMsg = NULL;
+        RTSgBufMapToNative(paMsg, pSgBuf, WSABUF, buf, char *, len, u_long, cSegsToSend);
+        if (paMsg)
+        {
+            DWORD dwSent = 0;
+            int hrc = g_pfnWSASend(pThis->hNative, paMsg, cSegsToSend, &dwSent, MSG_NOSIGNAL, NULL, NULL);
+            if (!hrc)
+                rc = VINF_SUCCESS;
+            else
+                rc = rtSocketError();
+
+            *pcbWritten = dwSent;
+
+            RTMemTmpFree(paMsg);
+        }
+    }
+    else if (g_pfnsend)
+    {
+        size_t cbWrittenTotal = 0;
+        rc = VINF_SUCCESS;
+        for (uint32_t iSeg = 0; iSeg < pSgBuf->cSegs; iSeg++)
+        {
+            uint8_t const *pbSeg = (uint8_t const *)pSgBuf->paSegs[iSeg].pvSeg;
+            size_t         cbSeg = pSgBuf->paSegs[iSeg].cbSeg;
+            int            cbNow;
+            ssize_t        cbWritten;
+            for (;;)
+            {
+                cbNow = cbSeg >= RTSOCKET_MAX_WRITE ? RTSOCKET_MAX_WRITE : (int)cbSeg;
+                cbWritten = g_pfnsend(pThis->hNative, (const char *)pbSeg, cbNow, MSG_NOSIGNAL);
+                if ((size_t)cbWritten >= cbSeg || cbWritten < 0)
+                    break;
+                cbWrittenTotal += cbWrittenTotal;
+                pbSeg += cbWritten;
+                cbSeg -= cbWritten;
+            }
+            if (cbWritten < 0)
+            {
+                rc = rtSocketError();
+                break;
+            }
+            if (cbWritten != cbNow)
+                break;
+        }
+        *pcbWritten = cbWrittenTotal;
+    }
+    else
+        rc = VERR_NOT_SUPPORTED;
 
 #else  /* !RT_OS_WINDOWS */
@@ -1469 +1611 @@
     int const fdMax = (int)pThis->hNative + 1;
     AssertReturn((RTSOCKETNATIVE)(fdMax - 1) == pThis->hNative, VERR_INTERNAL_ERROR_5);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnselect, VERR_NOT_SUPPORTED);
+# define select g_pfnselect
+#endif
 
     /*
@@ -1496 +1642 @@
         rc = rtSocketError();
 
+#ifdef RT_OS_WINDOWS
+# undef select
+#endif
     return rc;
 }
@@ -1523 +1672 @@
     int const fdMax = (int)hNative + 1;
     AssertReturn((RTSOCKETNATIVE)(fdMax - 1) == hNative, VERR_INTERNAL_ERROR_5);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnselect, VERR_NOT_SUPPORTED);
+    AssertReturn(g_pfn__WSAFDIsSet, VERR_NOT_SUPPORTED);
+# define select         g_pfnselect
+# define __WSAFDIsSet   g_pfn__WSAFDIsSet
+#endif
 
     *pfEvents = 0;
@@ -1577 +1732 @@
         rc = rtSocketError();
 
+#ifdef RT_OS_WINDOWS
+# undef select
+# undef __WSAFDIsSet
+#endif
     return rc;
 }
@@ -1592 +1751 @@
     AssertReturn(RTMemPoolRefCount(pThis) >= (pThis->cUsers ? 2U : 1U), VERR_CALLER_NO_REFERENCE);
     AssertReturn(fRead || fWrite, VERR_INVALID_PARAMETER);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnshutdown, VERR_NOT_SUPPORTED);
+# define shutdown g_pfnshutdown
+#endif
 
     /*
@@ -1607 +1770 @@
         rc = rtSocketError();
 
+#ifdef RT_OS_WINDOWS
+# undef shutdown
+#endif
     return rc;
 }
@@ -1620 +1786 @@
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
     AssertReturn(RTMemPoolRefCount(pThis) >= (pThis->cUsers ? 2U : 1U), VERR_CALLER_NO_REFERENCE);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfngetsockname, VERR_NOT_SUPPORTED);
+# define getsockname g_pfngetsockname
+#endif
 
     /*
@@ -1637 +1807 @@
         rc = rtSocketError();
 
+#ifdef RT_OS_WINDOWS
+# undef getsockname
+#endif
     return rc;
 }
@@ -1650 +1823 @@
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
     AssertReturn(RTMemPoolRefCount(pThis) >= (pThis->cUsers ? 2U : 1U), VERR_CALLER_NO_REFERENCE);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfngetpeername, VERR_NOT_SUPPORTED);
+# define getpeername g_pfngetpeername
+#endif
 
     /*
@@ -1667 +1844 @@
         rc = rtSocketError();
 
+#ifdef RT_OS_WINDOWS
+# undef getpeername
+#endif
     return rc;
 }
@@ -1708 +1888 @@
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
     AssertPtrReturn(pvAddr, VERR_INVALID_POINTER);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnbind, VERR_NOT_SUPPORTED);
+# define bind g_pfnbind
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -1717 +1901 @@
 
     rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef bind
+#endif
     return rc;
 }
@@ -1737 +1924 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnlisten, VERR_NOT_SUPPORTED);
+# define listen g_pfnlisten
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -1744 +1935 @@
 
     rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef listen
+#endif
     return rc;
 }
@@ -1770 +1964 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnaccept, VERR_NOT_SUPPORTED);
+    AssertReturn(g_pfnclosesocket, VERR_NOT_SUPPORTED);
+# define accept g_pfnaccept
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -1794 +1993 @@
         {
 #ifdef RT_OS_WINDOWS
-            closesocket(hNativeClient);
+            g_pfnclosesocket(hNativeClient);
 #else
             close(hNativeClient);
@@ -1804 +2003 @@
 
     rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef accept
+#endif
     return rc;
 }
@@ -1827 +2029 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnconnect, VERR_NOT_SUPPORTED);
+    AssertReturn(g_pfnselect, VERR_NOT_SUPPORTED);
+    AssertReturn(g_pfngetsockopt, VERR_NOT_SUPPORTED);
+# define connect        g_pfnconnect
+# define select         g_pfnselect
+# define getsockopt     g_pfngetsockopt
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -1904 +2114 @@
 
     rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef connect
+# undef select
+# undef getsockopt
+#endif
     return rc;
 }
@@ -1924 +2139 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnconnect, VERR_NOT_SUPPORTED);
+# define connect        g_pfnconnect
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -1933 +2152 @@
 
     rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef connect
+#endif
     return rc;
 }
@@ -1955 +2177 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+#ifdef RT_OS_WINDOWS
+    AssertReturn(g_pfnsetsockopt, VERR_NOT_SUPPORTED);
+# define setsockopt g_pfnsetsockopt
+#endif
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
@@ -1962 +2188 @@
 
     rtSocketUnlock(pThis);
+#ifdef RT_OS_WINDOWS
+# undef setsockopt
+#endif
     return rc;
 }
@@ -1987 +2216 @@
     if (pThis->hEvent != WSA_INVALID_EVENT)
         *phNative = (RTHCINTPTR)pThis->hEvent;
-    else
-    {
-        pThis->hEvent = WSACreateEvent();
+    else if (g_pfnWSACreateEvent)
+    {
+        pThis->hEvent = g_pfnWSACreateEvent();
         *phNative = (RTHCINTPTR)pThis->hEvent;
         if (pThis->hEvent == WSA_INVALID_EVENT)
             rc = rtSocketError();
     }
+    else
+        rc = VERR_NOT_SUPPORTED;
 
     rtSocketUnlock(pThis);
@@ -2017 +2248 @@
     if (pThis->fSubscribedEvts)
     {
-        if (WSAEventSelect(pThis->hNative, WSA_INVALID_EVENT, 0) == 0)
+        if (g_pfnWSAEventSelect && g_pfnioctlsocket)
         {
-            pThis->fSubscribedEvts = 0;
-
-            /*
-             * Switch back to blocking mode if that was the state before the
-             * operation.
-             */
-            if (pThis->fBlocking)
+            if (g_pfnWSAEventSelect(pThis->hNative, WSA_INVALID_EVENT, 0) == 0)
             {
-                u_long fNonBlocking = 0;
-                int rc2 = ioctlsocket(pThis->hNative, FIONBIO, &fNonBlocking);
-                if (rc2 != 0)
+                pThis->fSubscribedEvts = 0;
+
+                /*
+                 * Switch back to blocking mode if that was the state before the
+                 * operation.
+                 */
+                if (pThis->fBlocking)
                 {
-                    rc = rtSocketError();
-                    AssertMsgFailed(("%Rrc; rc2=%d\n", rc, rc2));
+                    u_long fNonBlocking = 0;
+                    int rc2 = g_pfnioctlsocket(pThis->hNative, FIONBIO, &fNonBlocking);
+                    if (rc2 != 0)
+                    {
+                        rc = rtSocketError();
+                        AssertMsgFailed(("%Rrc; rc2=%d\n", rc, rc2));
+                    }
                 }
+            }
+            else
+            {
+                rc = rtSocketError();
+                AssertMsgFailed(("%Rrc\n", rc));
             }
         }
         else
-        {
-            rc = rtSocketError();
-            AssertMsgFailed(("%Rrc\n", rc));
-        }
+            rc = VERR_NOT_SUPPORTED;
     }
     return rc;
@@ -2063 +2299 @@
         fNetworkEvents |= FD_CLOSE;
     LogFlowFunc(("fNetworkEvents=%#x\n", fNetworkEvents));
-    if (WSAEventSelect(pThis->hNative, pThis->hEvent, fNetworkEvents) == 0)
-    {
-        pThis->fSubscribedEvts = fEvents;
-        return VINF_SUCCESS;
-    }
-
-    int rc = rtSocketError();
-    AssertMsgFailed(("fNetworkEvents=%#x rc=%Rrc\n", fNetworkEvents, rtSocketError()));
+    int rc;
+    if (g_pfnWSAEventSelect)
+    {
+        if (g_pfnWSAEventSelect(pThis->hNative, pThis->hEvent, fNetworkEvents) == 0)
+        {
+            pThis->fSubscribedEvts = fEvents;
+            return VINF_SUCCESS;
+        }
+        rc = rtSocketError();
+        AssertMsgFailed(("fNetworkEvents=%#x rc=%Rrc\n", fNetworkEvents, rtSocketError()));
+    }
+    else
+        rc = VERR_NOT_SUPPORTED;
     return rc;
 }
@@ -2099 +2340 @@
 
     /* Get the event mask, ASSUMES that WSAEnumNetworkEvents doesn't clear stuff.  */
-    WSANETWORKEVENTS NetEvts;
-    RT_ZERO(NetEvts);
-    if (WSAEnumNetworkEvents(pThis->hNative, pThis->hEvent, &NetEvts) == 0)
-    {
-        if (    (NetEvts.lNetworkEvents & FD_READ)
-            &&  (fEvents & RTPOLL_EVT_READ)
-            &&  NetEvts.iErrorCode[FD_READ_BIT] == 0)
-            fRetEvents |= RTPOLL_EVT_READ;
-
-        if (    (NetEvts.lNetworkEvents & FD_WRITE)
-            &&  (fEvents & RTPOLL_EVT_WRITE)
-            &&  NetEvts.iErrorCode[FD_WRITE_BIT] == 0)
-            fRetEvents |= RTPOLL_EVT_WRITE;
-
-        if (fEvents & RTPOLL_EVT_ERROR)
+    if (g_pfnWSAEnumNetworkEvents)
+    {
+        WSANETWORKEVENTS NetEvts;
+        RT_ZERO(NetEvts);
+        if (g_pfnWSAEnumNetworkEvents(pThis->hNative, pThis->hEvent, &NetEvts) == 0)
         {
-            if (NetEvts.lNetworkEvents & FD_CLOSE)
-                fRetEvents |= RTPOLL_EVT_ERROR;
-            else
-                for (uint32_t i = 0; i < FD_MAX_EVENTS; i++)
-                    if (    (NetEvts.lNetworkEvents & (1L << i))
-                        &&  NetEvts.iErrorCode[i] != 0)
-                        fRetEvents |= RTPOLL_EVT_ERROR;
+            if (    (NetEvts.lNetworkEvents & FD_READ)
+                &&  (fEvents & RTPOLL_EVT_READ)
+                &&  NetEvts.iErrorCode[FD_READ_BIT] == 0)
+                fRetEvents |= RTPOLL_EVT_READ;
+
+            if (    (NetEvts.lNetworkEvents & FD_WRITE)
+                &&  (fEvents & RTPOLL_EVT_WRITE)
+                &&  NetEvts.iErrorCode[FD_WRITE_BIT] == 0)
+                fRetEvents |= RTPOLL_EVT_WRITE;
+
+            if (fEvents & RTPOLL_EVT_ERROR)
+            {
+                if (NetEvts.lNetworkEvents & FD_CLOSE)
+                    fRetEvents |= RTPOLL_EVT_ERROR;
+                else
+                    for (uint32_t i = 0; i < FD_MAX_EVENTS; i++)
+                        if (    (NetEvts.lNetworkEvents & (1L << i))
+                            &&  NetEvts.iErrorCode[i] != 0)
+                            fRetEvents |= RTPOLL_EVT_ERROR;
+            }
         }
-    }
-    else
-        rc = rtSocketError();
+        else
+            rc = rtSocketError();
+    }
+    else if (RT_SUCCESS(rc))
+        rc = VERR_NOT_SUPPORTED;
 
     /* Fall back on select if we hit an error above. */
     if (RT_FAILURE(rc))
     {
-
+        rc = RTSocketSelectOneEx(pThis, fEvents, &fRetEvents, 0);
+        if (RT_FAILURE(rc))
+            fRetEvents = 0;
     }
 

trunk/src/VBox/Runtime/r3/win/errvars-win.cpp

@@ -37 +37 @@
 #include <iprt/assert.h>
 #include "internal/magics.h"
+#include "internal-r3-win.h"
 
 
@@ -44 +45 @@
     pVars->ai32Vars[0] = RTERRVARS_MAGIC;
     pVars->ai32Vars[1] = GetLastError();
-    pVars->ai32Vars[2] = WSAGetLastError();
+    pVars->ai32Vars[2] = g_pfnWSAGetLastError ? g_pfnWSAGetLastError() : WSANOTINITIALISED;
     pVars->ai32Vars[3] = errno;
     return pVars;
@@ -54 +55 @@
     AssertReturnVoid(pVars->ai32Vars[0] == RTERRVARS_MAGIC);
     errno = pVars->ai32Vars[3];
-    if (pVars->ai32Vars[2] != WSANOTINITIALISED) /* just an idea... */
-        WSASetLastError(pVars->ai32Vars[2]);
+    if (   pVars->ai32Vars[2] != WSANOTINITIALISED
+        && g_pfnWSASetLastError)
+        g_pfnWSASetLastError(pVars->ai32Vars[2]);
     SetLastError(pVars->ai32Vars[1]);
 }
@@ -78 +80 @@
     return pVars->ai32Vars[0] != RTERRVARS_MAGIC
         || (uint32_t)pVars->ai32Vars[1] != GetLastError()
-        || pVars->ai32Vars[2] != WSAGetLastError()
+        || pVars->ai32Vars[2] != (g_pfnWSAGetLastError ? g_pfnWSAGetLastError() : WSANOTINITIALISED)
         || pVars->ai32Vars[3] != errno;
 }

trunk/src/VBox/Runtime/r3/win/init-win.cpp

@@ -40 +40 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/ldr.h>
 #include <iprt/log.h>
 #include <iprt/param.h>
@@ -63 +64 @@
 /** Extended windows version information. */
 DECLHIDDEN(OSVERSIONINFOEXW)    g_WinOsInfoEx;
+
 /** The native kernel32.dll handle. */
-DECLHIDDEN(HMODULE)             g_hModKernel32 = NULL;
+DECLHIDDEN(HMODULE)                         g_hModKernel32 = NULL;
+/** GetSystemWindowsDirectoryW or GetWindowsDirectoryW (NT4). */
+DECLHIDDEN(PFNGETWINSYSDIR)                 g_pfnGetSystemWindowsDirectoryW = NULL;
+/** The GetCurrentThreadStackLimits API. */
+static PFNGETCURRENTTHREADSTACKLIMITS       g_pfnGetCurrentThreadStackLimits = NULL;
+/** SetUnhandledExceptionFilter. */
+static PFNSETUNHANDLEDEXCEPTIONFILTER       g_pfnSetUnhandledExceptionFilter = NULL;
+/** The previous unhandled exception filter. */
+static LPTOP_LEVEL_EXCEPTION_FILTER         g_pfnUnhandledXcptFilter = NULL;
+
 /** The native ntdll.dll handle. */
-DECLHIDDEN(HMODULE)             g_hModNtDll = NULL;
-/** GetSystemWindowsDirectoryW or GetWindowsDirectoryW (NT4). */
-DECLHIDDEN(PFNGETWINSYSDIR)     g_pfnGetSystemWindowsDirectoryW = NULL;
-/** The GetCurrentThreadStackLimits API. */
-static PFNGETCURRENTTHREADSTACKLIMITS g_pfnGetCurrentThreadStackLimits = NULL;
-/** SetUnhandledExceptionFilter. */
-static PFNSETUNHANDLEDEXCEPTIONFILTER g_pfnSetUnhandledExceptionFilter = NULL;
-/** The previous unhandled exception filter. */
-static LPTOP_LEVEL_EXCEPTION_FILTER   g_pfnUnhandledXcptFilter = NULL;
+DECLHIDDEN(HMODULE)                         g_hModNtDll = NULL;
+/** NtQueryFullAttributesFile   */
+DECLHIDDEN(PFNNTQUERYFULLATTRIBUTESFILE)    g_pfnNtQueryFullAttributesFile = NULL;
+/** NtDuplicateToken (NT 3.51). */
+DECLHIDDEN(PFNNTDUPLICATETOKEN)             g_pfnNtDuplicateToken = NULL;
+
+/** Either ws2_32.dll (NT4+) or wsock32.dll (NT3.x). */
+DECLHIDDEN(HMODULE)                         g_hModWinSock = NULL;
+/** Set if we're dealing with old winsock.   */
+DECLHIDDEN(bool)                            g_fOldWinSock = false;
+/** WSAStartup   */
+DECLHIDDEN(PFNWSASTARTUP)                   g_pfnWSAStartup = NULL;
+/** WSACleanup */
+DECLHIDDEN(PFNWSACLEANUP)                   g_pfnWSACleanup = NULL;
+/** Pointner to WSAGetLastError (for RTErrVarsSave). */
+DECLHIDDEN(PFNWSAGETLASTERROR)              g_pfnWSAGetLastError = NULL;
+/** Pointner to WSASetLastError (for RTErrVarsRestore). */
+DECLHIDDEN(PFNWSASETLASTERROR)              g_pfnWSASetLastError = NULL;
+/** WSACreateEvent */
+DECLHIDDEN(PFNWSACREATEEVENT)               g_pfnWSACreateEvent = NULL;
+/** WSACloseEvent  */
+DECLHIDDEN(PFNWSACLOSEEVENT)                g_pfnWSACloseEvent = NULL;
+/** WSAEventSelect   */
+DECLHIDDEN(PFNWSAEVENTSELECT)               g_pfnWSAEventSelect = NULL;
+/** WSAEnumNetworkEvents */
+DECLHIDDEN(PFNWSAENUMNETWORKEVENTS)         g_pfnWSAEnumNetworkEvents = NULL;
+/** WSASend */
+DECLHIDDEN(PFNWSASend)                      g_pfnWSASend = NULL;
+/** socket */
+DECLHIDDEN(PFNWINSOCKSOCKET)                g_pfnsocket = NULL;
+/** closesocket */
+DECLHIDDEN(PFNWINSOCKCLOSESOCKET)           g_pfnclosesocket = NULL;
+/** recv */
+DECLHIDDEN(PFNWINSOCKRECV)                  g_pfnrecv = NULL;
+/** send */
+DECLHIDDEN(PFNWINSOCKSEND)                  g_pfnsend = NULL;
+/** recvfrom */
+DECLHIDDEN(PFNWINSOCKRECVFROM)              g_pfnrecvfrom = NULL;
+/** sendto */
+DECLHIDDEN(PFNWINSOCKSENDTO)                g_pfnsendto = NULL;
+/** bind */
+DECLHIDDEN(PFNWINSOCKBIND)                  g_pfnbind = NULL;
+/** listen  */
+DECLHIDDEN(PFNWINSOCKLISTEN)                g_pfnlisten = NULL;
+/** accept */
+DECLHIDDEN(PFNWINSOCKACCEPT)                g_pfnaccept = NULL;
+/** connect */
+DECLHIDDEN(PFNWINSOCKCONNECT)               g_pfnconnect = NULL;
+/** shutdown */
+DECLHIDDEN(PFNWINSOCKSHUTDOWN)              g_pfnshutdown = NULL;
+/** getsockopt */
+DECLHIDDEN(PFNWINSOCKGETSOCKOPT)            g_pfngetsockopt = NULL;
+/** setsockopt */
+DECLHIDDEN(PFNWINSOCKSETSOCKOPT)            g_pfnsetsockopt = NULL;
+/** ioctlsocket */
+DECLHIDDEN(PFNWINSOCKIOCTLSOCKET)           g_pfnioctlsocket = NULL;
+/** getpeername   */
+DECLHIDDEN(PFNWINSOCKGETPEERNAME)           g_pfngetpeername = NULL;
+/** getsockname */
+DECLHIDDEN(PFNWINSOCKGETSOCKNAME)           g_pfngetsockname = NULL;
+/** __WSAFDIsSet */
+DECLHIDDEN(PFNWINSOCK__WSAFDISSET)          g_pfn__WSAFDIsSet = NULL;
+/** select */
+DECLHIDDEN(PFNWINSOCKSELECT)                g_pfnselect = NULL;
+/** gethostbyname */
+DECLHIDDEN(PFNWINSOCKGETHOSTBYNAME)         g_pfngethostbyname = NULL;
 
 
@@ -153 +221 @@
     {
         if (        dwMajorVersion == 3
+                 && dwMinorVersion == 1)
+            enmVer = kRTWinOSType_NT31;
+        else if (   dwMajorVersion == 3
                  && dwMinorVersion == 51)
             enmVer = kRTWinOSType_NT351;
@@ -271 +342 @@
 
 
+/**
+ * Resolves the winsock error APIs.
+ */
+static void rtR3InitWinSockApis(void)
+{
+    /*
+     * Try get ws2_32.dll, then try load it, then finally fall back to the old
+     * wsock32.dll.  We use RTLdrLoadSystem to the loading as it has all the fancy
+     * logic for safely doing that.
+     */
+    g_hModWinSock = GetModuleHandleW(L"ws2_32.dll");
+    if (g_hModWinSock == NULL)
+    {
+        RTLDRMOD hLdrMod;
+        int rc = RTLdrLoadSystem("ws2_32.dll", true /*fNoUnload*/, &hLdrMod);
+        if (RT_FAILURE(rc))
+        {
+            rc = RTLdrLoadSystem("wsock32.dll", true /*fNoUnload*/, &hLdrMod);
+            if (RT_FAILURE(rc))
+            {
+AssertMsgFailed(("rc=%Rrc\n", rc));
+                return;
+            }
+            g_fOldWinSock = true;
+        }
+        g_hModWinSock = (HMODULE)RTLdrGetNativeHandle(hLdrMod);
+        RTLdrClose(hLdrMod);
+    }
+RTAssertMsg2("g_hModWinSock=%p\n", g_hModWinSock);
+
+    g_pfnWSAStartup           = (decltype(g_pfnWSAStartup))         GetProcAddress(g_hModWinSock, "WSAStartup");
+    g_pfnWSACleanup           = (decltype(g_pfnWSACleanup))         GetProcAddress(g_hModWinSock, "WSACleanup");
+    g_pfnWSAGetLastError      = (decltype(g_pfnWSAGetLastError))    GetProcAddress(g_hModWinSock, "WSAGetLastError");
+    g_pfnWSASetLastError      = (decltype(g_pfnWSASetLastError))    GetProcAddress(g_hModWinSock, "WSASetLastError");
+    g_pfnWSACreateEvent       = (decltype(g_pfnWSACreateEvent))     GetProcAddress(g_hModWinSock, "WSACreateEvent");
+    g_pfnWSACloseEvent        = (decltype(g_pfnWSACloseEvent))      GetProcAddress(g_hModWinSock, "WSACloseEvent");
+    g_pfnWSAEventSelect       = (decltype(g_pfnWSAEventSelect))     GetProcAddress(g_hModWinSock, "WSAEventSelect");
+    g_pfnWSAEnumNetworkEvents = (decltype(g_pfnWSAEnumNetworkEvents))GetProcAddress(g_hModWinSock,"WSAEnumNetworkEvents");
+    g_pfnWSASend              = (decltype(g_pfnWSASend))            GetProcAddress(g_hModWinSock, "WSASend");
+    g_pfnsocket               = (decltype(g_pfnsocket))             GetProcAddress(g_hModWinSock, "socket");
+    g_pfnclosesocket          = (decltype(g_pfnclosesocket))        GetProcAddress(g_hModWinSock, "closesocket");
+    g_pfnrecv                 = (decltype(g_pfnrecv))               GetProcAddress(g_hModWinSock, "recv");
+    g_pfnsend                 = (decltype(g_pfnsend))               GetProcAddress(g_hModWinSock, "send");
+    g_pfnrecvfrom             = (decltype(g_pfnrecvfrom))           GetProcAddress(g_hModWinSock, "recvfrom");
+    g_pfnsendto               = (decltype(g_pfnsendto))             GetProcAddress(g_hModWinSock, "sendto");
+    g_pfnbind                 = (decltype(g_pfnbind))               GetProcAddress(g_hModWinSock, "bind");
+    g_pfnlisten               = (decltype(g_pfnlisten))             GetProcAddress(g_hModWinSock, "listen");
+    g_pfnaccept               = (decltype(g_pfnaccept))             GetProcAddress(g_hModWinSock, "accept");
+    g_pfnconnect              = (decltype(g_pfnconnect))            GetProcAddress(g_hModWinSock, "connect");
+    g_pfnshutdown             = (decltype(g_pfnshutdown))           GetProcAddress(g_hModWinSock, "shutdown");
+    g_pfngetsockopt           = (decltype(g_pfngetsockopt))         GetProcAddress(g_hModWinSock, "getsockopt");
+    g_pfnsetsockopt           = (decltype(g_pfnsetsockopt))         GetProcAddress(g_hModWinSock, "setsockopt");
+    g_pfnioctlsocket          = (decltype(g_pfnioctlsocket))        GetProcAddress(g_hModWinSock, "ioctlsocket");
+    g_pfngetpeername          = (decltype(g_pfngetpeername))        GetProcAddress(g_hModWinSock, "getpeername");
+    g_pfngetsockname          = (decltype(g_pfngetsockname))        GetProcAddress(g_hModWinSock, "getsockname");
+    g_pfn__WSAFDIsSet         = (decltype(g_pfn__WSAFDIsSet))       GetProcAddress(g_hModWinSock, "__WSAFDIsSet");
+    g_pfnselect               = (decltype(g_pfnselect))             GetProcAddress(g_hModWinSock, "select");
+    g_pfngethostbyname        = (decltype(g_pfngethostbyname))      GetProcAddress(g_hModWinSock, "gethostbyname");
+
+    Assert(g_pfnWSAStartup);
+    Assert(g_pfnWSACleanup);
+    Assert(g_pfnWSAGetLastError);
+    Assert(g_pfnWSASetLastError);
+    Assert(g_pfnWSACreateEvent       || g_fOldWinSock);
+    Assert(g_pfnWSACloseEvent        || g_fOldWinSock);
+    Assert(g_pfnWSAEventSelect       || g_fOldWinSock);
+    Assert(g_pfnWSAEnumNetworkEvents || g_fOldWinSock);
+    Assert(g_pfnWSASend              || g_fOldWinSock);
+    Assert(g_pfnsocket);
+    Assert(g_pfnclosesocket);
+    Assert(g_pfnrecv);
+    Assert(g_pfnsend);
+    Assert(g_pfnrecvfrom);
+    Assert(g_pfnsendto);
+    Assert(g_pfnbind);
+    Assert(g_pfnlisten);
+    Assert(g_pfnaccept);
+    Assert(g_pfnconnect);
+    Assert(g_pfnshutdown);
+    Assert(g_pfngetsockopt);
+    Assert(g_pfnsetsockopt);
+    Assert(g_pfnioctlsocket);
+    Assert(g_pfngetpeername);
+    Assert(g_pfngetsockname);
+    Assert(g_pfn__WSAFDIsSet);
+    Assert(g_pfnselect);
+    Assert(g_pfngethostbyname);
+}
+
+
 static int rtR3InitNativeObtrusiveWorker(uint32_t fFlags)
 {
@@ -362 +523 @@
     if (g_pfnGetSystemWindowsDirectoryW)
         g_pfnGetSystemWindowsDirectoryW = (PFNGETWINSYSDIR)GetProcAddress(g_hModKernel32, "GetWindowsDirectoryW");
+
+    /*
+     * Resolve some ntdll.dll APIs that weren't there in early NT versions.
+     */
+    g_pfnNtQueryFullAttributesFile = (PFNNTQUERYFULLATTRIBUTESFILE)GetProcAddress(g_hModNtDll, "NtQueryFullAttributesFile");
+    g_pfnNtDuplicateToken          = (PFNNTDUPLICATETOKEN)GetProcAddress(         g_hModNtDll, "NtDuplicateToken");
+
+    /*
+     * Resolve the winsock error getter and setter so assertions can save those too.
+     */
+    rtR3InitWinSockApis();
 
     return rc;

trunk/src/VBox/Runtime/r3/win/internal-r3-win.h

@@ -98 +98 @@
 extern DECLHIDDEN(HMODULE)          g_hModKernel32;
 extern DECLHIDDEN(HMODULE)          g_hModNtDll;
+
 extern DECLHIDDEN(OSVERSIONINFOEXW) g_WinOsInfoEx;
 typedef UINT (WINAPI *PFNGETWINSYSDIR)(LPWSTR,UINT);
 extern DECLHIDDEN(PFNGETWINSYSDIR)  g_pfnGetSystemWindowsDirectoryW;
+typedef NTSTATUS (NTAPI *PFNNTQUERYFULLATTRIBUTESFILE)(struct _OBJECT_ATTRIBUTES *, struct _FILE_NETWORK_OPEN_INFORMATION *);
+extern DECLHIDDEN(PFNNTQUERYFULLATTRIBUTESFILE) g_pfnNtQueryFullAttributesFile;
+typedef NTSTATUS (NTAPI *PFNNTDUPLICATETOKEN)(HANDLE, ACCESS_MASK, struct _OBJECT_ATTRIBUTES *, BOOLEAN, TOKEN_TYPE, PHANDLE);
+extern DECLHIDDEN(PFNNTDUPLICATETOKEN)          g_pfnNtDuplicateToken;
+
+extern DECLHIDDEN(HMODULE)                         g_hModWinSock;
+
+/** WSAStartup */
+typedef int             (WINAPI *PFNWSASTARTUP)(WORD, struct WSAData *);
+/** WSACleanup */
+typedef int             (WINAPI *PFNWSACLEANUP)(void);
+/** WSAGetLastError */
+typedef int             (WINAPI *PFNWSAGETLASTERROR)(void);
+/** WSASetLastError */
+typedef int             (WINAPI *PFNWSASETLASTERROR)(int);
+/** WSACreateEvent */
+typedef HANDLE          (WINAPI *PFNWSACREATEEVENT)(void);
+/** WSACloseEvent */
+typedef BOOL            (WINAPI *PFNWSACLOSEEVENT)(HANDLE);
+/** WSAEventSelect */
+typedef BOOL            (WINAPI *PFNWSAEVENTSELECT)(UINT_PTR, HANDLE, LONG);
+/** WSAEnumNetworkEvents */
+typedef int             (WINAPI *PFNWSAENUMNETWORKEVENTS)(UINT_PTR, HANDLE, struct _WSANETWORKEVENTS *);
+/** WSASend */
+typedef int             (WINAPI *PFNWSASend)(UINT_PTR, struct _WSABUF *, DWORD, LPDWORD, DWORD dwFlags, struct _OVERLAPPED *, PFNRT /*LPWSAOVERLAPPED_COMPLETION_ROUTINE*/);
+
+/** socket */
+typedef UINT_PTR        (WINAPI *PFNWINSOCKSOCKET)(int, int, int);
+/** closesocket */
+typedef int             (WINAPI *PFNWINSOCKCLOSESOCKET)(UINT_PTR);
+/** recv */
+typedef int             (WINAPI *PFNWINSOCKRECV)(UINT_PTR, char *, int, int);
+/** send */
+typedef int             (WINAPI *PFNWINSOCKSEND)(UINT_PTR, const char *, int, int);
+/** recvfrom */
+typedef int             (WINAPI *PFNWINSOCKRECVFROM)(UINT_PTR, char *, int, int, struct sockaddr *, int *);
+/** sendto */
+typedef int             (WINAPI *PFNWINSOCKSENDTO)(UINT_PTR, const char *, int, int, const struct sockaddr *, int);
+/** bind */
+typedef int             (WINAPI *PFNWINSOCKBIND)(UINT_PTR, const struct sockaddr *, int);
+/** listen  */
+typedef int             (WINAPI *PFNWINSOCKLISTEN)(UINT_PTR, int);
+/** accept */
+typedef UINT_PTR        (WINAPI *PFNWINSOCKACCEPT)(UINT_PTR, struct sockaddr *, int *);
+/** connect */
+typedef int             (WINAPI *PFNWINSOCKCONNECT)(UINT_PTR, const struct sockaddr *, int);
+/** shutdown */
+typedef int             (WINAPI *PFNWINSOCKSHUTDOWN)(UINT_PTR, int);
+/** getsockopt */
+typedef int             (WINAPI *PFNWINSOCKGETSOCKOPT)(UINT_PTR, int, int, char *, int *);
+/** setsockopt */
+typedef int             (WINAPI *PFNWINSOCKSETSOCKOPT)(UINT_PTR, int, int, const char *, int);
+/** ioctlsocket */
+typedef int             (WINAPI *PFNWINSOCKIOCTLSOCKET)(UINT_PTR, long, unsigned long *);
+/** getpeername   */
+typedef int             (WINAPI *PFNWINSOCKGETPEERNAME)(UINT_PTR, struct sockaddr *, int *);
+/** getsockname */
+typedef int             (WINAPI *PFNWINSOCKGETSOCKNAME)(UINT_PTR, struct sockaddr *, int *);
+/** __WSAFDIsSet */
+typedef int             (WINAPI *PFNWINSOCK__WSAFDISSET)(UINT_PTR, struct fd_set *);
+/** select */
+typedef int             (WINAPI *PFNWINSOCKSELECT)(int, struct fd_set *, struct fd_set *, struct fd_set *, const struct timeval *);
+/** gethostbyname */
+typedef struct hostent *(WINAPI *PFNWINSOCKGETHOSTBYNAME)(const char *);
+
+extern DECLHIDDEN(PFNWSASTARTUP)                   g_pfnWSAStartup;
+extern DECLHIDDEN(PFNWSACLEANUP)                   g_pfnWSACleanup;
+extern PFNWSAGETLASTERROR                          g_pfnWSAGetLastError;
+extern PFNWSASETLASTERROR                          g_pfnWSASetLastError;
+extern DECLHIDDEN(PFNWSACREATEEVENT)               g_pfnWSACreateEvent;
+extern DECLHIDDEN(PFNWSACLOSEEVENT)                g_pfnWSACloseEvent;
+extern DECLHIDDEN(PFNWSAEVENTSELECT)               g_pfnWSAEventSelect;
+extern DECLHIDDEN(PFNWSAENUMNETWORKEVENTS)         g_pfnWSAEnumNetworkEvents;
+extern DECLHIDDEN(PFNWSASend)                      g_pfnWSASend;
+extern DECLHIDDEN(PFNWINSOCKSOCKET)                g_pfnsocket;
+extern DECLHIDDEN(PFNWINSOCKCLOSESOCKET)           g_pfnclosesocket;
+extern DECLHIDDEN(PFNWINSOCKRECV)                  g_pfnrecv;
+extern DECLHIDDEN(PFNWINSOCKSEND)                  g_pfnsend;
+extern DECLHIDDEN(PFNWINSOCKRECVFROM)              g_pfnrecvfrom;
+extern DECLHIDDEN(PFNWINSOCKSENDTO)                g_pfnsendto;
+extern DECLHIDDEN(PFNWINSOCKBIND)                  g_pfnbind;
+extern DECLHIDDEN(PFNWINSOCKLISTEN)                g_pfnlisten;
+extern DECLHIDDEN(PFNWINSOCKACCEPT)                g_pfnaccept;
+extern DECLHIDDEN(PFNWINSOCKCONNECT)               g_pfnconnect;
+extern DECLHIDDEN(PFNWINSOCKSHUTDOWN)              g_pfnshutdown;
+extern DECLHIDDEN(PFNWINSOCKGETSOCKOPT)            g_pfngetsockopt;
+extern DECLHIDDEN(PFNWINSOCKSETSOCKOPT)            g_pfnsetsockopt;
+extern DECLHIDDEN(PFNWINSOCKIOCTLSOCKET)           g_pfnioctlsocket;
+extern DECLHIDDEN(PFNWINSOCKGETPEERNAME)           g_pfngetpeername;
+extern DECLHIDDEN(PFNWINSOCKGETSOCKNAME)           g_pfngetsockname;
+extern DECLHIDDEN(PFNWINSOCK__WSAFDISSET)          g_pfn__WSAFDIsSet;
+extern DECLHIDDEN(PFNWINSOCKSELECT)                g_pfnselect;
+extern DECLHIDDEN(PFNWINSOCKGETHOSTBYNAME)         g_pfngethostbyname;
 #endif
 

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -428 +428 @@
                             && EqualSid(pTokenUser->User.Sid, pSid))
                         {
-                            if (DuplicateTokenEx(hTokenProc, MAXIMUM_ALLOWED,
-                                                 NULL, SecurityIdentification, TokenPrimary, phToken))
+                            /*
+                             * The following NT call is for v3.51 and does the equivalent of:
+                             *      DuplicateTokenEx(hTokenProc, MAXIMUM_ALLOWED, NULL,
+                             *                       SecurityIdentification, TokenPrimary, phToken);
+                             */
+                            if (g_pfnNtDuplicateToken)
                             {
-                                /*
-                                 * So we found the process instance which belongs to the user we want to
-                                 * to run our new process under. This duplicated token will be used for
-                                 * the actual CreateProcessAsUserW() call then.
-                                 */
-                                rc = VINF_SUCCESS;
+                                SECURITY_QUALITY_OF_SERVICE SecQoS;
+                                SecQoS.Length              = sizeof(SecQoS);
+                                SecQoS.ImpersonationLevel  = SecurityIdentification;
+                                SecQoS.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING;
+                                SecQoS.EffectiveOnly       = FALSE;
+
+                                OBJECT_ATTRIBUTES ObjAttr;
+                                InitializeObjectAttributes(&ObjAttr, NULL /*Name*/, 0 /*OBJ_XXX*/, NULL /*Root*/, NULL /*SecDesc*/);
+                                ObjAttr.SecurityQualityOfService = &SecQoS;
+
+                                NTSTATUS rcNt = g_pfnNtDuplicateToken(hTokenProc, MAXIMUM_ALLOWED, &ObjAttr, FALSE,
+                                                                      TokenPrimary, phToken);
+                                if (NT_SUCCESS(rcNt))
+                                {
+                                    /*
+                                     * So we found the process instance which belongs to the user we want to
+                                     * to run our new process under. This duplicated token will be used for
+                                     * the actual CreateProcessAsUserW() call then.
+                                     */
+                                    rc = VINF_SUCCESS;
+                                }
+                                else
+                                    rc = RTErrConvertFromNtStatus(rcNt);
+
                             }
                             else
-                                rc = RTErrConvertFromWin32(GetLastError());
+                                rc = VERR_SYMBOL_NOT_FOUND; /** @todo do we really need to duplicate the token? */
                         }
                         else

trunk/src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define RT_NO_STRICT /* Minimal deps so that it works on NT 3.51 too. */
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
 #include <iprt/asm.h>
+#include <iprt/assert.h>
 #include <iprt/string.h>
 
@@ -53 +55 @@
 #define VerifyVersionInfoA                      Ignore_VerifyVersionInfoA
 #define VerSetConditionMask                     Ignore_VerSetConditionMask
-
-#include <iprt/win/windows.h>
+#define IsProcessorFeaturePresent               Ignore_IsProcessorFeaturePresent /* NT 3.51 start */
+#define CancelIo                                Ignore_CancelIo
+
+#include <iprt/nt/nt-and-windows.h>
 
 #undef DecodePointer
@@ -71 +75 @@
 #undef VerifyVersionInfoA
 #undef VerSetConditionMask
+#undef IsProcessorFeaturePresent
+#undef CancelIo
 
 
@@ -90 +96 @@
         s_pfnApi = pfnApi; \
         s_fInitialized = true; \
-    } do {} while (0) \
+    } do {} while (0)
+
+
+/** Dynamically resolves an NTDLL API we need.   */
+#define RESOLVE_NTDLL_API(ApiNm) \
+    static bool volatile    s_fInitialized##ApiNm = false; \
+    static decltype(ApiNm) *s_pfn##ApiNm = NULL; \
+    decltype(ApiNm)        *pfn##ApiNm; \
+    if (!s_fInitialized##ApiNm) \
+        pfn##ApiNm = s_pfn##ApiNm; \
+    else \
+    { \
+        pfn##ApiNm = (decltype(pfn##ApiNm))GetProcAddress(GetModuleHandleW(L"ntdll"), #ApiNm); \
+        s_pfn##ApiNm = pfn##ApiNm; \
+        s_fInitialized##ApiNm = true; \
+    } do {} while (0)
 
 
@@ -401 +422 @@
 }
 
+
 extern "C"
 __declspec(dllexport)
@@ -422 +444 @@
 
 
+/*
+ * NT 3.51 stuff.
+ */
+
+extern "C" DECLEXPORT(BOOL) WINAPI IsProcessorFeaturePresent(DWORD enmProcessorFeature)
+{
+    RESOLVE_ME(IsProcessorFeaturePresent);
+    if (pfnApi)
+        return pfnApi(enmProcessorFeature);
+
+    /* Could make more of an effort here... */
+    return FALSE;
+}
+
+
+extern "C" DECLEXPORT(BOOL) WINAPI CancelIo(HANDLE hHandle)
+{
+    RESOLVE_ME(CancelIo);
+    if (pfnApi)
+        return pfnApi(hHandle);
+
+    /* NT 3.51 have the NTDLL API this corresponds to. */
+    RESOLVE_NTDLL_API(NtCancelIoFile);
+    if (pfnNtCancelIoFile)
+    {
+        IO_STATUS_BLOCK Ios = RTNT_IO_STATUS_BLOCK_INITIALIZER;
+        NTSTATUS rcNt = pfnNtCancelIoFile(hHandle, &Ios);
+        if (RT_SUCCESS(rcNt))
+            return TRUE;
+        if (rcNt == STATUS_INVALID_HANDLE)
+            SetLastError(ERROR_INVALID_HANDLE);
+        else
+            SetLastError(ERROR_INVALID_FUNCTION);
+    }
+    else
+        SetLastError(ERROR_NOT_SUPPORTED);
+    return FALSE;
+}
+
 
 /* Dummy to force dragging in this object in the link, so the linker

trunk/src/VBox/Runtime/r3/win/vcc100-kernel32-fakesA.asm

@@ -60 +60 @@
 MAKE_IMPORT_ENTRY VerifyVersionInfoA, 16
 MAKE_IMPORT_ENTRY VerSetConditionMask, 16
+MAKE_IMPORT_ENTRY IsProcessorFeaturePresent, 4
+MAKE_IMPORT_ENTRY CancelIo, 4