Changeset 30716 in vbox

Timestamp:

Jul 7, 2010 4:40:45 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

63481

Message:

release build fixes

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• ConsoleImpl.cpp (modified) (2 diffs)
• VFSExplorerImpl.cpp (modified) (1 diff)
• include/ApplianceImpl.h (modified) (1 diff)
• include/VFSExplorerImpl.h (modified) (1 diff)
• include/VirtualBoxBase.h (modified) (2 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -906 +906 @@
                              "Appliance::Task");
 
-    ComAssertMsgRCRet(vrc,
-                      ("Could not create OVF task thread (%Rrc)\n", vrc), E_FAIL);
+    if (RT_FAILURE(vrc))
+        return Appliance::setErrorStatic(E_FAIL,
+                                         Utf8StrFmt("Could not create OVF task thread (%Rrc)\n", vrc));
 
     return S_OK;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -6760 +6760 @@
 
     HRESULT hrc2 = (**aIt)->COMGETTER(Remote)(&fRemote);
-    ComAssertComRC(hrc2);
+    if (FAILED(hrc2))
+        setErrorStatic(hrc2, "GetRemote() failed");
 
     if (fRemote)
@@ -7902 +7903 @@
          * (i.e. creating a snapshot online)
          */
-        ComAssertThrow(    (!pTask->bstrSavedStateFile.isEmpty() &&  pTask->fTakingSnapshotOnline)
-                        || ( pTask->bstrSavedStateFile.isEmpty() && !pTask->fTakingSnapshotOnline),
-                       rc = E_FAIL);
+        bool f =     (!pTask->bstrSavedStateFile.isEmpty() &&  pTask->fTakingSnapshotOnline)
+                  || ( pTask->bstrSavedStateFile.isEmpty() && !pTask->fTakingSnapshotOnline);
+        if (!f)
+            throw setErrorStatic(E_FAIL, "Invalid state of saved state file");
 
         /* sync the state with the server */

trunk/src/VBox/Main/VFSExplorerImpl.cpp

@@ -196 +196 @@
                              "Explorer::Task");
 
-    ComAssertMsgRCRet(vrc,
-                      ("Could not create taskThreadVFS (%Rrc)\n", vrc), E_FAIL);
+    if (RT_FAILURE(vrc))
+        return VFSExplorer::setErrorStatic(E_FAIL, Utf8StrFmt("Could not create taskThreadVFS (%Rrc)\n", vrc));
 
     return vrc;

trunk/src/VBox/Main/include/ApplianceImpl.h

@@ -98 +98 @@
 
     /* public methods only for internal purposes */
+
+    static HRESULT setErrorStatic(HRESULT aResultCode,
+                                  const Utf8Str &aText)
+    {
+        return setErrorInternal(aResultCode, getStaticClassIID(), getStaticComponentName(), aText, false, true);
+    }
 
     /* private instance data */

trunk/src/VBox/Main/include/VFSExplorerImpl.h

@@ -65 +65 @@
     STDMETHOD(Remove)(ComSafeArrayIn(IN_BSTR, aNames), IProgress **aProgress);
 
+    /* public methods only for internal purposes */
+
+    static HRESULT setErrorStatic(HRESULT aResultCode,
+                                  const Utf8Str &aText)
+    {
+        return setErrorInternal(aResultCode, getStaticClassIID(), getStaticComponentName(), aText, false, true);
+    }
+
 private:
     /* Private member vars */

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -157 +157 @@
     do { \
         if (RT_UNLIKELY(!(expr))) \
-            setErrorInternal(E_FAIL, \
-                             getStaticClassIID(), \
-                             getStaticComponentName(), \
-                             Utf8StrFmt("Assertion failed: [%s] at '%s' (%d) in %s.\nPlease contact the product vendor!", \
-                                        #expr, __FILE__, __LINE__, __PRETTY_FUNCTION__), \
-                             false, true); \
+            setError(E_FAIL, \
+                     "Assertion failed: [%s] at '%s' (%d) in %s.\nPlease contact the product vendor!", \
+                     #expr, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
     } while (0)
 #endif
@@ -181 +178 @@
     do { \
         if (RT_UNLIKELY(!(expr))) \
-            setErrorInternal(E_FAIL, \
-                             getStaticClassIID(), \
-                             getStaticComponentName(), \
-                             Utf8StrFmt("Assertion failed: [%s] at '%s' (%d) in %s.\n%s.\nPlease contact the product vendor!", \
-                                        #expr, __FILE__, __LINE__, __PRETTY_FUNCTION__), \
-                             false, true); \
+            setError(E_FAIL, \
+                     "Assertion failed: [%s] at '%s' (%d) in %s.\n%s.\nPlease contact the product vendor!", \
+                     #expr, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
     } while (0)
 #endif