Changeset 29953 in vbox

Timestamp:

Jun 1, 2010 3:03:06 PM (14 years ago)

Author:

vboxsync

Message:

SessionImpl.cpp: Don't use ComAssertComRC because it's evil - it doesn't work the same way in all builds wrt error info. Also it is not nice to assert here just because some remote VM process died.

File:

• trunk/src/VBox/Main/SessionImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/SessionImpl.cpp

@@ -181 +181 @@
     CHECK_OPEN();
 
-    HRESULT rc = E_FAIL;
-
+    HRESULT rc;
     if (mConsole)
         rc = mConsole->machine().queryInterfaceTo(aMachine);
     else
         rc = mRemoteMachine.queryInterfaceTo(aMachine);
-    ComAssertComRC(rc);
+    if (FAILED(rc))
+    {
+        /** @todo VBox 3.3: replace E_FAIL with rc here. */
+        if (mConsole)
+            setError(E_FAIL, tr("Failed to query the session machine (%Rhrc)"), rc);
+        else if (FAILED_DEAD_INTERFACE(rc))
+            setError(E_FAIL, tr("Peer process crashed"));
+        else
+            setError(E_FAIL, tr("Failed to query the remote session machine (%Rhrc)"), rc);
+    }
 
     return rc;
@@ -203 +211 @@
     CHECK_OPEN();
 
-    HRESULT rc = E_FAIL;
-
+    HRESULT rc;
     if (mConsole)
         rc = mConsole.queryInterfaceTo(aConsole);
     else
         rc = mRemoteConsole.queryInterfaceTo(aConsole);
-    ComAssertComRC(rc);
+    if (FAILED(rc))
+    {
+        /** @todo VBox 3.3: replace E_FAIL with rc here. */
+        if (mConsole)
+            setError(E_FAIL, tr("Failed to query the console (%Rhrc)"), rc);
+        else if (FAILED_DEAD_INTERFACE(rc))
+            setError(E_FAIL, tr("Peer process crashed"));
+        else
+            setError(E_FAIL, tr("Failed to query the remote console (%Rhrc)"), rc);
+    }
 
     return rc;