Changeset 77038 in vbox for trunk/src/VBox

Timestamp:

Jan 30, 2019 11:16:17 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128481

Message:

Guest Control/Main: Fixed the number of operations when copying from guest to the host (better fix, with debug assertion).

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -177 +177 @@
         && !fCompleted)
     {
+#ifdef VBOX_STRICT
+        ULONG uCurOp; mProgress->COMGETTER(Operation(&uCurOp));
+        ULONG cOps;   mProgress->COMGETTER(OperationCount(&cOps));
+        AssertMsg(uCurOp + 1 /* Zero-based */ == cOps, ("Not all operations done yet (%u/%u)\n", uCurOp + 1, cOps));
+#endif
         HRESULT hr = mProgress->i_notifyComplete(S_OK);
         if (FAILED(hr))
@@ -1473 +1478 @@
         Utf8Str strFirstOp = mDest + mVecLists[0]->mVecEntries[0]->strPath;
         hr = pProgress->init(static_cast<IGuestSession*>(mSession), Bstr(mDesc).raw(),
-                             TRUE /* aCancelable */, cOperations /* Number of operations */, Bstr(strFirstOp).raw());
+                             TRUE /* aCancelable */, cOperations + 1 /* Number of operations */, Bstr(strFirstOp).raw());
     }
     else /* If no operations have been defined, go with an "empty" progress object when will be used for error handling. */
@@ -1536 +1541 @@
                     strDstAbs.findReplace('\\', '/');
             }
+
+            mProgress->SetNextOperation(Bstr(strSrcAbs).raw(), 1);
 
             switch (pEntry->fMode & RTFS_TYPE_MASK)
@@ -1577 +1584 @@
                 break;
 
-            mProgress->SetNextOperation(Bstr(strSrcAbs).raw(), 1);
-
             ++itEntry;
         }
@@ -1725 +1730 @@
         Assert(mVecLists[0]->mVecEntries.size());
 
-        Utf8Str strFirstOp = mDest + mVecLists[0]->mVecEntries[0]->strPath;
-
         hr = pProgress->init(static_cast<IGuestSession*>(mSession), Bstr(mDesc).raw(),
-                             TRUE /* aCancelable */, cOperations /* Number of operations */,
-                             Bstr(strFirstOp).raw());
+                             TRUE /* aCancelable */, cOperations + 1 /* Number of operations */,
+                             Bstr(mDesc).raw());
     }
     else /* If no operations have been defined, go with an "empty" progress object when will be used for error handling. */
@@ -1801 +1804 @@
                 strDstAbs += pEntry->strPath;
             }
+
+            mProgress->SetNextOperation(Bstr(strSrcAbs).raw(), 1);
 
             switch (pEntry->fMode & RTFS_TYPE_MASK)
@@ -1840 +1845 @@
             if (RT_FAILURE(rc))
                 break;
-
-            mProgress->SetNextOperation(Bstr(strSrcAbs).raw(), 1);
 
             ++itEntry;