Changeset 79965 in vbox for trunk/src/VBox/Main/src-server/MediumImpl.cpp

Timestamp:

Jul 24, 2019 8:32:32 PM (6 years ago)

Author:

vboxsync

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

132396

Message:

Storage: Added a desired format parameter to VDGetFormat() so Main can pass along the device type. Bumped the RAW backend down after the CUE and VISO to prevent (impossible) mixups of tiny files. Extended rawProbe() to look for a valid ISO-9660/UDF descriptor sequence on the image if the caller doesn't say it should be a floppy or hdd, only if that fail go by the extension. Note! the pfnProbe callback should probably get a score return parameter to indicate how confient the backend is about the probe result, as this would prevent the RAW backend from accidentally grabbing images which belongs to a plug-in. bugref:9151

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -7619 +7619 @@
         if (isImport)
         {
+            VDTYPE const enmDesiredType = m->devType == DeviceType_Floppy   ? VDTYPE_FLOPPY
+                                        : m->devType == DeviceType_DVD      ? VDTYPE_OPTICAL_DISC
+                                        : m->devType == DeviceType_HardDisk ? VDTYPE_HDD : VDTYPE_INVALID;
             VDTYPE enmType = VDTYPE_INVALID;
             char *backendName = NULL;
@@ -7634 +7637 @@
             {
                 vrc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
-                                  locationFull.c_str(), &backendName, &enmType);
+                                  locationFull.c_str(), enmDesiredType, &backendName, &enmType);
             }
             else if (   vrc != VERR_FILE_NOT_FOUND
@@ -7644 +7647 @@
                 locationFull = aLocation;
                 vrc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
-                                  locationFull.c_str(), &backendName, &enmType);
+                                  locationFull.c_str(), enmDesiredType, &backendName, &enmType);
             }