Changeset 106867 in vbox for trunk/src/VBox

Timestamp:

Nov 7, 2024 9:15:48 AM (3 months ago)

Author:

vboxsync

Message:

Windows driver installation: Added vboxWinDrvWinErrToStr() to handle Windows error codes we don't handle in IPRT. bugref:10762

File:

• trunk/src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp (modified) (4 diffs)

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

@@ -39 +39 @@
 #include <iprt/cdefs.h>
 #include <iprt/dir.h>
-#include <iprt/err.h>
 #include <iprt/ldr.h>
 #include <iprt/list.h>
@@ -52 +51 @@
 #include "product-generated.h"
 
+#include <VBox/err.h> /* For VERR_PLATFORM_ARCH_NOT_SUPPORTED.*/
 #include <VBox/version.h>
 
@@ -497 +497 @@
 
 /**
+ * Returns a winerr.h error as a string.
+ *
+ * Needded to get at least a minimally meaningful error string back.
+ *
+ * @returns Error as a string, or NULL if not found.
+ * @param   dwErr               Error code to return as a string.
+ */
+DECLINLINE(const char *) vboxWinDrvWinErrToStr(const DWORD dwErr)
+{
+    switch (dwErr)
+    {
+
+        RT_CASE_RET_STR(ERROR_BADKEY                            );
+        default:
+            break;
+    }
+
+    return NULL;
+}
+
+/**
  * Logs the last Windows error given via GetLastError().
  *
@@ -524 +545 @@
     /* Try resolving Setup API errors first (we don't handle those in IPRT). */
     const char *pszErr = vboxWinDrvSetupApiErrToStr(dwErr);
+    if (!pszErr) /* Also ask for special winerr.h codes we don't handle in IPRT. */
+        pszErr = vboxWinDrvWinErrToStr(dwErr);
     if (!pszErr)
         rc = RTErrConvertFromWin32(dwErr);