Changeset 74219 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Sep 12, 2018 11:40:50 AM (6 years ago)

Author:

vboxsync

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

124997

Message:

Main/ExtPack: Add another extpack helper function related to IProgress objects ( a bit of a hack, skipping the version bump)

File:

• trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (modified) (2 diffs)

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

@@ -753 +753 @@
         /* pfnUpdateProgress    = */ ExtPack::i_hlpUpdateProgress,
         /* pfnNextOperationProgress = */ ExtPack::i_hlpNextOperationProgress,
+        /* pfnWaitOtherProgress = */ ExtPack::i_hlpWaitOtherProgress,
         /* pfnCompleteProgress  = */ ExtPack::i_hlpCompleteProgress,
         /* pfnReserved1         = */ ExtPack::i_hlpReservedN,
@@ -1828 +1829 @@
 
     return pProgress->SetNextOperation(Bstr(pcszNextOperationDescription).raw(), uNextOperationWeight);
+}
+
+/*static*/ DECLCALLBACK(uint32_t)
+ExtPack::i_hlpWaitOtherProgress(PCVBOXEXTPACKHLP pHlp, VBOXEXTPACK_IF_CS(IProgress) *pProgress,
+                                VBOXEXTPACK_IF_CS(IProgress) *pProgressOther)
+{
+    /*
+     * Validate the input and get our bearings.
+     */
+    AssertPtrReturn(pProgress, (uint32_t)E_INVALIDARG);
+    AssertPtrReturn(pProgressOther, (uint32_t)E_INVALIDARG);
+
+    AssertPtrReturn(pHlp, (uint32_t)E_INVALIDARG);
+    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, (uint32_t)E_INVALIDARG);
+
+    Progress *pProgressInt = static_cast<Progress *>(pProgress);
+    return pProgressInt->i_waitForOtherProgressCompletion(pProgressOther);
 }