Changeset 81499 in vbox for trunk/src/VBox

Timestamp:

Oct 23, 2019 8:51:33 PM (5 years ago)

Author:

vboxsync

Message:

IPRT/win: RTSystemQueryFirmwareBoolean should return success on ERROR_ENVVAR_NOT_FOUND.

File:

• trunk/src/VBox/Runtime/r3/win/RTSystemFirmware-win.cpp (modified) (1 diff)

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

@@ -202 +202 @@
     DWORD cbRet = g_pfnGetFirmwareEnvironmentVariableW(pwszName, VBOX_UEFI_UUID_GLOBALS, &bValue, sizeof(bValue));
     *pfValue = cbRet != 0 && bValue != 0;
-    return cbRet != 0 || GetLastError() == ERROR_INVALID_FUNCTION ? VINF_SUCCESS : RTErrConvertFromWin32(GetLastError());
-}
-
+    if (cbRet != 0)
+        return VINF_SUCCESS;
+    DWORD dwErr = GetLastError();
+    if (   dwErr == ERROR_INVALID_FUNCTION
+        || dwErr == ERROR_ENVVAR_NOT_FOUND)
+        return VINF_SUCCESS;
+    return RTErrConvertFromWin32(dwErr);
+}
+