Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

14 files changed, 588 insertions, 61 deletions

diff --git a/src/VBox/HostDrivers/Support/testcase/Makefile.kmk b/src/VBox/HostDrivers/Support/testcase/Makefile.kmk
index 4016e159..534f426f 100644
--- a/src/VBox/HostDrivers/Support/testcase/Makefile.kmk
+++ b/src/VBox/HostDrivers/Support/testcase/Makefile.kmk
@@ -44,6 +44,8 @@ PROGRAMS += \
 	tstSupLoadModule \
 	tstSupSem \
 	tstSupSem-Zombie
+PROGRAMS.win += \
+	tstNtQueryStuff
 endif # VBOX_WITH_TESTCASES
 
 SUPInstall_TEMPLATE   = VBOXR3EXE
@@ -71,6 +73,10 @@ tstInit_SOURCES       = tstInit.cpp
 tstLow_TEMPLATE       = VBOXR3TSTEXE
 tstLow_SOURCES        = tstLow.cpp
 
+tstNtQueryStuff_TEMPLATE = VBOXR3TSTEXE
+tstNtQueryStuff_SDKS     = VBOX_NTDLL
+tstNtQueryStuff_SOURCES  = tstNtQueryStuff.cpp
+
 tstPin_TEMPLATE       = VBOXR3TSTEXE
 tstPin_SOURCES        = tstPin.cpp
 
diff --git a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp
index f2f2b81c..81205d31 100644
--- a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp b/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp
index a0030808..be9f72cb 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp
index 97ace8c7..129007a9 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -96,7 +96,8 @@ int main(int argc, char **argv)
     {
         if (g_pSUPGlobalInfoPage)
         {
-            RTPrintf("tstGIP-2: u32UpdateHz=%RU32  u32UpdateIntervalNS=%RU32  u64NanoTSLastUpdateHz=%RX64  u32Mode=%d (%s) u32Version=%#x\n",
+            RTPrintf("tstGIP-2: cCpus=%d  u32UpdateHz=%RU32  u32UpdateIntervalNS=%RU32  u64NanoTSLastUpdateHz=%RX64  u32Mode=%d (%s) u32Version=%#x\n",
+                     g_pSUPGlobalInfoPage->cCpus,
                      g_pSUPGlobalInfoPage->u32UpdateHz,
                      g_pSUPGlobalInfoPage->u32UpdateIntervalNS,
                      g_pSUPGlobalInfoPage->u64NanoTSLastUpdateHz,
@@ -108,16 +109,16 @@ int main(int argc, char **argv)
             RTPrintf(fHex
                      ? "tstGIP-2:     it: u64NanoTS        delta     u64TSC           UpIntTSC H  TransId           CpuHz TSC Interval History...\n"
                      : "tstGIP-2:     it: u64NanoTS        delta     u64TSC             UpIntTSC H    TransId           CpuHz TSC Interval History...\n");
-            static SUPGIPCPU s_aaCPUs[2][RT_ELEMENTS(g_pSUPGlobalInfoPage->aCPUs)];
+            static SUPGIPCPU s_aaCPUs[2][256];
             for (uint32_t i = 0; i < cIterations; i++)
             {
                 /* copy the data */
-                memcpy(&s_aaCPUs[i & 1][0], &g_pSUPGlobalInfoPage->aCPUs[0], sizeof(g_pSUPGlobalInfoPage->aCPUs));
+                memcpy(&s_aaCPUs[i & 1][0], &g_pSUPGlobalInfoPage->aCPUs[0], g_pSUPGlobalInfoPage->cCpus * sizeof(g_pSUPGlobalInfoPage->aCPUs[0]));
 
                 /* display it & find something to spin on. */
                 uint32_t u32TransactionId = 0;
                 uint32_t volatile *pu32TransactionId = NULL;
-                for (unsigned iCpu = 0; iCpu < RT_ELEMENTS(g_pSUPGlobalInfoPage->aCPUs); iCpu++)
+                for (unsigned iCpu = 0; iCpu < g_pSUPGlobalInfoPage->cCpus; iCpu++)
                     if (    g_pSUPGlobalInfoPage->aCPUs[iCpu].u64CpuHz > 0
                         &&  g_pSUPGlobalInfoPage->aCPUs[iCpu].u64CpuHz != _4G + 1)
                     {
diff --git a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp
index 1af3d73b..15274cf7 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp
index bdbe4613..bcb4028c 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp
index 9a522601..27e426ae 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp
index 39058924..27a840d6 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
                     for (uint8_t *pu8 = (uint8_t *)pvPages0 + iPage * PAGE_SIZE, *pu8End = pu8 + PAGE_SIZE; pu8 < pu8End; pu8++)
                         if (*pu8 != (uint8_t)iPage)
                         {
-                            RTPrintf("tstLow: error: invalid page content %02x != %02x. iPage=%p off=%#x\n",
+                            RTPrintf("tstLow: error: invalid page content %02x != %02x. iPage=%u off=%#x\n",
                                      *pu8, (uint8_t)iPage, iPage, (uintptr_t)pu8 & PAGE_OFFSET_MASK);
                             rcRet++;
                         }
diff --git a/src/VBox/HostDrivers/Support/testcase/tstNtQueryStuff.cpp b/src/VBox/HostDrivers/Support/testcase/tstNtQueryStuff.cpp
new file mode 100644
index 00000000..02f5bf30
--- /dev/null
+++ b/src/VBox/HostDrivers/Support/testcase/tstNtQueryStuff.cpp
@@ -0,0 +1,452 @@
+/* $Id: tstNtQueryStuff.cpp $ */
+/** @file
+ * SUP Testcase - Exploring some NT Query APIs.
+ */
+
+/*
+ * Copyright (C) 2006-2012 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
+ */
+
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#include <ntstatus.h>
+#define WIN32_NO_STATUS
+#include <Windows.h>
+#include <winternl.h>
+
+typedef enum
+{
+    MemoryBasicInformation = 0,
+    MemoryWorkingSetList,
+    MemorySectionName,
+    MemoryBasicVlmInformation
+} MEMORY_INFORMATION_CLASS;
+
+typedef struct
+{
+    UNICODE_STRING  SectionFileName;
+    WCHAR           NameBuffer[ANYSIZE_ARRAY];
+} MEMORY_SECTION_NAME;
+
+extern "C"
+NTSYSAPI NTSTATUS NTAPI NtQueryVirtualMemory(IN HANDLE hProcess,
+                                             IN LPCVOID pvWhere,
+                                             IN MEMORY_INFORMATION_CLASS MemoryInfo,
+                                             OUT PVOID pvBuf,
+                                             IN SIZE_T cbBuf,
+                                             OUT PSIZE_T pcbReturned OPTIONAL);
+
+#define ProcessDebugPort            ((PROCESSINFOCLASS)7 )
+#define ProcessHandleCount          ((PROCESSINFOCLASS)20)
+#define ProcessWow64Information     ((PROCESSINFOCLASS)26)
+#define ProcessImageFileName        ((PROCESSINFOCLASS)27)
+#define ProcessDebugObjectHandle    ((PROCESSINFOCLASS)30)
+#define ProcessExecuteFlags         ((PROCESSINFOCLASS)34)
+#define ProcessImageFileNameWin32   ((PROCESSINFOCLASS)43)
+#define ProcessImageFileMapping     ((PROCESSINFOCLASS)44)
+
+
+#include <iprt/test.h>
+#include <iprt/string.h>
+
+
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+typedef struct FLAGDESC
+{
+    ULONG       f;
+    const char *psz;
+} FLAGDESC;
+typedef const FLAGDESC *PCFLAGDESC;
+
+
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+static RTTEST g_hTest = NIL_RTTEST;
+static HANDLE g_hProcess = NULL;
+
+
+static char *stringifyAppend(char *pszBuf, size_t *pcbBuf, const char *pszAppend, bool fWithSpace)
+{
+    size_t cchAppend = strlen(pszAppend);
+    if (cchAppend + 1 + fWithSpace <= *pcbBuf)
+    {
+        if (fWithSpace)
+        {
+            *pszBuf++ = ' ';
+            *pcbBuf  += 1;
+        }
+        memcpy(pszBuf, pszAppend, cchAppend + 1);
+        *pcbBuf -= cchAppend;
+        pszBuf  += cchAppend;
+    }
+
+    return pszBuf;
+}
+
+
+static char *stringifyAppendUnknownFlags(uint32_t fFlags, char *pszBuf, size_t *pcbBuf, bool fWithSpace)
+{
+    for (unsigned iBit = 0; iBit < 32; iBit++)
+        if (fFlags & RT_BIT_32(iBit))
+        {
+            char szTmp[32];             /* lazy bird */
+            RTStrPrintf(szTmp, sizeof(szTmp), "BIT(%d)", iBit);
+            pszBuf = stringifyAppend(pszBuf, pcbBuf, szTmp, fWithSpace);
+            fWithSpace = true;
+        }
+
+    return pszBuf;
+}
+
+
+static char *stringifyFlags(uint32_t fFlags, char *pszBuf, size_t cbBuf, PCFLAGDESC paFlagDesc, size_t cFlagDesc)
+{
+    char *pszBufStart = pszBuf;
+    if (fFlags)
+    {
+        for (size_t i = 0; i < cFlagDesc; i++)
+        {
+            if (fFlags & paFlagDesc[i].f)
+            {
+                fFlags &= ~paFlagDesc[i].f;
+                pszBuf = stringifyAppend(pszBuf, &cbBuf, paFlagDesc[i].psz, pszBuf != pszBufStart);
+            }
+        }
+
+        if (fFlags)
+            stringifyAppendUnknownFlags(fFlags, pszBuf, &cbBuf, pszBuf != pszBufStart);
+    }
+    else
+    {
+        pszBuf[0] = '0';
+        pszBuf[1] = '\0';
+    }
+    return pszBufStart;
+}
+
+
+static char *stringifyMemType(uint32_t fType, char *pszBuf, size_t cbBuf)
+{
+    static const FLAGDESC s_aMemTypes[] =
+    {
+        { MEM_PRIVATE,      "PRIVATE" },
+        { MEM_MAPPED,       "MAPPED" },
+        { MEM_IMAGE,        "IMAGE" },
+    };
+    return stringifyFlags(fType, pszBuf, cbBuf, s_aMemTypes, RT_ELEMENTS(s_aMemTypes));
+}
+
+
+static char *stringifyMemState(uint32_t fState, char *pszBuf, size_t cbBuf)
+{
+    static const FLAGDESC s_aMemStates[] =
+    {
+        { MEM_FREE,         "FREE" },
+        { MEM_COMMIT,       "COMMIT" },
+        { MEM_RESERVE,      "RESERVE" },
+        { MEM_DECOMMIT,     "DECOMMMIT" },
+    };
+    return stringifyFlags(fState, pszBuf, cbBuf, s_aMemStates, RT_ELEMENTS(s_aMemStates));
+}
+
+
+static char *stringifyMemProt(uint32_t fProt, char *pszBuf, size_t cbBuf)
+{
+    static const FLAGDESC s_aProtections[] =
+    {
+        { PAGE_NOACCESS,            "NOACCESS" },
+        { PAGE_READONLY,            "READONLY" },
+        { PAGE_READWRITE,           "READWRITE" },
+        { PAGE_WRITECOPY,           "WRITECOPY" },
+        { PAGE_EXECUTE,             "EXECUTE" },
+        { PAGE_EXECUTE_READ,        "EXECUTE_READ" },
+        { PAGE_EXECUTE_READWRITE,   "EXECUTE_READWRITE" },
+        { PAGE_EXECUTE_WRITECOPY,   "EXECUTE_WRITECOPY" },
+        { PAGE_GUARD,               "GUARD" },
+        { PAGE_NOCACHE,             "NOCACHE" },
+        { PAGE_WRITECOMBINE,        "WRITECOMBINE" },
+
+    };
+    return stringifyFlags(fProt, pszBuf, cbBuf, s_aProtections, RT_ELEMENTS(s_aProtections));
+}
+
+
+
+static void tstQueryVirtualMemory(void)
+{
+    RTTestISub("NtQueryVirtualMemory");
+
+    uintptr_t   cbAdvance = 0;
+    uintptr_t   uPtrWhere = 0;
+    for (;;)
+    {
+        SIZE_T                      cbActual = 0;
+        MEMORY_BASIC_INFORMATION    MemInfo  = { 0, 0, 0, 0, 0, 0, 0 };
+        NTSTATUS rcNt = NtQueryVirtualMemory(g_hProcess,
+                                             (void const *)uPtrWhere,
+                                             MemoryBasicInformation,
+                                             &MemInfo,
+                                             sizeof(MemInfo),
+                                             &cbActual);
+        if (!NT_SUCCESS(rcNt))
+        {
+            RTTestIPrintf(RTTESTLVL_ALWAYS, "%p: rcNt=%#x\n", uPtrWhere, rcNt);
+            break;
+        }
+
+        /* stringify the memory state. */
+        char szMemType[1024];
+        char szMemState[1024];
+        char szMemProt[1024];
+        char szAllocProt[1024];
+
+        if (   MemInfo.AllocationBase != NULL
+            && MemInfo.AllocationBase == MemInfo.BaseAddress
+            && MemInfo.Protect        != MemInfo.AllocationProtect)
+            RTTestIPrintf(RTTESTLVL_ALWAYS, "\n");
+
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "%p-%p  %-8s  %-8s  %-12s",
+                      MemInfo.BaseAddress, (uintptr_t)MemInfo.BaseAddress + MemInfo.RegionSize - 1,
+                      stringifyMemType(MemInfo.Type, szMemType, sizeof(szMemType)),
+                      stringifyMemState(MemInfo.State, szMemState, sizeof(szMemState)),
+                      stringifyMemProt(MemInfo.Protect, szMemProt, sizeof(szMemProt))
+                      );
+        if ((uintptr_t)MemInfo.AllocationBase != 0)
+        {
+            if (MemInfo.AllocationBase != MemInfo.BaseAddress)
+                RTTestIPrintf(RTTESTLVL_ALWAYS, "  %p", MemInfo.AllocationBase);
+            else
+                RTTestIPrintf(RTTESTLVL_ALWAYS, "  %s", stringifyMemProt(MemInfo.AllocationProtect, szAllocProt, sizeof(szAllocProt)));
+        }
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "\n");
+
+        if ((uintptr_t)MemInfo.BaseAddress != uPtrWhere)
+            RTTestIPrintf(RTTESTLVL_ALWAYS, " !Warning! Queried %p got BaseAddress=%p!\n",
+                          uPtrWhere, MemInfo.BaseAddress);
+
+        /* Image or mapped, then try get a file name. */
+        if (MemInfo.Type == MEM_IMAGE || MemInfo.Type == MEM_MAPPED)
+        {
+            union
+            {
+                MEMORY_SECTION_NAME     Core;
+                WCHAR                   awcPadding[UNICODE_STRING_MAX_CHARS + (sizeof(UNICODE_STRING_MAX_CHARS) + 1) / sizeof(WCHAR)];
+            } uBuf;
+            RT_ZERO(uBuf);
+            uBuf.Core.SectionFileName.Length        = UNICODE_STRING_MAX_CHARS * 2;
+            uBuf.Core.SectionFileName.MaximumLength = UNICODE_STRING_MAX_CHARS * 2;
+            uBuf.Core.SectionFileName.Buffer        = &uBuf.Core.NameBuffer[0];
+
+            cbActual = 0;
+            rcNt = NtQueryVirtualMemory(g_hProcess,
+                                        (void const *)uPtrWhere,
+                                        MemorySectionName,
+                                        &uBuf,
+                                        sizeof(uBuf),
+                                        &cbActual);
+            if (NT_SUCCESS(rcNt))
+                RTTestIPrintf(RTTESTLVL_ALWAYS, "    %.*ls\n",
+                              uBuf.Core.SectionFileName.Length / 2, uBuf.Core.SectionFileName.Buffer);
+            else
+            {
+                RTTestIPrintf(RTTESTLVL_ALWAYS, "%p: MemorySectionName - rcNt=%#x\n", uPtrWhere, rcNt);
+                RTTESTI_CHECK(rcNt == STATUS_FILE_INVALID && MemInfo.Type == MEM_MAPPED);
+            }
+        }
+
+        /* Advance. */
+        cbAdvance = MemInfo.RegionSize;
+        //cbAdvance = 0;
+        if (uPtrWhere + cbAdvance <= uPtrWhere)
+            break;
+        uPtrWhere += MemInfo.RegionSize;
+    }
+}
+
+
+static void tstQueryInformationProcess(void)
+{
+    RTTestISub("NtQueryInformationProcess");
+
+    NTSTATUS rcNt;
+
+    /* Basic info */
+    PROCESS_BASIC_INFORMATION BasicInfo;
+    RT_ZERO(BasicInfo);
+    DWORD cbActual = 0;
+    rcNt = NtQueryInformationProcess(g_hProcess,
+                                     ProcessBasicInformation,
+                                     &BasicInfo, sizeof(BasicInfo), &cbActual);
+    RTTESTI_CHECK_MSG(NT_SUCCESS(rcNt), ("rcNt=%#x\n", rcNt));
+    if (NT_SUCCESS(rcNt))
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "BasicInfo:\n"
+                                        "    UniqueProcessId = %#x (%6d)\n"
+                                        "    PebBaseAddress  = %p\n"
+                                        "    Reserved1       = %p          ExitStatus?\n"
+                                        "    Reserved2a      = %p          AffinityMask?\n"
+                                        "    Reserved2b      = %p (%6d) BasePriority?\n"
+                                        "    Reserved3       = %p (%6d) InheritedFromUniqueProcessId?\n"
+                      ,
+                      BasicInfo.UniqueProcessId, BasicInfo.UniqueProcessId,
+                      BasicInfo.PebBaseAddress,
+                      BasicInfo.Reserved1,
+                      BasicInfo.Reserved2[0],
+                      BasicInfo.Reserved2[1], BasicInfo.Reserved2[1],
+                      BasicInfo.Reserved3, BasicInfo.Reserved3
+                      );
+
+
+    /* Debugger present? */
+    DWORD_PTR uPtr = ~(DWORD_PTR)0;
+    cbActual = 0;
+    rcNt = NtQueryInformationProcess(g_hProcess,
+                                     ProcessDebugPort,
+                                     &uPtr, sizeof(uPtr), &cbActual);
+    RTTESTI_CHECK_MSG(NT_SUCCESS(rcNt), ("rcNt=%#x\n", rcNt));
+    if (NT_SUCCESS(rcNt))
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessDebugPort:          %p\n", uPtr);
+
+    /* Debug object handle, whatever that is... */
+    uPtr = ~(DWORD_PTR)0;
+    cbActual = 0;
+    rcNt = NtQueryInformationProcess(g_hProcess,
+                                     ProcessDebugObjectHandle,
+                                     &uPtr, sizeof(uPtr), &cbActual);
+    if (NT_SUCCESS(rcNt))
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessDebugObjectHandle:  %p\n", uPtr);
+    else if (rcNt == STATUS_PORT_NOT_SET)
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessDebugObjectHandle:  rcNt=%#x (STATUS_PORT_NOT_SET)\n", uPtr);
+    else
+        RTTESTI_CHECK_MSG(NT_SUCCESS(rcNt), ("rcNt=%#x\n", rcNt));
+
+    /* 32-bit app on 64-bit host? */
+    uPtr = ~(DWORD_PTR)0;
+    cbActual = 0;
+    rcNt = NtQueryInformationProcess(g_hProcess,
+                                     ProcessWow64Information,
+                                     &uPtr, sizeof(uPtr), &cbActual);
+    RTTESTI_CHECK_MSG(NT_SUCCESS(rcNt), ("rcNt=%#x\n", rcNt));
+    if (NT_SUCCESS(rcNt))
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessWow64Information:   %p\n", uPtr);
+
+    /* Process image name (NT). */
+    struct
+    {
+        UNICODE_STRING     UniStr;
+        WCHAR              awBuffer[UNICODE_STRING_MAX_CHARS];
+    } StrBuf;
+    RT_ZERO(StrBuf);
+    StrBuf.UniStr.Length        = UNICODE_STRING_MAX_CHARS * 2;
+    StrBuf.UniStr.MaximumLength = UNICODE_STRING_MAX_CHARS * 2;
+    StrBuf.UniStr.Buffer        = &StrBuf.awBuffer[0];
+    cbActual = 0;
+    rcNt = NtQueryInformationProcess(g_hProcess,
+                                     ProcessImageFileName,
+                                     &StrBuf, sizeof(StrBuf), &cbActual);
+    RTTESTI_CHECK_MSG(NT_SUCCESS(rcNt), ("rcNt=%#x\n", rcNt));
+    if (NT_SUCCESS(rcNt))
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessImageFileName:      len=%u\n    %.*ls\n",
+                      StrBuf.UniStr.Length, StrBuf.UniStr.Length, StrBuf.UniStr.Buffer);
+
+    /* Process image name (Win32) - Not available on Windows 2003. */
+    RT_ZERO(StrBuf);
+    StrBuf.UniStr.Length        = UNICODE_STRING_MAX_CHARS * 2;
+    StrBuf.UniStr.MaximumLength = UNICODE_STRING_MAX_CHARS * 2;
+    StrBuf.UniStr.Buffer        = &StrBuf.awBuffer[0];
+    cbActual = 0;
+    rcNt = NtQueryInformationProcess(g_hProcess,
+                                     ProcessImageFileNameWin32,
+                                     &StrBuf, sizeof(StrBuf), &cbActual);
+    if (rcNt != STATUS_INVALID_INFO_CLASS)
+    {
+        RTTESTI_CHECK_MSG(NT_SUCCESS(rcNt), ("rcNt=%#x\n", rcNt));
+        if (NT_SUCCESS(rcNt))
+            RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessImageFileNameWin32: len=%u\n    %.*ls\n",
+                          StrBuf.UniStr.Length, StrBuf.UniStr.Length, StrBuf.UniStr.Buffer);
+    }
+    else
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessImageFileNameWin32: Not supported (STATUS_INVALID_INFO_CLASS).\n");
+
+    /* Process image mapping - Not available on Windows 2003. */
+    uPtr = ~(DWORD_PTR)0;
+    cbActual = 0;
+    rcNt = NtQueryInformationProcess(g_hProcess,
+                                     ProcessImageFileMapping,
+                                     &uPtr, sizeof(uPtr), &cbActual);
+    if (NT_SUCCESS(rcNt))
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessImageFileMapping:   %p\n", uPtr);
+    else if (rcNt == STATUS_OBJECT_TYPE_MISMATCH)
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessImageFileMapping:   rcNt=%#x (STATUS_OBJECT_TYPE_MISMATCH)\n", rcNt);
+    else if (rcNt == STATUS_INVALID_INFO_CLASS)
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessImageFileMapping:   Not supported (STATUS_INVALID_INFO_CLASS).\n");
+    else
+        RTTestIFailed("ProcessImageFileMapping: rcNt=%#x\n", rcNt);
+
+
+    /* Handles. Broken for 64-bit input. */
+    uint32_t u32 = UINT32_MAX;
+    cbActual = 0;
+    rcNt = NtQueryInformationProcess(g_hProcess,
+                                     ProcessHandleCount,
+                                     &u32, sizeof(u32), &cbActual);
+    if (NT_SUCCESS(rcNt))
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessHandleCount:        %#x (%d)\n", u32, u32);
+    else
+        RTTestIFailed("ProcessHandleCount: rcNt=%#x\n", rcNt);
+
+    /* Execute flags. */
+#if 0 /* fails... wrong process handle? */
+    u32 = ~(DWORD_PTR)0;
+    cbActual = 0;
+    rcNt = NtQueryInformationProcess(g_hProcess,
+                                     ProcessExecuteFlags,
+                                     &u32, sizeof(u32), &cbActual);
+    if (NT_SUCCESS(rcNt))
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "ProcessExecuteFlags:       %#p\n", u32);
+    else
+        RTTestIFailed("ProcessExecuteFlags: rcNt=%#x\n", rcNt);
+#endif
+
+    /** @todo ProcessImageInformation */
+}
+
+
+int main()
+{
+    RTEXITCODE rcExit = RTTestInitAndCreate("tstNtQueryStuff", &g_hTest);
+    if (rcExit != RTEXITCODE_SUCCESS)
+        return rcExit;
+    RTTestBanner(g_hTest);
+
+    g_hProcess = GetCurrentProcess();
+
+    //tstQueryVirtualMemory();
+    tstQueryInformationProcess();
+
+
+    return RTTestSummaryAndDestroy(g_hTest);
+}
+
diff --git a/src/VBox/HostDrivers/Support/testcase/tstPage.cpp b/src/VBox/HostDrivers/Support/testcase/tstPage.cpp
index 26382722..759d86c0 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstPage.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstPage.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp
index 508ba292..131fa2d9 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp
index 0f15f400..a69e9174 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -101,11 +101,11 @@ int main(int argc, char **argv)
                 break;
 
             case 'h':
-                RTPrintf("%s [mod1 [mod2...]]\n");
+                RTPrintf("%s [mod1 [mod2...]]\n", argv[0]);
                 return 1;
 
             case 'V':
-                RTPrintf("$Revision: 77327 $\n");
+                RTPrintf("$Revision: 83575 $\n");
                 return 0;
 
             default:
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp
index 2b0d2d8f..9358cb05 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp
index 6f37c63c..bd73c05c 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -287,12 +287,15 @@ int main(int argc, char **argv)
 #endif /* !OS2 && !WINDOWS */
 
     {
+
+#define LOOP_COUNT 20
         static unsigned const s_acMsIntervals[] = { 0, 1, 2, 3, 4, 8, 10, 16, 32 };
         if (RTTestErrorCount(hTest) == 0)
         {
             RTTestSub(hTest, "SRE Timeout Accuracy (ms)");
             RTTESTI_CHECK_RC(SUPSemEventCreate(pSession, &hEvent), VINF_SUCCESS);
 
+            uint32_t cInterrupted = 0;
             for (unsigned i = 0; i < RT_ELEMENTS(s_acMsIntervals); i++)
             {
                 uint64_t cMs        = s_acMsIntervals[i];
@@ -300,35 +303,45 @@ int main(int argc, char **argv)
                 uint64_t cNsMin     = UINT64_MAX;
                 uint64_t cNsTotalSys= 0;
                 uint64_t cNsTotal   = 0;
-                for (unsigned j = 0; j < 10; j++)
+                unsigned cLoops     = 0;
+                while (cLoops < LOOP_COUNT)
                 {
                     uint64_t u64StartSys = RTTimeSystemNanoTS();
                     uint64_t u64Start    = RTTimeNanoTS();
                     int rcX = SUPSemEventWaitNoResume(pSession, hEvent, cMs);
-                    if (rcX != VERR_TIMEOUT)
-                        RTTestFailed(hTest, "%Rrc j=%u cMs=%u", rcX, j, cMs);
                     uint64_t cNsElapsedSys = RTTimeSystemNanoTS() - u64StartSys;
                     uint64_t cNsElapsed    = RTTimeNanoTS()       - u64Start;
+
+                    if (rcX == VERR_INTERRUPTED)
+                    {
+                        cInterrupted++;
+                        continue; /* retry */
+                    }
+                    if (rcX != VERR_TIMEOUT)
+                        RTTestFailed(hTest, "%Rrc cLoops=%u cMs=%u", rcX, cLoops, cMs);
+
                     if (cNsElapsedSys < cNsMinSys)
                         cNsMinSys = cNsElapsedSys;
                     if (cNsElapsed < cNsMin)
                         cNsMin = cNsElapsed;
                     cNsTotalSys += cNsElapsedSys;
                     cNsTotal    += cNsElapsed;
+                    cLoops++;
                 }
                 if (fSys)
                 {
-                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,        "%u ms min (clock=sys)", cMs);
-                    RTTestValueF(hTest, cNsTotalSys / 10, RTTESTUNIT_NS, "%u ms avg (clock=sys)", cMs);
+                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,            "%u ms min (clock=sys)", cMs);
+                    RTTestValueF(hTest, cNsTotalSys / cLoops, RTTESTUNIT_NS, "%u ms avg (clock=sys)", cMs);
                 }
                 if (fGip)
                 {
-                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,           "%u ms min (clock=gip)", cMs);
-                    RTTestValueF(hTest, cNsTotal / 10, RTTESTUNIT_NS,    "%u ms avg (clock=gip)", cMs);
+                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,               "%u ms min (clock=gip)", cMs);
+                    RTTestValueF(hTest, cNsTotal / cLoops, RTTESTUNIT_NS,    "%u ms avg (clock=gip)", cMs);
                 }
             }
 
             RTTESTI_CHECK_RC(SUPSemEventClose(pSession, hEvent), VINF_OBJECT_DESTROYED);
+            RTTestValueF(hTest, cInterrupted, RTTESTUNIT_OCCURRENCES, "VERR_INTERRUPTED returned", cInterrupted);
         }
 
         if (RTTestErrorCount(hTest) == 0)
@@ -336,6 +349,7 @@ int main(int argc, char **argv)
             RTTestSub(hTest, "MRE Timeout Accuracy (ms)");
             RTTESTI_CHECK_RC(SUPSemEventMultiCreate(pSession, &hEvent), VINF_SUCCESS);
 
+            uint32_t cInterrupted = 0;
             for (unsigned i = 0; i < RT_ELEMENTS(s_acMsIntervals); i++)
             {
                 uint64_t cMs        = s_acMsIntervals[i];
@@ -343,35 +357,45 @@ int main(int argc, char **argv)
                 uint64_t cNsMin     = UINT64_MAX;
                 uint64_t cNsTotalSys= 0;
                 uint64_t cNsTotal   = 0;
-                for (unsigned j = 0; j < 10; j++)
+                unsigned cLoops     = 0;
+                while (cLoops < LOOP_COUNT)
                 {
                     uint64_t u64StartSys = RTTimeSystemNanoTS();
                     uint64_t u64Start    = RTTimeNanoTS();
                     int rcX = SUPSemEventMultiWaitNoResume(pSession, hEvent, cMs);
-                    if (rcX != VERR_TIMEOUT)
-                        RTTestFailed(hTest, "%Rrc j=%u cMs=%u", rcX, j, cMs);
                     uint64_t cNsElapsedSys = RTTimeSystemNanoTS() - u64StartSys;
                     uint64_t cNsElapsed    = RTTimeNanoTS()       - u64Start;
+
+                    if (rcX == VERR_INTERRUPTED)
+                    {
+                        cInterrupted++;
+                        continue; /* retry */
+                    }
+                    if (rcX != VERR_TIMEOUT)
+                        RTTestFailed(hTest, "%Rrc cLoops=%u cMs=%u", rcX, cLoops, cMs);
+
                     if (cNsElapsedSys < cNsMinSys)
                         cNsMinSys = cNsElapsedSys;
                     if (cNsElapsed < cNsMin)
                         cNsMin = cNsElapsed;
                     cNsTotalSys += cNsElapsedSys;
                     cNsTotal    += cNsElapsed;
+                    cLoops++;
                 }
                 if (fSys)
                 {
-                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,        "%u ms min (clock=sys)", cMs);
-                    RTTestValueF(hTest, cNsTotalSys / 10, RTTESTUNIT_NS, "%u ms avg (clock=sys)", cMs);
+                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,            "%u ms min (clock=sys)", cMs);
+                    RTTestValueF(hTest, cNsTotalSys / cLoops, RTTESTUNIT_NS, "%u ms avg (clock=sys)", cMs);
                 }
                 if (fGip)
                 {
-                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,           "%u ms min (clock=gip)", cMs);
-                    RTTestValueF(hTest, cNsTotal / 10, RTTESTUNIT_NS,    "%u ms avg (clock=gip)", cMs);
+                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,               "%u ms min (clock=gip)", cMs);
+                    RTTestValueF(hTest, cNsTotal / cLoops, RTTESTUNIT_NS,    "%u ms avg (clock=gip)", cMs);
                 }
             }
 
             RTTESTI_CHECK_RC(SUPSemEventMultiClose(pSession, hEvent), VINF_OBJECT_DESTROYED);
+            RTTestValueF(hTest, cInterrupted, RTTESTUNIT_OCCURRENCES, "VERR_INTERRUPTED returned", cInterrupted);
         }
     }
 
@@ -387,6 +411,7 @@ int main(int argc, char **argv)
             RTTestValueF(hTest, SUPSemEventGetResolution(pSession), RTTESTUNIT_NS, "SRE resolution");
             RTTESTI_CHECK_RC(SUPSemEventCreate(pSession, &hEvent), VINF_SUCCESS);
 
+            uint32_t cInterrupted = 0;
             for (unsigned i = 0; i < RT_ELEMENTS(s_acNsIntervals); i++)
             {
                 uint64_t cNs        = s_acNsIntervals[i];
@@ -394,35 +419,45 @@ int main(int argc, char **argv)
                 uint64_t cNsMin     = UINT64_MAX;
                 uint64_t cNsTotalSys= 0;
                 uint64_t cNsTotal   = 0;
-                for (unsigned j = 0; j < 10; j++)
+                unsigned cLoops     = 0;
+                while (cLoops < LOOP_COUNT)
                 {
                     uint64_t u64StartSys = RTTimeSystemNanoTS();
                     uint64_t u64Start    = RTTimeNanoTS();
                     int rcX = SUPSemEventWaitNsRelIntr(pSession, hEvent, cNs);
-                    if (rcX != VERR_TIMEOUT)
-                        RTTestFailed(hTest, "%Rrc j=%u cNs=%u", rcX, j, cNs);
                     uint64_t cNsElapsedSys = RTTimeSystemNanoTS() - u64StartSys;
                     uint64_t cNsElapsed    = RTTimeNanoTS()       - u64Start;
+
+                    if (rcX == VERR_INTERRUPTED)
+                    {
+                        cInterrupted++;
+                        continue; /* retry */
+                    }
+                    if (rcX != VERR_TIMEOUT)
+                        RTTestFailed(hTest, "%Rrc cLoops=%u cNs=%u", rcX, cLoops, cNs);
+
                     if (cNsElapsedSys < cNsMinSys)
                         cNsMinSys = cNsElapsedSys;
                     if (cNsElapsed < cNsMin)
                         cNsMin = cNsElapsed;
                     cNsTotalSys += cNsElapsedSys;
                     cNsTotal    += cNsElapsed;
+                    cLoops++;
                 }
                 if (fSys)
                 {
-                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,        "%'u ns min (clock=sys)", cNs);
-                    RTTestValueF(hTest, cNsTotalSys / 10, RTTESTUNIT_NS, "%'u ns avg (clock=sys)", cNs);
+                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,            "%'u ns min (clock=sys)", cNs);
+                    RTTestValueF(hTest, cNsTotalSys / cLoops, RTTESTUNIT_NS, "%'u ns avg (clock=sys)", cNs);
                 }
                 if (fGip)
                 {
-                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,           "%'u ns min (clock=gip)", cNs);
-                    RTTestValueF(hTest, cNsTotal / 10, RTTESTUNIT_NS,    "%'u ns avg (clock=gip)", cNs);
+                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,               "%'u ns min (clock=gip)", cNs);
+                    RTTestValueF(hTest, cNsTotal / cLoops, RTTESTUNIT_NS,    "%'u ns avg (clock=gip)", cNs);
                 }
             }
 
             RTTESTI_CHECK_RC(SUPSemEventClose(pSession, hEvent), VINF_OBJECT_DESTROYED);
+            RTTestValueF(hTest, cInterrupted, RTTESTUNIT_OCCURRENCES, "VERR_INTERRUPTED returned", cInterrupted);
         }
 
         if (RTTestErrorCount(hTest) == 0)
@@ -431,6 +466,7 @@ int main(int argc, char **argv)
             RTTestValueF(hTest, SUPSemEventMultiGetResolution(pSession), RTTESTUNIT_NS, "MRE resolution");
             RTTESTI_CHECK_RC(SUPSemEventMultiCreate(pSession, &hEvent), VINF_SUCCESS);
 
+            uint32_t cInterrupted = 0;
             for (unsigned i = 0; i < RT_ELEMENTS(s_acNsIntervals); i++)
             {
                 uint64_t cNs        = s_acNsIntervals[i];
@@ -438,35 +474,45 @@ int main(int argc, char **argv)
                 uint64_t cNsMin     = UINT64_MAX;
                 uint64_t cNsTotalSys= 0;
                 uint64_t cNsTotal   = 0;
-                for (unsigned j = 0; j < 10; j++)
+                unsigned cLoops     = 0;
+                while (cLoops < LOOP_COUNT)
                 {
                     uint64_t u64StartSys = RTTimeSystemNanoTS();
                     uint64_t u64Start    = RTTimeNanoTS();
                     int rcX = SUPSemEventMultiWaitNsRelIntr(pSession, hEvent, cNs);
-                    if (rcX != VERR_TIMEOUT)
-                        RTTestFailed(hTest, "%Rrc j=%u cNs=%u", rcX, j, cNs);
                     uint64_t cNsElapsedSys = RTTimeSystemNanoTS() - u64StartSys;
                     uint64_t cNsElapsed    = RTTimeNanoTS()       - u64Start;
+
+                    if (rcX == VERR_INTERRUPTED)
+                    {
+                        cInterrupted++;
+                        continue; /* retry */
+                    }
+                    if (rcX != VERR_TIMEOUT)
+                        RTTestFailed(hTest, "%Rrc cLoops=%u cNs=%u", rcX, cLoops, cNs);
+
                     if (cNsElapsedSys < cNsMinSys)
                         cNsMinSys = cNsElapsedSys;
                     if (cNsElapsed < cNsMin)
                         cNsMin = cNsElapsed;
                     cNsTotalSys += cNsElapsedSys;
                     cNsTotal    += cNsElapsed;
+                    cLoops++;
                 }
                 if (fSys)
                 {
-                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,        "%'u ns min (clock=sys)", cNs);
-                    RTTestValueF(hTest, cNsTotalSys / 10, RTTESTUNIT_NS, "%'u ns avg (clock=sys)", cNs);
+                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,            "%'u ns min (clock=sys)", cNs);
+                    RTTestValueF(hTest, cNsTotalSys / cLoops, RTTESTUNIT_NS, "%'u ns avg (clock=sys)", cNs);
                 }
                 if (fGip)
                 {
-                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,           "%'u ns min (clock=gip)", cNs);
-                    RTTestValueF(hTest, cNsTotal / 10, RTTESTUNIT_NS,    "%'u ns avg (clock=gip)", cNs);
+                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,               "%'u ns min (clock=gip)", cNs);
+                    RTTestValueF(hTest, cNsTotal / cLoops, RTTESTUNIT_NS,    "%'u ns avg (clock=gip)", cNs);
                 }
             }
 
             RTTESTI_CHECK_RC(SUPSemEventMultiClose(pSession, hEvent), VINF_OBJECT_DESTROYED);
+            RTTestValueF(hTest, cInterrupted, RTTESTUNIT_OCCURRENCES, "VERR_INTERRUPTED returned", cInterrupted);
         }
 
         if (RTTestErrorCount(hTest) == 0)
@@ -475,6 +521,7 @@ int main(int argc, char **argv)
             RTTestValueF(hTest, SUPSemEventGetResolution(pSession), RTTESTUNIT_NS, "MRE resolution");
             RTTESTI_CHECK_RC(SUPSemEventCreate(pSession, &hEvent), VINF_SUCCESS);
 
+            uint32_t cInterrupted = 0;
             for (unsigned i = 0; i < RT_ELEMENTS(s_acNsIntervals); i++)
             {
                 uint64_t cNs        = s_acNsIntervals[i];
@@ -482,36 +529,46 @@ int main(int argc, char **argv)
                 uint64_t cNsMin     = UINT64_MAX;
                 uint64_t cNsTotalSys= 0;
                 uint64_t cNsTotal   = 0;
-                for (unsigned j = 0; j < 10; j++)
+                unsigned cLoops     = 0;
+                while (cLoops < LOOP_COUNT)
                 {
                     uint64_t u64StartSys   = RTTimeSystemNanoTS();
                     uint64_t u64Start      = RTTimeNanoTS();
                     uint64_t uAbsDeadline  = (fGip ? u64Start : u64StartSys) + cNs;
                     int rcX = SUPSemEventWaitNsAbsIntr(pSession, hEvent, uAbsDeadline);
-                    if (rcX != VERR_TIMEOUT)
-                        RTTestFailed(hTest, "%Rrc j=%u cNs=%u", rcX, j, cNs);
                     uint64_t cNsElapsedSys = RTTimeSystemNanoTS() - u64StartSys;
                     uint64_t cNsElapsed    = RTTimeNanoTS()       - u64Start;
+
+                    if (rcX == VERR_INTERRUPTED)
+                    {
+                        cInterrupted++;
+                        continue; /* retry */
+                    }
+                    if (rcX != VERR_TIMEOUT)
+                        RTTestFailed(hTest, "%Rrc cLoops=%u cNs=%u", rcX, cLoops, cNs);
+
                     if (cNsElapsedSys < cNsMinSys)
                         cNsMinSys = cNsElapsedSys;
                     if (cNsElapsed < cNsMin)
                         cNsMin = cNsElapsed;
                     cNsTotalSys += cNsElapsedSys;
                     cNsTotal    += cNsElapsed;
+                    cLoops++;
                 }
                 if (fSys)
                 {
-                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,        "%'u ns min (clock=sys)", cNs);
-                    RTTestValueF(hTest, cNsTotalSys / 10, RTTESTUNIT_NS, "%'u ns avg (clock=sys)", cNs);
+                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,            "%'u ns min (clock=sys)", cNs);
+                    RTTestValueF(hTest, cNsTotalSys / cLoops, RTTESTUNIT_NS, "%'u ns avg (clock=sys)", cNs);
                 }
                 if (fGip)
                 {
-                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,           "%'u ns min (clock=gip)", cNs);
-                    RTTestValueF(hTest, cNsTotal / 10, RTTESTUNIT_NS,    "%'u ns avg (clock=gip)", cNs);
+                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,               "%'u ns min (clock=gip)", cNs);
+                    RTTestValueF(hTest, cNsTotal / cLoops, RTTESTUNIT_NS,    "%'u ns avg (clock=gip)", cNs);
                 }
             }
 
             RTTESTI_CHECK_RC(SUPSemEventClose(pSession, hEvent), VINF_OBJECT_DESTROYED);
+            RTTestValueF(hTest, cInterrupted, RTTESTUNIT_OCCURRENCES, "VERR_INTERRUPTED returned", cInterrupted);
         }
 
 
@@ -521,6 +578,7 @@ int main(int argc, char **argv)
             RTTestValueF(hTest, SUPSemEventMultiGetResolution(pSession), RTTESTUNIT_NS, "MRE resolution");
             RTTESTI_CHECK_RC(SUPSemEventMultiCreate(pSession, &hEvent), VINF_SUCCESS);
 
+            uint32_t cInterrupted = 0;
             for (unsigned i = 0; i < RT_ELEMENTS(s_acNsIntervals); i++)
             {
                 uint64_t cNs        = s_acNsIntervals[i];
@@ -528,36 +586,46 @@ int main(int argc, char **argv)
                 uint64_t cNsMin     = UINT64_MAX;
                 uint64_t cNsTotalSys= 0;
                 uint64_t cNsTotal   = 0;
-                for (unsigned j = 0; j < 10; j++)
+                unsigned cLoops     = 0;
+                while (cLoops < LOOP_COUNT)
                 {
                     uint64_t u64StartSys   = RTTimeSystemNanoTS();
                     uint64_t u64Start      = RTTimeNanoTS();
                     uint64_t uAbsDeadline  = (fGip ? u64Start : u64StartSys) + cNs;
                     int rcX = SUPSemEventMultiWaitNsAbsIntr(pSession, hEvent, uAbsDeadline);
-                    if (rcX != VERR_TIMEOUT)
-                        RTTestFailed(hTest, "%Rrc j=%u cNs=%u", rcX, j, cNs);
                     uint64_t cNsElapsedSys = RTTimeSystemNanoTS() - u64StartSys;
                     uint64_t cNsElapsed    = RTTimeNanoTS()       - u64Start;
+
+                    if (rcX == VERR_INTERRUPTED)
+                    {
+                        cInterrupted++;
+                        continue; /* retry */
+                    }
+                    if (rcX != VERR_TIMEOUT)
+                        RTTestFailed(hTest, "%Rrc cLoops=%u cNs=%u", rcX, cLoops, cNs);
+
                     if (cNsElapsedSys < cNsMinSys)
                         cNsMinSys = cNsElapsedSys;
                     if (cNsElapsed < cNsMin)
                         cNsMin = cNsElapsed;
                     cNsTotalSys += cNsElapsedSys;
                     cNsTotal    += cNsElapsed;
+                    cLoops++;
                 }
                 if (fSys)
                 {
-                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,        "%'u ns min (clock=sys)", cNs);
-                    RTTestValueF(hTest, cNsTotalSys / 10, RTTESTUNIT_NS, "%'u ns avg (clock=sys)", cNs);
+                    RTTestValueF(hTest, cNsMinSys, RTTESTUNIT_NS,            "%'u ns min (clock=sys)", cNs);
+                    RTTestValueF(hTest, cNsTotalSys / cLoops, RTTESTUNIT_NS, "%'u ns avg (clock=sys)", cNs);
                 }
                 if (fGip)
                 {
-                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,           "%'u ns min (clock=gip)", cNs);
-                    RTTestValueF(hTest, cNsTotal / 10, RTTESTUNIT_NS,    "%'u ns avg (clock=gip)", cNs);
+                    RTTestValueF(hTest, cNsMin, RTTESTUNIT_NS,               "%'u ns min (clock=gip)", cNs);
+                    RTTestValueF(hTest, cNsTotal / cLoops, RTTESTUNIT_NS,    "%'u ns avg (clock=gip)", cNs);
                 }
             }
 
             RTTESTI_CHECK_RC(SUPSemEventMultiClose(pSession, hEvent), VINF_OBJECT_DESTROYED);
+            RTTestValueF(hTest, cInterrupted, RTTESTUNIT_OCCURRENCES, "VERR_INTERRUPTED returned", cInterrupted);
         }
 
     }