Changeset 107057 in vbox for trunk/src/VBox/GuestHost/installation/VBoxWinDrvCommon.cpp

Timestamp:

Nov 20, 2024 11:37:10 AM (2 months ago)

Author:

vboxsync

Message:

Windows driver installation: Improved VBoxWinDrvInstErrorFromWin32(): All we can do here is to return VERR_INSTALLATION_FAILED if the above calls returned something, as we don't have IPRT equivalents for all those (Windows- / SetupAPI-)specific error codes. bugref:10762

File:

• trunk/src/VBox/GuestHost/installation/VBoxWinDrvCommon.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/installation/VBoxWinDrvCommon.cpp

@@ -661 +661 @@
  * @returns VBox status code.
  * @retval  VERR_UNRESOLVED_ERROR if no translation was possible.
+ * @retval  VERR_INSTALLATION_FAILED if a Setup API or a specific Windows error code occurred not handled
+ *          within IPRT's error resolving function.
  * @param   uNativeCode         Native Windows error code to translate.
  */
 int VBoxWinDrvInstErrorFromWin32(unsigned uNativeCode)
 {
-#ifdef DEBUG_andy
-    bool const fAssertMayPanic = RTAssertMayPanic();
-    RTAssertSetMayPanic(false);
-#endif
-
     const char *pszErr = VBoxWinDrvSetupApiErrToStr(uNativeCode);
     if (!pszErr)
-        VBoxWinDrvWinErrToStr(uNativeCode);
-
-    int const rc = RTErrConvertFromWin32(uNativeCode);
-    if (rc == VERR_UNRESOLVED_ERROR)
-        AssertMsgFailed(("Unhandled error %u (%#x): %s\n", uNativeCode, uNativeCode, pszErr ? pszErr : "<Unknown>"));
-
-#ifdef DEBUG_andy
-    RTAssertSetMayPanic(fAssertMayPanic);
-#endif
+        pszErr = VBoxWinDrvWinErrToStr(uNativeCode);
+
+    /* All we can do here is to return VERR_INSTALLATION_FAILED if the above calls returned something,
+     * as we don't have IPRT equivalents for all those (Windows- / SetupAPI-)specific error codes.
+     *
+     * For anything else not (yet) handled we want to get a debug assertion, however. */
+    int rc = VERR_INSTALLATION_FAILED;
+    if (!pszErr)
+    {
+        rc = RTErrConvertFromWin32(uNativeCode);
+        if (rc == VERR_UNRESOLVED_ERROR)
+            AssertMsgFailed(("Unhandled error %u (%#x): %s\n", uNativeCode, uNativeCode, pszErr ? pszErr : "<Unknown>"));
+    }
+
     return rc;
 }