Changeset 53330 in vbox for trunk

Timestamp:

Nov 14, 2014 2:27:45 PM (10 years ago)

Author:

vboxsync

Message:

ConsoleImpl2.cpp: Replaced VERR_GENERAL_FAILURE with more specific status codes and associated Assert* with AssertLogRel*.

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (11 diffs)

trunk/include/VBox/err.h

@@ -2597 +2597 @@
 /** @} */
 
+/** @name Main API Status Codes
+ * @{
+ */
+/** The configuration constructor in main failed due to a COM error.  Check
+ * the release log of the VM for further details. */
+#define VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR      (-6400)
+/** The configuration constructor in main failed due to an internal consistency
+ *  error. Consult the release log of the VM for further details. */
+#define VERR_MAIN_CONFIG_CONSTRUCTOR_IPE            (-6401)
+/** @} */
+
 
 /* SED-END */

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -529 +529 @@
     HRESULT             hrc;
 #define MAX_DEVICES     30
-#define H()     AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE)
+#define H()     AssertLogRelMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR)
 
     LONG lPortLUN[MAX_BIOS_LUN_COUNT];
@@ -785 +785 @@
     LogFlowFuncEnter();
 
-    AssertReturn(pvConsole, VERR_GENERAL_FAILURE);
+    AssertReturn(pvConsole, VERR_INVALID_POINTER);
     ComObjPtr<Console> pConsole = static_cast<Console *>(pvConsole);
 
@@ -839 +839 @@
     Bstr            bstr;
 
-#define H()         AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE)
+#define H()         AssertLogRelMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR)
 
     /*
@@ -2206 +2206 @@
 
                 default:
-                    AssertMsgFailedReturn(("invalid storage controller type: %d\n", enmCtrlType), VERR_GENERAL_FAILURE);
+                    AssertLogRelMsgFailedReturn(("invalid storage controller type: %d\n", enmCtrlType), VERR_MAIN_CONFIG_CONSTRUCTOR_IPE);
             }
 
@@ -3068 +3068 @@
     catch (HRESULT hrcXcpt)
     {
-        AssertMsgFailedReturn(("hrc=%Rhrc\n", hrcXcpt), VERR_GENERAL_FAILURE);
+        AssertLogRelMsgFailedReturn(("hrc=%Rhrc\n", hrcXcpt), VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR);
     }
 
@@ -3375 +3375 @@
         const char *pcszDevice = "vga";
 
-#define H()         AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE)
+#define H()         AssertLogRelMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR)
         InsertConfigNode(pDevices, pcszDevice, &pDev);
         InsertConfigNode(pDev,     "0", &pInst);
@@ -3557 +3557 @@
 
 // #define RC_CHECK()  AssertMsgReturn(RT_SUCCESS(rc), ("rc=%Rrc\n", rc), rc)
-#define H()         AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE)
+#define H()         AssertLogRelMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR)
 
         LONG lDev;
@@ -4367 +4367 @@
         Bstr bstr;
 
-#define H()         AssertMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE)
+#define H()         AssertLogRelMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR)
 
         /*
@@ -5508 +5508 @@
 {
 #ifdef VBOX_WITH_GUEST_PROPS
-    AssertReturn(pvConsole, VERR_GENERAL_FAILURE);
+    AssertReturn(pvConsole, VERR_INVALID_POINTER);
     ComObjPtr<Console> pConsole = static_cast<Console *>(pvConsole);
-    AssertReturn(pConsole->m_pVMMDev, VERR_GENERAL_FAILURE);
+    AssertReturn(pConsole->m_pVMMDev, VERR_INVALID_POINTER);
 
     /* Load the service */
@@ -5561 +5561 @@
                                                       ComSafeArrayAsOutParam(timestampsOut),
                                                       ComSafeArrayAsOutParam(flagsOut));
-        AssertMsgReturn(SUCCEEDED(hrc), ("hrc=%Rhrc\n", hrc), VERR_GENERAL_FAILURE);
+        AssertLogRelMsgReturn(SUCCEEDED(hrc), ("hrc=%Rhrc\n", hrc), VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR);
         size_t cProps = namesOut.size();
         size_t cAlloc = cProps + 1;
@@ -5665 +5665 @@
 {
 #ifdef VBOX_WITH_GUEST_CONTROL
-    AssertReturn(pvConsole, VERR_GENERAL_FAILURE);
+    AssertReturn(pvConsole, VERR_INVALID_POINTER);
     ComObjPtr<Console> pConsole = static_cast<Console *>(pvConsole);