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

Timestamp:

Oct 6, 2017 12:49:53 PM (7 years ago)

Author:

vboxsync

Message:

bugref:8674. Added 2 new events into the Progress - "percentage changed" and "task completed".

File:

• trunk/src/VBox/Main/src-all/ProgressImpl.cpp (modified) (7 diffs)

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

@@ -42 +42 @@
 #include "AutoCaller.h"
 
+#include "VBoxEvents.h"
 
 Progress::Progress()
@@ -168 +169 @@
 
     HRESULT rc = S_OK;
+    rc = unconst(pEventSource).createObject();
+    if (FAILED(rc)) throw rc;
+
+    rc = pEventSource->init();
+    if (FAILED(rc)) throw rc;
 
 //    rc = Progress::init(
@@ -475 +481 @@
         RTSemEventMultiSignal(mCompletedSem);
 
+    fireProgressTaskCompletedEvent(pEventSource, mId.toUtf16().raw());
+
     return S_OK;
 }
@@ -563 +571 @@
             vrc = VERR_CANCELLED;
         }
+        ULONG actualPercent = 0;
+        pThis->getPercent(&actualPercent);
+        fireProgressPercentageChangedEvent(pThis->pEventSource, pThis->mId.toUtf16().raw(), actualPercent);
     }
     /* else ignored */
@@ -813 +824 @@
     m_ulOperationPercent = aPercent;
 
+    ULONG actualPercent = 0;
+    getPercent(&actualPercent);
+    fireProgressPercentageChangedEvent(pEventSource, mId.toUtf16().raw(), actualPercent);
+
     return S_OK;
 }
@@ -847 +862 @@
     if (mWaitersCount > 0)
         RTSemEventMultiSignal(mCompletedSem);
+
+    ULONG actualPercent = 0;
+    getPercent(&actualPercent);
+    fireProgressPercentageChangedEvent(pEventSource, mId.toUtf16().raw(), actualPercent);
 
     return S_OK;
@@ -1075 +1094 @@
 }
 
+HRESULT Progress::getEventSource(ComPtr<IEventSource> &aEventSource)
+{
+    /* event source is const, no need to lock */
+    pEventSource.queryInterfaceTo(aEventSource.asOutParam());
+    return S_OK;
+}
 
 // private internal helpers