Changeset 74219 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk

Files:

• include/VBox/ExtPack/ExtPack.h (modified) (1 diff)
• src/VBox/Main/include/ExtPackManagerImpl.h (modified) (1 diff)
• src/VBox/Main/src-all/ExtPackManagerImpl.cpp (modified) (2 diffs)

trunk/include/VBox/ExtPack/ExtPack.h

@@ -259 +259 @@
 
     /**
+     * Waits until the other task is completed (including all sub-operations)
+     * and forward all changes from the other progress to this progress. This
+     * means sub-operation number, description, percent and so on.
+     *
+     * The caller is responsible for having at least the same count of
+     * sub-operations in this progress object as there are in the other
+     * progress object.
+     *
+     * If the other progress object supports cancel and this object gets any
+     * cancel request (when here enabled as well), it will be forwarded to
+     * the other progress object.
+     *
+     * Error information is automatically preserved (by transferring it to
+     * the current thread's error information). If the caller wants to set it
+     * as the completion state of this progress it needs to be done separately.
+     *
+     * @returns COM status code.
+     * @param   pHlp            Pointer to this helper structure.
+     * @param   pProgress       Pointer to the IProgress object reference returned
+     *                          by pfnCreateProgress.
+     * @param   pProgressOther  Pointer to an IProgress object reference, the one
+     *                          to be waited for.
+     */
+    DECLR3CALLBACKMEMBER(uint32_t, pfnWaitOtherProgress,(PCVBOXEXTPACKHLP pHlp, VBOXEXTPACK_IF_CS(IProgress) *pProgress,
+                                                         VBOXEXTPACK_IF_CS(IProgress) *pProgressOther));
+
+    /**
      * Marks the whole task as complete and sets the result code.
      *

trunk/src/VBox/Main/include/ExtPackManagerImpl.h

@@ -162 +162 @@
                                                              const char *pcszNextOperationDescription,
                                                              uint32_t uNextOperationWeight);
+    static DECLCALLBACK(uint32_t) i_hlpWaitOtherProgress(PCVBOXEXTPACKHLP pHlp, VBOXEXTPACK_IF_CS(IProgress) *pProgress,
+                                                         VBOXEXTPACK_IF_CS(IProgress) *pProgressOther);
     static DECLCALLBACK(uint32_t) i_hlpCompleteProgress(PCVBOXEXTPACKHLP pHlp, VBOXEXTPACK_IF_CS(IProgress) *pProgress,
                                                         uint32_t uResultCode);

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