Changeset 102185 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Nov 21, 2023 10:25:58 AM (15 months ago)

Author:

vboxsync

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

160310

Message:

Storage/DrvVD: Floppy type upgrade fixes. bugref:10371

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -4897 +4897 @@
 
             char *psz = NULL;
-           rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "Type", &psz);
+            rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "Type", &psz);
             if (RT_FAILURE(rc))
                 return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_BLOCK_NO_TYPE, N_("Failed to obtain the sub type"));
@@ -4917 +4917 @@
                 break;
             }
-            else
-                rc = VINF_SUCCESS;
+            rc = VINF_SUCCESS;
 
             if (pszCachePath)
@@ -5515 +5514 @@
                     RT_FALL_THRU();
                 case PDMMEDIATYPE_FLOPPY_720:
-                    if (cbFloppyImg > 80 * 2 * 14 * 512)
+                    if (cbFloppyImg > 80 * 2 * 9 * 512)
                         pThis->enmType = PDMMEDIATYPE_FLOPPY_1_20;
                     RT_FALL_THRU();
                 case PDMMEDIATYPE_FLOPPY_1_20:
-                    if (cbFloppyImg > 80 * 2 * 20 * 512)
+                    if (cbFloppyImg > 80 * 2 * 15 * 512)
                         pThis->enmType = PDMMEDIATYPE_FLOPPY_1_44;
                     RT_FALL_THRU();
                 case PDMMEDIATYPE_FLOPPY_1_44:
-                    if (cbFloppyImg > 80 * 2 * 24 * 512)
+                    if (cbFloppyImg > 80 * 2 * 18 * 512)
                         pThis->enmType = PDMMEDIATYPE_FLOPPY_2_88;
                     RT_FALL_THRU();
                 case PDMMEDIATYPE_FLOPPY_2_88:
-                    if (cbFloppyImg > 80 * 2 * 48 * 512)
+                    if (cbFloppyImg > 80 * 2 * 36 * 512)
                         pThis->enmType = PDMMEDIATYPE_FLOPPY_FAKE_15_6;
                     RT_FALL_THRU();