Changeset 18121 in vbox for trunk/src/VBox/Main/HardDiskImpl.cpp

Timestamp:

Mar 20, 2009 2:46:09 PM (16 years ago)

Author:

vboxsync

Message:

Main/HardDisk: enable cancelling for all operations which take really long (creating, merging, cloning, ...) - everything except deleting.

File:

• trunk/src/VBox/Main/HardDiskImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -1327 +1327 @@
           ? BstrFmt (tr ("Creating fixed hard disk storage unit '%ls'"), m.locationFull.raw())
           : BstrFmt (tr ("Creating dynamic hard disk storage unit '%ls'"), m.locationFull.raw()),
-        FALSE /* aCancelable */);
+        TRUE /* aCancelable */);
     CheckComRCReturnRC (rc);
 
@@ -1457 +1457 @@
             BstrFmt (tr ("Creating clone hard disk '%ls'"),
                      target->m.locationFull.raw()),
-            FALSE /* aCancelable */);
+            TRUE /* aCancelable */);
         CheckComRCThrowRC (rc);
 
@@ -1545 +1545 @@
             BstrFmt (tr ("Creating flattened clone hard disk '%ls'"),
                      target->m.locationFull.raw()),
-            FALSE /* aCancelable */);
+            TRUE /* aCancelable */);
         CheckComRCThrowRC (rc);
 
@@ -2459 +2459 @@
                 BstrFmt (tr ("Creating differencing hard disk storage unit '%ls'"),
                          aTarget->m.locationFull.raw()),
-                FALSE /* aCancelable */);
+                TRUE /* aCancelable */);
             CheckComRCReturnRC (rc);
         }
@@ -2705 +2705 @@
                 BstrFmt (tr ("Merging hard disk '%s' to '%s'"),
                          name().raw(), aChain->target()->name().raw()),
-                FALSE /* aCancelable */);
+                TRUE /* aCancelable */);
             CheckComRCReturnRC (rc);
         }
@@ -3435 +3435 @@
         /* update the progress object, capping it at 99% as the final percent
          * is used for additional operations like setting the UUIDs and similar. */
-        that->mm.vdProgress->notifyProgress (RT_MIN (uPercent, 99));
+        HRESULT rc = that->mm.vdProgress->notifyProgress (uPercent * 99 / 100);
+        if (FAILED(rc))
+        {
+            if (rc == E_FAIL)
+                return VERR_CANCELLED;
+            else
+                return VERR_INVALID_STATE;
+        }
     }