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

Timestamp:

Sep 5, 2013 9:41:48 AM (11 years ago)

Author:

vboxsync

Message:

Main: fixed a few %Rrc <--> COM error code mismatches

Location:

trunk/src/VBox/Main

Files:

• src-all/EventImpl.cpp (modified) (4 diffs)
• src-server/MachineImpl.cpp (modified) (6 diffs)

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

@@ -1359 +1359 @@
 
     HRESULT rc = listener.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create wrapper object (%Rrc)", rc),
+    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create wrapper object (%Rhrc)", rc),
                     E_FAIL);
     listener.queryInterfaceTo(aListener);
@@ -1377 +1377 @@
 
     HRESULT rc = agg.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create aggregator (%Rrc)", rc),
+    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create aggregator (%Rhrc)", rc),
                     E_FAIL);
 
@@ -1397 +1397 @@
 
     rc = mSource.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create source (%Rrc)", rc),
+    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create source (%Rhrc)", rc),
                     E_FAIL);
     rc = mSource->init((IEventSource*)this);
-    ComAssertMsgRet(SUCCEEDED(rc), ("Could not init source (%Rrc)", rc),
+    ComAssertMsgRet(SUCCEEDED(rc), ("Could not init source (%Rhrc)", rc),
                     E_FAIL);
 
@@ -1537 +1537 @@
 
     HRESULT rc = proxy.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create proxy (%Rrc)", rc),
+    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create proxy (%Rhrc)", rc),
                     E_FAIL);
 

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

@@ -3601 +3601 @@
             // the failure may occur w/o any error info (from RPC), so provide one
             return setError(VBOX_E_VM_ERROR,
-                            tr("Failed to get a console object from the direct session (%Rrc)"), rc);
+                            tr("Failed to get a console object from the direct session (%Rhrc)"), rc);
 
         ComAssertRet(!pConsoleW.isNull(), E_FAIL);
@@ -3613 +3613 @@
             // the failure may occur w/o any error info (from RPC), so provide one
             return setError(VBOX_E_VM_ERROR,
-                            tr("Failed to assign the machine to the session (%Rrc)"), rc);
+                            tr("Failed to assign the machine to the session (%Rhrc)"), rc);
         alock.acquire();
 
@@ -3714 +3714 @@
             if (FAILED(rc))
                 setError(VBOX_E_VM_ERROR,
-                         tr("Failed to assign the machine to the session (%Rrc)"), rc);
+                         tr("Failed to assign the machine to the session (%Rhrc)"), rc);
 
             if (    SUCCEEDED(rc)
@@ -3747 +3747 @@
                     if (FAILED(rc))
                         setError(VBOX_E_VM_ERROR,
-                                 tr("Failed to assign the machine to the remote session (%Rrc)"), rc);
+                                 tr("Failed to assign the machine to the remote session (%Rhrc)"), rc);
                 }
 
@@ -8119 +8119 @@
         /* The failure may occur w/o any error info (from RPC), so provide one */
         return setError(VBOX_E_VM_ERROR,
-                        tr("Failed to assign the machine to the session (%Rrc)"), rc);
+                        tr("Failed to assign the machine to the session (%Rhrc)"), rc);
     }
 
@@ -8259 +8259 @@
             rc = setError(E_FAIL,
                           tr("The virtual machine '%s' has terminated unexpectedly during startup (%Rrc)"),
-                          getName().c_str(), rc);
+                          getName().c_str(), vrc);
     }