Changeset 105786 in vbox for trunk/src/VBox/Runtime/r3/win/RTSystemFirmware-win.cpp

Timestamp:

Aug 21, 2024 5:27:35 PM (5 months 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

File:

• trunk/src/VBox/Runtime/r3/win/RTSystemFirmware-win.cpp (modified) (3 diffs)

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))
             {