Changeset 18120 in vbox

Timestamp:

Mar 20, 2009 2:38:43 PM (16 years ago)

Author:

vboxsync

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

44792

Message:

Main/Progress: implement cancelling of activities associated with progress objects

File:

• trunk/src/VBox/Main/ProgressImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -738 +738 @@
             tr ("Operation cannot be canceled"));
 
-/// @todo (dmik): implement operation cancellation!
-//    mCompleted = TRUE;
-//    mCanceled = TRUE;
-//    return S_OK;
-
-    ComAssertMsgFailed (("Not implemented!"));
-    ReturnComNotImplemented();
+    mCanceled = TRUE;
+    return S_OK;
 }
 
@@ -763 +758 @@
     AutoWriteLock alock (this);
 
-    AssertReturn (!mCompleted && !mCanceled, E_FAIL);
     AssertReturn (aPercent >= 0 && aPercent <= 100, E_INVALIDARG);
+
+    if (mCancelable && mCanceled)
+    {
+        Assert(!mCompleted);
+        return E_FAIL;
+    }
+    else
+        AssertReturn (!mCompleted && !mCanceled, E_FAIL);
+
 
     mOperationPercent = aPercent;
@@ -826 +829 @@
 
     AssertReturn (mCompleted == FALSE, E_FAIL);
+
+    if (mCanceled && SUCCEEDED(aResultCode))
+        aResultCode = E_FAIL;
 
     mCompleted = TRUE;
@@ -938 +944 @@
     AutoWriteLock alock (this);
 
+    AssertReturn (mCompleted == FALSE, E_FAIL);
+
+    if (mCanceled && SUCCEEDED(aResultCode))
+        aResultCode = E_FAIL;
+
     mCompleted = TRUE;
     mResultCode = aResultCode;
@@ -1417 +1428 @@
         return setError (E_FAIL, tr ("Operation cannot be cancelled"));
 
-/// @todo (dmik): implement operation cancellation!
-//    mCompleted = TRUE;
-//    mCanceled = TRUE;
-//    return S_OK;
-
-    ComAssertMsgFailed (("Not implemented!"));
-    ReturnComNotImplemented();
+    mCanceled = TRUE;
+    return S_OK;
 }