Changeset 105786 in vbox

Timestamp:

Aug 21, 2024 5:27:35 PM (5 weeks ago)

Author:

vboxsync

Message:

IPRT: Added RTSystemQueryNtFeatureEnabled() API to query Windows (NT) features + testcase. Also includes internal code for querying Windows registry values. bugref:10753

Location:

trunk

Files:

• include/iprt/system.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/r3/win/RTSystemFirmware-win.cpp (modified) (3 diffs)
• src/VBox/Runtime/r3/win/RTSystemRegistry-win.cpp (added)
• src/VBox/Runtime/r3/win/system-get-nt-xxx-win.cpp (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp (modified) (1 diff)

trunk/include/iprt/system.h

@@ -399 +399 @@
 RTDECL(uint8_t) RTSystemGetNtProductType(void);
 
+/**
+ * Windows NT feature types.
+ */
+typedef enum RTSYSNTFEATURE
+{
+    /** Invalid feature. */
+    RTSYSNTFEATURE_INVALID = 0,
+    /** Memory integrity is a feature of the Core Isolation facility.
+     *  Introduced in Windows 10. */
+    RTSYSNTFEATURE_CORE_ISOLATION_MEMORY_INTEGRITY,
+    /** The usual 32-bit hack.  */
+    RTSYSNTFEATURE_32_BIT_HACK = 0x7fffffff
+} RTSYSNTFEATURE;
+/** Pointer to a Windows NT feature type. */
+typedef RTSYSNTFEATURE *PRTSYSNTFEATURE;
+
+/**
+ * Queries whether an NT feature is enabled or not.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_NOT_SUPPORTED if the feature is not supported on this platform.
+ * @param   enmFeature  Feature to query enabled status for.
+ * @param   pfEnabled   Where to return the enabled status on success.
+ */
+RTDECL(int) RTSystemQueryNtFeatureEnabled(RTSYSNTFEATURE enmFeature, bool *pfEnabled);
+
 #endif /* RT_OS_WINDOWS */
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1071 +1071 @@
         r3/win/RTSystemFirmware-win.cpp \
         r3/win/RTSystemQueryTotalRam-win.cpp \
+        r3/win/RTSystemRegistry-win.cpp \
         r3/win/RTTimeZoneGetCurrent-win.cpp \
         r3/win/RTMemProtect-win.cpp \

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

@@ -54 +54 @@
 
 #include "internal-r3-win.h"
+#include "internal-r3-registry-win.h"
 
 
@@ -124 +125 @@
 
     CloseHandle(hToken);
-
-    return rc;
-}
-
-
-/**
- * Queries a DWORD value from a Windows registry key, Unicode (wide char) version.
- *
- * @returns IPRT status code.
- * @retval  VERR_FILE_NOT_FOUND if the value has not been found.
- * @param   hKey                    Registry handle to use.
- * @param   pwszKey                 Registry key to query \a pwszName in.
- * @param   pwszName                Name of the value to query.
- * @param   pdwValue                Where to return the actual value on success.
- */
-static int rtSystemWinRegistryGetDWORDW(HKEY hKey, LPCWSTR pwszKey, LPCWSTR pwszName, DWORD *pdwValue)
-{
-    LONG lErr = RegOpenKeyExW(hKey, pwszKey, 0, KEY_QUERY_VALUE, &hKey);
-    if (lErr != ERROR_SUCCESS)
-        return RTErrConvertFromWin32(lErr);
-
-    int rc = VINF_SUCCESS;
-
-    DWORD cbType = sizeof(DWORD);
-    DWORD dwType = 0;
-    DWORD dwValue;
-    lErr = RegQueryValueExW(hKey, pwszName, NULL, &dwType, (BYTE *)&dwValue, &cbType);
-    if (lErr == ERROR_SUCCESS)
-    {
-        if (cbType == sizeof(DWORD))
-        {
-            if (dwType == REG_DWORD)
-            {
-                *pdwValue = dwValue;
-            }
-            else
-                rc = VERR_WRONG_TYPE;
-        }
-        else
-            rc = VERR_MISMATCH;
-    }
-    else
-        rc = RTErrConvertFromWin32(lErr);
-
-    RegCloseKey(hKey);
-
-    return rc;
-}
-
-
-/**
- * Queries a DWORD value from a Windows registry key.
- *
- * @returns IPRT status code.
- * @retval  VERR_FILE_NOT_FOUND if the value has not been found.
- * @param   hKey                    Registry handle to use.
- * @param   pszKey                  Registry key to query \a pszName in.
- * @param   pszName                 Name of the value to query.
- * @param   pdwValue                Where to return the actual value on success.
- */
-static int rtSystemRegistryGetDWORDA(HKEY hKey, const char *pszKey, const char *pszName, DWORD *pdwValue)
-{
-    PRTUTF16 pwszKey;
-    int rc = RTStrToUtf16Ex(pszKey, RTSTR_MAX, &pwszKey, 0, NULL);
-    if (RT_SUCCESS(rc))
-    {
-        PRTUTF16 pwszName;
-        rc = RTStrToUtf16Ex(pszName, RTSTR_MAX, &pwszName, 0, NULL);
-        if (RT_SUCCESS(rc))
-        {
-            rc = rtSystemWinRegistryGetDWORDW(hKey, pwszKey, pwszName, pdwValue);
-            RTUtf16Free(pwszName);
-        }
-        RTUtf16Free(pwszKey);
-    }
 
     return rc;
@@ -310 +236 @@
         {
             DWORD dwEnabled;
-            rc = rtSystemRegistryGetDWORDA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\SecureBoot\\State",
-                                           "UEFISecureBootEnabled", &dwEnabled);
+            rc = RTSystemWinRegistryQueryDWORD(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\SecureBoot\\State",
+                                               "UEFISecureBootEnabled", &dwEnabled);
             if (RT_SUCCESS(rc))
             {

trunk/src/VBox/Runtime/r3/win/system-get-nt-xxx-win.cpp

@@ -43 +43 @@
 
 #include "internal-r3-win.h"
+#include "internal-r3-registry-win.h"
 #include <iprt/system.h>
 #include <iprt/assert.h>
+#include <iprt/err.h>
 
 
@@ -67 +69 @@
 }
 
+
+RTDECL(int) RTSystemQueryNtFeatureEnabled(RTSYSNTFEATURE enmFeature, bool *pfEnabled)
+{
+    AssertPtrReturn(pfEnabled, VERR_INVALID_POINTER);
+
+    int rc;
+
+    switch (enmFeature)
+    {
+        case RTSYSNTFEATURE_CORE_ISOLATION_MEMORY_INTEGRITY: /* aka Code Integrity */
+        {
+            DWORD dwEnabled;
+            rc = RTSystemWinRegistryQueryDWORD(HKEY_LOCAL_MACHINE,
+                                    "SYSTEM\\CurrentControlSet\\Control\\DeviceGuard\\Scenarios\\HypervisorEnforcedCodeIntegrity",
+                                    "Enabled", &dwEnabled);
+            if (RT_SUCCESS(rc))
+                *pfEnabled = RT_BOOL(dwEnabled);
+            else if (rc == VERR_FILE_NOT_FOUND)
+                rc = VERR_NOT_SUPPORTED;
+            break;
+        }
+
+        default:
+            rc = VERR_NOT_IMPLEMENTED;
+            break;
+    }
+
+    return rc;
+}
+

trunk/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp

@@ -138 +138 @@
     }
 
+#if defined RT_OS_WINDOWS
+    RTTestISub("Windows Features");
+    struct
+    {
+        const char    *pszDesc;
+        RTSYSNTFEATURE enmFeature;
+        int            rc;
+    } s_aNtFeatures[] =
+    {
+        { "Core Isolation (Memory Integrity)", RTSYSNTFEATURE_CORE_ISOLATION_MEMORY_INTEGRITY, VINF_SUCCESS }
+    };
+
+    for (size_t i = 0; i < RT_ELEMENTS(s_aNtFeatures); i++)
+    {
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "Testing '%s': ", s_aNtFeatures[i].pszDesc);
+        bool fEnabled = false;
+        int rcTst = RTSystemQueryNtFeatureEnabled(s_aNtFeatures[i].enmFeature, &fEnabled);
+        if (RT_SUCCESS(rcTst))
+            RTTestIPrintf(RTTESTLVL_ALWAYS, "%s", fEnabled ? "ENABLED\n" : "DISABLED\n");
+        else if (rc == VERR_NOT_SUPPORTED) /* Don't freak out on older (host) OSes which don't have this feature. */
+            RTTestIPrintf(RTTESTLVL_ALWAYS, "SKIPPED (not supported)\n");
+        else
+            RTTestIPrintf(RTTESTLVL_ALWAYS, "ERROR (%Rrc)\n", rcTst);
+        RTTESTI_CHECK_RC(rcTst, s_aNtFeatures[i].rc);
+    }
+#endif
+
     return RTTestSummaryAndDestroy(hTest);
 }