Changeset 67242 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 2, 2017 3:09:35 PM (8 years ago)

Author:

vboxsync

Message:

Main/ProgresImpl: Added a callback method for VD as well (i_vdProgressCallback). Identical to the IPRT one, except the parameters are switched around.

Location:

trunk/src/VBox/Main

Files:

• include/ProgressImpl.h (modified) (1 diff)
• src-all/ProgressImpl.cpp (modified) (3 diffs)

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

@@ -141 +141 @@
     bool i_setCancelCallback(void (*pfnCallback)(void *), void *pvUser);
 
-    static DECLCALLBACK(int) i_iprtProgressCallback(unsigned uPrecentage, void *pvUser);
+    static DECLCALLBACK(int) i_iprtProgressCallback(unsigned uPercentage, void *pvUser);
+    static DECLCALLBACK(int) Progress::i_vdProgressCallback(void *pvUser, unsigned uPercentage);
 
 protected:

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

@@ -538 +538 @@
 
 /**
- * @callback_method_impl{FNRTPROGRESS, }
- */
-/*static*/ DECLCALLBACK(int) Progress::i_iprtProgressCallback(unsigned uPrecentage, void *pvUser)
+ * @callback_method_impl{FNRTPROGRESS,
+ *      Works the progress of the current operation.}
+ */
+/*static*/ DECLCALLBACK(int) Progress::i_iprtProgressCallback(unsigned uPercentage, void *pvUser)
 {
     Progress *pThis = (Progress *)pvUser;
@@ -553 +554 @@
         pThis->i_checkForAutomaticTimeout();
         if (!pThis->mCanceled)
-            pThis->m_ulOperationPercent = RT_MIN(uPrecentage, 100);
+        {
+            if (uPercentage > pThis->m_ulOperationPercent)
+                pThis->m_ulOperationPercent = RT_MIN(uPercentage, 100);
+        }
         else
         {
@@ -564 +568 @@
 }
 
+/**
+ * @callback_method_impl{FNVDPROGRESS,
+ *      Progress::i_iprtProgressCallback with parameters switched around.}
+ */
+/*static*/ DECLCALLBACK(int) Progress::i_vdProgressCallback(void *pvUser, unsigned uPercentage)
+{
+    return i_iprtProgressCallback(uPercentage, pvUser);
+}
 
 // IProgress properties