Changeset 33839 in vbox for trunk/src

Timestamp:

Nov 8, 2010 1:41:37 PM (14 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: Fix error checking where important, the rest is caught by variable initialisation. Also run the event queue from time to time, cannot hurt.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (9 diffs)

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

@@ -69 +69 @@
 }
 
-
 /**
- * Print out progress on the console
+ * Print out progress on the console.
+ *
+ * This runs the main event queue every now and then to prevent piling up
+ * unhandled things (which doesn't cause real problems, just makes things
+ * react a little slower than in the ideal case).
  */
 HRESULT showProgress(ComPtr<IProgress> progress)
@@ -77 +80 @@
     using namespace com;
 
-    BOOL fCompleted;
-    ULONG ulCurrentPercent;
+    BOOL fCompleted = FALSE;
+    ULONG ulCurrentPercent = 0;
     ULONG ulLastPercent = 0;
 
-    ULONG ulCurrentOperationPercent;
     ULONG ulLastOperationPercent = (ULONG)-1;
 
@@ -87 +89 @@
     Bstr bstrOperationDescription;
 
-    ULONG cOperations;
-    progress->COMGETTER(OperationCount)(&cOperations);
+    EventQueue::getMainEventQueue()->processEventQueue(0);
+
+    ULONG cOperations = 1;
+    HRESULT hrc = progress->COMGETTER(OperationCount)(&cOperations);
+    if (FAILED(hrc))
+    {
+        RTStrmPrintf(g_pStdErr, "Progress object failure: %Rhrc\n", hrc);
+        RTStrmFlush(g_pStdErr);
+        return hrc;
+    }
 
     if (!g_fDetailedProgress)
@@ -99 +109 @@
     bool fCanceledAlready = false;
     BOOL fCancelable;
-    HRESULT hrc = progress->COMGETTER(Cancelable)(&fCancelable);
+    hrc = progress->COMGETTER(Cancelable)(&fCancelable);
     if (FAILED(hrc))
         fCancelable = FALSE;
@@ -110 +120 @@
     }
 
-    while (SUCCEEDED(progress->COMGETTER(Completed(&fCompleted))))
-    {
-        ULONG ulOperation;
-        progress->COMGETTER(Operation)(&ulOperation);
-
+    hrc = progress->COMGETTER(Completed(&fCompleted));
+    while (SUCCEEDED(hrc))
+    {
         progress->COMGETTER(Percent(&ulCurrentPercent));
-        progress->COMGETTER(OperationPercent(&ulCurrentOperationPercent));
 
         if (g_fDetailedProgress)
         {
+            ULONG ulOperation = 1;
+            hrc = progress->COMGETTER(Operation)(&ulOperation);
+            if (FAILED(hrc))
+                break;
+            ULONG ulCurrentOperationPercent = 0;
+            hrc = progress->COMGETTER(OperationPercent(&ulCurrentOperationPercent));
+            if (FAILED(hrc))
+                break;
+
             if (ulLastOperation != ulOperation)
             {
-                progress->COMGETTER(OperationDescription(bstrOperationDescription.asOutParam()));
+                hrc = progress->COMGETTER(OperationDescription(bstrOperationDescription.asOutParam()));
+                if (FAILED(hrc))
+                    break;
                 ulLastPercent = (ULONG)-1;        // force print
                 ulLastOperation = ulOperation;
@@ -131 +149 @@
                )
             {
-                LONG lSecsRem;
+                LONG lSecsRem = 0;
                 progress->COMGETTER(TimeRemaining)(&lSecsRem);
 
@@ -171 +189 @@
         /* make sure the loop is not too tight */
         progress->WaitForCompletion(100);
+
+        EventQueue::getMainEventQueue()->processEventQueue(0);
+        hrc = progress->COMGETTER(Completed(&fCompleted));
     }
 
@@ -184 +205 @@
     /* complete the line. */
     LONG iRc = E_FAIL;
-    if (SUCCEEDED(progress->COMGETTER(ResultCode)(&iRc)))
+    hrc = progress->COMGETTER(ResultCode)(&iRc);
+    if (SUCCEEDED(hrc))
     {
         if (SUCCEEDED(iRc))
@@ -191 +213 @@
             RTStrmPrintf(g_pStdErr, "CANCELED\n");
         else
-            RTStrmPrintf(g_pStdErr, "FAILED\n");
+        {
+            if (!g_fDetailedProgress)
+                RTStrmPrintf(g_pStdErr, "\n");
+            RTStrmPrintf(g_pStdErr, "Progress state: %Rhrc\n", iRc);
+        }
+        hrc = iRc;
     }
     else
-        RTStrmPrintf(g_pStdErr, "\n");
+    {
+        if (!g_fDetailedProgress)
+            RTStrmPrintf(g_pStdErr, "\n");
+        RTStrmPrintf(g_pStdErr, "Progress object failure: %Rhrc\n", hrc);
+    }
     RTStrmFlush(g_pStdErr);
-    return iRc;
+    return hrc;
 }