Changeset 23235 in vbox for trunk

Timestamp:

Sep 22, 2009 6:15:56 PM (15 years ago)

Author:

vboxsync

Message:

API: fix opening new dvd/floppy images, introduce fallback format

Location:

trunk/src/VBox/Main

Files:

• MediumImpl.cpp (modified) (4 diffs)
• VirtualBoxImpl.cpp (modified) (3 diffs)
• include/MediumImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -968 +968 @@
                      CBSTR aLocation,
                      HDDOpenMode enOpenMode,
+                     DeviceType_T aDeviceType,
                      BOOL aSetImageId,
                      const Guid &aImageId,
@@ -998 +999 @@
     m->hddOpenMode = enOpenMode;
 
-    rc = setLocation(aLocation);
+    if (aDeviceType == DeviceType_HardDisk)
+        rc = setLocation(aLocation);
+    else
+        rc = setLocation(aLocation, "RAW");
     CheckComRCReturnRC(rc);
 
@@ -3334 +3338 @@
  * be NotCreated and will return a faiulre otherwise.
  *
- * @param aLocation Location of the storage unit. If the locaiton is a FS-path,
+ * @param aLocation Location of the storage unit. If the location is a FS-path,
  *                  then it can be relative to the VirtualBox home directory.
+ * @param aFormat   Optional fallback format if it is an import and the format
+ *                  cannot be determined.
  *
  * @note Must be called from under this object's write lock.
  */
-HRESULT Medium::setLocation(const Utf8Str &aLocation)
+HRESULT Medium::setLocation(const Utf8Str &aLocation, const Utf8Str &aFormat)
 {
     AssertReturn(!aLocation.isEmpty(), E_FAIL);
@@ -3436 +3442 @@
                                     tr("Could not find file for the hard disk '%s' (%Rrc)"),
                                     locationFull.raw(), vrc);
-                else
+                else if (aFormat.isEmpty())
                     return setError(VBOX_E_IPRT_ERROR,
                                     tr("Could not get the storage format of the hard disk '%s' (%Rrc)"),
                                     locationFull.raw(), vrc);
+                else
+                {
+                    HRESULT rc = setFormat(Bstr(aFormat));
+                    /* setFormat() must not fail since we've just used the backend so
+                     * the format object must be there */
+                    AssertComRCReturnRC(rc);
+                }
             }
-
-            ComAssertRet(backendName != NULL && *backendName != '\0', E_FAIL);
-
-            HRESULT rc = setFormat(Bstr(backendName));
-            RTStrFree(backendName);
-
-            /* setFormat() must not fail since we've just used the backend so
-             * the format object must be there */
-            AssertComRCReturnRC(rc);
+            else
+            {
+                ComAssertRet(backendName != NULL && *backendName != '\0', E_FAIL);
+
+                HRESULT rc = setFormat(Bstr(backendName));
+                RTStrFree(backendName);
+
+                /* setFormat() must not fail since we've just used the backend so
+                 * the format object must be there */
+                AssertComRCReturnRC(rc);
+            }
         }
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1174 +1174 @@
                         aLocation,
                         (accessMode == AccessMode_ReadWrite) ? Medium::OpenReadWrite : Medium::OpenReadOnly,
+                        DeviceType_HardDisk,
                         aSetImageId, imageId,
                         aSetParentId, parentId);
@@ -1249 +1250 @@
     ComObjPtr<Medium> image;
     image.createObject();
-    rc = image->init (this, aLocation, Medium::OpenReadOnly, true, id, false, Guid());
+    rc = image->init (this, aLocation, Medium::OpenReadOnly, DeviceType_DVD, true, id, false, Guid());
     if (SUCCEEDED(rc))
     {
@@ -1316 +1317 @@
     ComObjPtr<Medium> image;
     image.createObject();
-    rc = image->init (this, aLocation, Medium::OpenReadWrite, true, id, false, Guid());
+    rc = image->init (this, aLocation, Medium::OpenReadWrite, DeviceType_Floppy, true, id, false, Guid());
     if (SUCCEEDED(rc))
     {

trunk/src/VBox/Main/include/MediumImpl.h

@@ -81 +81 @@
                  CBSTR aLocation,
                  HDDOpenMode enOpenMode,
+                 DeviceType_T aDeviceType,
                  BOOL aSetImageId,
                  const Guid &aImageId,
@@ -316 +317 @@
 private:
 
-    HRESULT setLocation(const Utf8Str &aLocation);
+    HRESULT setLocation(const Utf8Str &aLocation, const Utf8Str &aFormat = Utf8Str());
     HRESULT setFormat(CBSTR aFormat);