Changeset 30676 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jul 6, 2010 4:36:43 PM (14 years ago)

Author:

vboxsync

Message:

Main: back out r63429

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageGuestCtrl.cpp (modified) (3 diffs)
• VBoxManageImport.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (3 diffs)
• VBoxManageMisc.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -324 +324 @@
                 /* If we got a VBOX_E_IPRT error we handle the error in a more gentle way
                  * because it contains more accurate info about what went wrong. */
-                ErrorInfo info(guest, COM_IIDOF(IGuest));
+                ErrorInfo info(guest);
                 if (info.isFullAvailable())
                 {
                     if (rc == VBOX_E_IPRT_ERROR)
+                    {
                         RTPrintf("%ls.\n", info.getText().raw());
+                    }
                     else
+                    {
                         RTPrintf("ERROR: %ls (%Rhrc).\n", info.getText().raw(), info.getResultCode());
+                    }
                 }
                 break;
@@ -394 +398 @@
                             /* If we got a VBOX_E_IPRT error we handle the error in a more gentle way
                              * because it contains more accurate info about what went wrong. */
-                            ErrorInfo info(guest, COM_IIDOF(IGuest));
+                            ErrorInfo info(guest);
                             if (info.isFullAvailable())
                             {
@@ -489 +493 @@
                         ComPtr<IVirtualBoxErrorInfo> execError;
                         rc = progress->COMGETTER(ErrorInfo)(execError.asOutParam());
-                        com::ErrorInfo info(execError, COM_IIDOF(IVirtualBoxErrorInfo));
+                        com::ErrorInfo info (execError);
                         if (SUCCEEDED(rc) && info.isFullAvailable())
                         {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp

@@ -267 +267 @@
         RTPrintf("Interpreting %ls...\n", path.raw());
         rc = pAppliance->Interpret();
-        com::ErrorInfo info0(pAppliance, COM_IIDOF(IAppliance));
+        com::ErrorInfo info0(pAppliance);
 
         com::SafeArray<BSTR> aWarnings;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -170 +170 @@
                 rc = machine->COMGETTER(AccessError)(accessError.asOutParam());
                 RTPrintf("Access error details:\n");
-                ErrorInfo ei(accessError, COM_IIDOF(IVirtualBoxErrorInfo));
+                ErrorInfo ei(accessError);
                 GluePrintErrorInfo(ei);
                 RTPrintf("\n");
@@ -1291 +1291 @@
             if (FAILED(rc))
             {
-                com::ErrorInfo info(display, COM_IIDOF(IDisplay));
+                com::ErrorInfo info (display);
                 GluePrintErrorInfo(info);
                 return rc;
@@ -1356 +1356 @@
                 if (FAILED(rc))
                 {
-                    com::ErrorInfo info(remoteDisplayInfo, COM_IIDOF(IRemoteDisplayInfo));
+                    com::ErrorInfo info (remoteDisplayInfo);
                     GluePrintErrorInfo(info);
                     return rc;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -387 +387 @@
         if (FAILED(iRc))
         {
-            ComPtr<IVirtualBoxErrorInfo> errorInfo;
+            ComPtr <IVirtualBoxErrorInfo> errorInfo;
             CHECK_ERROR_RET(progress, COMGETTER(ErrorInfo)(errorInfo.asOutParam()), 1);
-            ErrorInfo info(errorInfo, COM_IIDOF(IVirtualBoxErrorInfo));
+            ErrorInfo info (errorInfo);
             com::GluePrintErrorInfo(info);
         }