Changeset 81063 in vbox

Timestamp:

Sep 27, 2019 9:54:24 PM (5 years ago)

Author:

vboxsync

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

133667

Message:

iprt/win: Fixed method for determining firmware type on win 8.0 and earlier,

Location:

trunk/src/VBox/Runtime

Files:

• r3/win/RTSystemFirmware-win.cpp (modified) (4 diffs)
• testcase/tstRTSystemQueryFirmware.cpp (modified) (2 diffs)

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

@@ -67 +67 @@
 /** Defines the UEFI Globals UUID. */
 #define VBOX_UEFI_UUID_GLOBALS L"{8BE4DF61-93CA-11D2-AA0D-00E098032B8C}"
-/** Defines an UEFI dummy UUID. */
+/** Defines an UEFI dummy UUID, see MSDN docs of the API. */
 #define VBOX_UEFI_UUID_DUMMY   L"{00000000-0000-0000-0000-000000000000}"
 
@@ -158 +158 @@
         rtSystemFirmwareGetPrivileges(SE_SYSTEM_ENVIRONMENT_NAME);
 
-        uint8_t fEnabled = 0; /** @todo This type doesn't make sense to bird. */
-        DWORD cbRet = g_pfnGetFirmwareEnvironmentVariableW(L"", VBOX_UEFI_UUID_GLOBALS, &fEnabled, sizeof(fEnabled));
-        if (cbRet)
-        {
-            Assert(cbRet == sizeof(fEnabled));
-            *penmFirmwareType = fEnabled ? RTSYSFWTYPE_UEFI : RTSYSFWTYPE_BIOS;
-            rc = VINF_SUCCESS;
-        }
-        else
-        {
-            DWORD dwErr = GetLastError();
-            if (dwErr == ERROR_INVALID_FUNCTION)
-            {
-                *penmFirmwareType = RTSYSFWTYPE_BIOS;
-                rc = VINF_SUCCESS;
-            }
-            else
-                rc = RTErrConvertFromWin32(dwErr);
-        }
+        /* On a non-UEFI system (or such a system in legacy boot mode), we will get
+           back ERROR_INVALID_FUNCTION when querying any firmware variable.  While on a
+           UEFI system we'll typically get ERROR_ACCESS_DENIED or similar as the dummy
+           is a non-exising dummy namespace.  See the API docs. */
+        SetLastError(0);
+        uint8_t abWhatever[64];
+        DWORD cbRet = g_pfnGetFirmwareEnvironmentVariableW(L"", VBOX_UEFI_UUID_DUMMY, abWhatever, sizeof(abWhatever));
+        DWORD dwErr = GetLastError();
+        *penmFirmwareType = cbRet != 0 || dwErr != ERROR_INVALID_FUNCTION ? RTSYSFWTYPE_UEFI : RTSYSFWTYPE_BIOS;
+        rc = VINF_SUCCESS;
     }
     return rc;
@@ -199 +190 @@
     {
         case RTSYSFWPROP_SECURE_BOOT:
-        {
             pwszName = L"SecureBoot";
             pValue->enmType = RTSYSFWVALUETYPE_BOOLEAN;
             break;
-        }
 
         default:
@@ -210 +199 @@
     }
 
+    /*
+     * Do type specific query.
+     */
     if (!g_pfnGetFirmwareEnvironmentVariableW)
         return VERR_NOT_SUPPORTED;

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

@@ -45 +45 @@
     RTTestBanner(hTest);
 
+    /*
+     * RTSystemFirmwareQueryType
+     */
     RTTestSub(hTest, "RTSystemFirmwareQueryType");
-    RTSYSFWTYPE fwType;
-    int rc = RTSystemFirmwareQueryType(&fwType);
+    RTSYSFWTYPE enmType = (RTSYSFWTYPE)-42;
+    int rc = RTSystemFirmwareQueryType(&enmType);
     if (RT_SUCCESS(rc))
     {
-        switch (fwType)
+        switch (enmType)
         {
             case RTSYSFWTYPE_BIOS:
-                RTTestPrintf(hTest, RTTESTLVL_INFO, "Firmware type: BIOS (Legacy)\n");
+                RTTestPrintf(hTest, RTTESTLVL_INFO, "  Firmware type: BIOS (Legacy)\n");
                 break;
             case RTSYSFWTYPE_UEFI:
-                RTTestPrintf(hTest, RTTESTLVL_INFO, "Firmware type: UEFI\n");
+                RTTestPrintf(hTest, RTTESTLVL_INFO, "  Firmware type: UEFI\n");
                 break;
             case RTSYSFWTYPE_UNKNOWN: /* Do not fail on not-implemented platforms. */
-                RT_FALL_THROUGH();
+                RTTestPrintf(hTest, RTTESTLVL_INFO, "  Firmware type: Unknown\n");
+                break;
             default:
-                RTTestPrintf(hTest, RTTESTLVL_INFO, "Unknown firmware type\n");
+                RTTestFailed(hTest, "RTSystemFirmwareQueryType return invalid type: %d (%#x)", enmType);
                 break;
         }
     }
     else if (rc != VERR_NOT_SUPPORTED)
-        RTTestIFailed("RTSystemFirmwareQueryType failed: %Rrc", rc);
+        RTTestFailed(hTest, "RTSystemFirmwareQueryType failed: %Rrc", rc);
 
+    /*
+     * RTSystemFirmwareQueryValue
+     */
     RTTestSub(hTest, "RTSystemFirmwareQueryValue");
     RTSYSFWVALUE Value;
@@ -74 +81 @@
     {
         RTTEST_CHECK(hTest, Value.enmType == RTSYSFWVALUETYPE_BOOLEAN);
-        RTTestPrintf(hTest, RTTESTLVL_INFO, "Secure Boot enabled: %RTbool\n", Value.u.fVal);
+        RTTestPrintf(hTest, RTTESTLVL_INFO, "  Secure Boot:   %s\n", Value.u.fVal ? "enabled" : "disabled");
+        RTSystemFirmwareFreeValue(&Value);
         RTSystemFirmwareFreeValue(&Value);
     }