Changeset 11228 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Aug 7, 2008 7:04:53 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt: Added printing the mnemonic error code in addition to the hex number in the error boxes.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxProblemReporter.h

@@ -302 +302 @@
                            const QString &errorMsg);
 
+    static QString formatRC (HRESULT aRC);
+
     static QString formatErrorInfo (const COMErrorInfo &aInfo,
                                     HRESULT aWrapperRC = S_OK);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp

@@ -2003 +2003 @@
 }
 
+/**
+ * Formats the given COM result code as a human-readable string.
+ *
+ * If a mnemonic name for the given result code is found, a string in format
+ * "MNEMONIC_NAME (0x12345678)" is returned where the hex number is the result
+ * code as is. If no mnemonic name is found, then the raw hex number only is
+ * returned (w/o parenthesis).
+ *
+ * @param aRC   COM result code to format.
+ */
+/* static */
+QString VBoxProblemReporter::formatRC (HRESULT aRC)
+{
+    QString str;
+
+    PCRTCOMERRMSG msg = NULL;
+    const char *errMsg = NULL;
+
+    /* first, try as is (only set bit 31 bit for warnings) */
+    if (SUCCEEDED_WARNING (aRC))
+        msg = RTErrCOMGet (aRC | 0x80000000);
+    else
+        msg = RTErrCOMGet (aRC);
+
+    if (msg != NULL)
+        errMsg = msg->pszDefine;
+
+#if defined (Q_WS_WIN)
+
+    PCRTWINERRMSG winMsg = NULL;
+
+    /* if not found, try again using RTErrWinGet with masked off top 16bit */
+    if (msg == NULL)
+    {
+        winMsg = RTErrWinGet (aRC & 0xFFFF);
+
+        if (winMsg != NULL)
+            errMsg = winMsg->pszDefine;
+    }
+
+#endif
+
+    if (errMsg != NULL && *errMsg != '\0')
+        str.sprintf ("%s (0x%08X)", errMsg, aRC);
+    else
+        str.sprintf ("0x%08X", aRC);
+
+    return str;
+}
+
 /* static */
 QString VBoxProblemReporter::formatErrorInfo (const COMErrorInfo &aInfo,
@@ -2035 +2085 @@
         bool haveComponent = true;
         bool haveInterfaceID = true;
-#else // !Q_WS_WIN
+#else /* defined (Q_WS_WIN) */
         haveResultCode = true;
         bool haveComponent = aInfo.isFullAvailable();
@@ -2043 +2093 @@
         if (haveResultCode)
         {
-#if defined (Q_WS_WIN)
-            /* format the error code */
-            PCRTWINERRMSG msg = NULL;
-            /* first, try as is (only set bit 31 bit for warnings) */
-            if (SUCCEEDED_WARNING (aInfo.resultCode()))
-                msg = RTErrWinGet (aInfo.resultCode() | 0x80000000);
-            else
-                msg = RTErrWinGet (aInfo.resultCode());
-            /* try again with masked off top 16bit if not found */
-            if (msg == NULL || !msg->iCode)
-                msg = RTErrWinGet (aInfo.resultCode() & 0xFFFF);
-            if (msg != NULL)
-                formatted += QString ("<tr><td>%1</td><td><tt>%2 (0x%3)</tt></td></tr>")
-                    .arg (tr ("Result&nbsp;Code: ", "error info"))
-                    .arg (msg->pszDefine)
-                    .arg (QString().sprintf ("%08X", uint (aInfo.resultCode())));
-            else
-#endif
-            formatted += QString ("<tr><td>%1</td><td><tt>0x%2</tt></td></tr>")
+            formatted += QString ("<tr><td>%1</td><td><tt>%2</tt></td></tr>")
                 .arg (tr ("Result&nbsp;Code: ", "error info"))
-                .arg (QString().sprintf ("%08X", uint (aInfo.resultCode())));
+                .arg (formatRC (aInfo.resultCode()));
         }
 
@@ -2092 +2124 @@
         (!haveResultCode || aWrapperRC != aInfo.resultCode()))
     {
-#if defined (Q_WS_WIN)
-        /* format the error code */
-        PCRTWINERRMSG msg = NULL;
-        /* first, try as is (only set bit 31 bit for warnings) */
-        if (SUCCEEDED_WARNING (aWrapperRC))
-            msg = RTErrWinGet (aWrapperRC | 0x80000000);
-        else
-            msg = RTErrWinGet (aWrapperRC);
-        /* try again with masked off top 16bit if not found */
-        if (msg == NULL || !msg->iCode)
-            msg = RTErrWinGet (aWrapperRC & 0xFFFF);
-        if (msg != NULL)
-            formatted += QString ("<tr><td>%1</td><td><tt>%2 (0x%3)</tt></td></tr>")
-                .arg (tr ("Callee&nbsp;RC: ", "error info"))
-                .arg (msg->pszDefine)
-                .arg (QString().sprintf ("%08X", uint (aWrapperRC)));
-        else
-#endif
-        formatted += QString ("<tr><td>%1</td><td><tt>0x%2</tt></td></tr>")
+        formatted += QString ("<tr><td>%1</td><td><tt>%2</tt></td></tr>")
             .arg (tr ("Callee&nbsp;RC: ", "error info"))
-            .arg (QString().sprintf ("%08X", uint (aWrapperRC)));
-    }
+            .arg (formatRC (aWrapperRC));
+    }
+
     formatted += "</table>";