Changeset 35261 in vbox

Timestamp:

Dec 20, 2010 5:44:59 PM (14 years ago)

Author:

vboxsync

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

69109

Message:

Main+Frontends: fix windows burns

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (1 diff)
• Main/MediumImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -998 +998 @@
         hardDisk->COMGETTER(Format)(format.asOutParam());
         RTPrintf("Storage format:       %lS\n", format.raw());
-        MediumVariant_T variant;
+        ULONG variant;
         hardDisk->COMGETTER(Variant)(&variant);
         const char *variantStr = "unknown";

trunk/src/VBox/Main/MediumImpl.cpp

@@ -2438 +2438 @@
         /* setup task object to carry out the operation asynchronously */
         pTask = new Medium::CreateBaseTask(this, pProgress, aLogicalSize,
-                                           aVariant);
+                                           (MediumVariant_T)aVariant);
         rc = pTask->rc();
         AssertComRC(rc);
@@ -2523 +2523 @@
     ComObjPtr <Progress> pProgress;
 
-    rc = createDiffStorage(diff, aVariant, pMediumLockList, &pProgress,
-                           false /* aWait */, NULL /* pfNeedsGlobalSaveSettings*/);
+    rc = createDiffStorage(diff, (MediumVariant_T)aVariant, pMediumLockList,
+                           &pProgress, false /* aWait */,
+                           NULL /* pfNeedsGlobalSaveSettings*/);
     if (FAILED(rc))
         delete pMediumLockList;
@@ -2657 +2658 @@
 
         /* setup task object to carry out the operation asynchronously */
-        pTask = new Medium::CloneTask(this, pProgress, pTarget, aVariant,
+        pTask = new Medium::CloneTask(this, pProgress, pTarget,
+                                      (MediumVariant_T)aVariant,
                                       pParent, pSourceMediumLockList,
                                       pTargetMediumLockList);