Changeset 21068 in vbox

Timestamp:

Jun 30, 2009 2:06:33 PM (16 years ago)

Author:

vboxsync

Message:

OVF: fix warnings and a wrong parameter possibly leading to bad config

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (3 diffs)
• VFSExplorerImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -3986 +3986 @@
         m->ulWeightPerOperation = 1;
     }
-    ULONG ulOVFCreationWeight = ((double)ulTotalOperationsWeight * 50.0 / 100.0); /* Use 50% for the creation of the OVF & the disks */
+    ULONG ulOVFCreationWeight = (ULONG)((double)ulTotalOperationsWeight * 50.0 / 100.0); /* Use 50% for the creation of the OVF & the disks */
     ulTotalOperationsWeight += ulOVFCreationWeight;
 
@@ -4376 +4376 @@
  * @param aOrigValue Corresponding original value from OVF.
  * @param aAutoValue Initial configuration value (can be overridden by caller with setFinalValues).
+ * @param ulSizeMB Weight for IProgress
  * @param strExtraConfig Extra configuration; meaning dependent on type.
  */
@@ -4808 +4809 @@
                                    strAttachmentType,      // orig
                                    Utf8StrFmt("%RI32", (uint32_t)adapterType),   // conf
+                                   0,
                                    Utf8StrFmt("type=%s", strAttachmentType.c_str()));       // extra conf
             }

trunk/src/VBox/Main/VFSExplorerImpl.cpp

@@ -363 +363 @@
                 throw setError(VBOX_E_FILE_ERROR, tr ("Can't delete file '%s' (%Rrc)"), szPath, vrc);
             if(aTask->progress)
-                aTask->progress->setCurrentOperationProgress(fPercentStep * i);
+                aTask->progress->setCurrentOperationProgress((ULONG)(fPercentStep * i));
         }
     }
@@ -489 +489 @@
                 throw setError(VBOX_E_FILE_ERROR, tr ("Can't delete file '%s' (%Rrc)"), (*it).c_str(), vrc);
             if(aTask->progress)
-                aTask->progress->setCurrentOperationProgress(fPercentStep * i);
+                aTask->progress->setCurrentOperationProgress((ULONG)(fPercentStep * i));
         }
     }