Changeset 36451 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 28, 2011 7:40:52 PM (14 years ago)

Author:

vboxsync

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

70821

Message:

introduced VirtualBoxBase::clearError to clear the previous error info if MultiResult is used

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxBase.h (modified) (1 diff)
• src-all/VirtualBoxBase.cpp (modified) (1 diff)
• src-server/HostImpl.cpp (modified) (4 diffs)
• src-server/MachineImpl.cpp (modified) (3 diffs)

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

@@ -749 +749 @@
                                     bool aWarning,
                                     bool aLogIt);
+    static void clearError(void);
 
     HRESULT setError(HRESULT aResultCode, const char *pcsz, ...);

trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp

@@ -510 +510 @@
 }
 
+/**
+ * Clear the current error information.
+ */
+/*static*/
+void VirtualBoxBase::clearError(void)
+{
+#if !defined(VBOX_WITH_XPCOM)
+    ::SetErrorInfo (0, NULL);
+#else
+    HRESULT rc = S_OK;
+    nsCOMPtr <nsIExceptionService> es;
+    es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
+    if (NS_SUCCEEDED(rc))
+    {
+        nsCOMPtr <nsIExceptionManager> em;
+        rc = es->GetCurrentExceptionManager (getter_AddRefs (em));
+        if (SUCCEEDED(rc))
+            em->SetCurrentException(NULL);
+    }
+#endif
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 //

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -754 +754 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    MultiResult rc = checkUSBProxyService();
+    HRESULT rc = checkUSBProxyService();
     if (FAILED(rc)) return rc;
 
@@ -781 +781 @@
     AutoMultiWriteLock2 alock(this->lockHandle(), &m->usbListsLock COMMA_LOCKVAL_SRC_POS);
 
-    MultiResult rc = checkUSBProxyService();
+    HRESULT rc = checkUSBProxyService();
     if (FAILED(rc)) return rc;
 
@@ -1196 +1196 @@
     AutoMultiWriteLock2 alock(this->lockHandle(), &m->usbListsLock COMMA_LOCKVAL_SRC_POS);
 
+    clearError();
     MultiResult rc = checkUSBProxyService();
     if (FAILED(rc)) return rc;
@@ -1257 +1258 @@
     AutoMultiWriteLock2 alock(this->lockHandle(), &m->usbListsLock COMMA_LOCKVAL_SRC_POS);
 
+    clearError();
     MultiResult rc = checkUSBProxyService();
     if (FAILED(rc)) return rc;

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -2203 +2203 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    clearError();
     MultiResult rc(S_OK);
 
@@ -10924 +10926 @@
 #ifdef VBOX_WITH_USB
     /* if captureDeviceForVM() fails, it must have set extended error info */
+    clearError();
     MultiResult rc = mParent->host()->checkUSBProxyService();
     if (FAILED(rc)) return rc;
@@ -11981 +11984 @@
     AssertReturn(mData->mSession.mLockedMedia.IsEmpty(), E_FAIL);
 
+    clearError();
     MultiResult mrc(S_OK);