Changeset 35517 in vbox

Timestamp:

Jan 13, 2011 10:47:12 AM (14 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage+glue/ErrorInfo: revert change which broke error reporting (4.0.0 regression), clean up on the way

Location:

trunk

Files:

• include/VBox/com/ErrorInfo.h (modified) (1 diff)
• src/VBox/Frontends/VBoxHeadless/testcase/tstHeadless.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)

trunk/include/VBox/com/ErrorInfo.h

@@ -123 +123 @@
         init(pObj, aIID);
     }
+
+    /** Specialization for the IVirtualBoxErrorInfo smart pointer */
+    ErrorInfo (const ComPtr <IVirtualBoxErrorInfo> &aPtr)
+        : mIsBasicAvailable (false), mIsFullAvailable (false)
+        , mResultCode (S_OK)
+        { init (aPtr); }
+
+    /**
+     *  Constructs a new ErrorInfo instance from the IVirtualBoxErrorInfo
+     *  interface pointer. If this pointer is not NULL, both #isFullAvailable()
+     *  and #isBasicAvailable() will return |true|.
+     *
+     *  @param aInfo    pointer to the IVirtualBoxErrorInfo interface that
+     *                  holds error info to be fetched by this instance
+     */
+    ErrorInfo (IVirtualBoxErrorInfo *aInfo)
+        : mIsBasicAvailable (false), mIsFullAvailable (false)
+        , mResultCode (S_OK)
+        { init (aInfo); }
 
     ErrorInfo(const ErrorInfo &x)

trunk/src/VBox/Frontends/VBoxHeadless/testcase/tstHeadless.cpp

@@ -137 +137 @@
             if (FAILED (resultCode))
             {
-                ComPtr<IVirtualBoxErrorInfo> errorInfo;
-                CHECK_ERROR_BREAK(progress,
-                                  COMGETTER(ErrorInfo) (errorInfo.asOutParam()));
-                ErrorInfo info(errorInfo, COM_IIDOF(IVirtualBoxErrorInfo));
+                ProgressErrorInfo info(progress);
                 com::GluePrintErrorInfo(info);
             }

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");

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

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