Changeset 67878 in vbox

Timestamp:

Jul 10, 2017 2:22:42 PM (8 years ago)

Author:

vboxsync

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

116842

Message:

fatvfs.cpp: Fixed another formatting problem causing trouble with XP: Either set cTotalSectors16 or cTotalSectors32, never both. XP would ignore our WINNT.SIF file otherwise, while having no trouble accessing the floppy and files from the (rescue) command line. Also fixed a file date issue where we dated everything back to 1980.

File:

• trunk/src/VBox/Runtime/common/fs/fatvfs.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/fs/fatvfs.cpp

@@ -1416 +1416 @@
 
     if (puDate)
-        *puDate = ((RT_MIN(Time.i32Year, 1980) - 1980) << 9)
+        *puDate = ((uint16_t)(RT_MAX(Time.i32Year, 1980) - 1980) << 9)
                 | (Time.u8Month << 5)
                 | Time.u8MonthDay;
     if (puTime)
-        *puTime = (Time.u8Hour   << 11)
+        *puTime = ((uint16_t)Time.u8Hour   << 11)
                 | (Time.u8Minute << 5)
                 | (Time.u8Second >> 1);
@@ -4929 +4929 @@
     pBootSector->Bpb.Bpb331.cTracksPerCylinder  = cHeads;
     pBootSector->Bpb.Bpb331.cHiddenSectors      = cHiddenSectors;
-    pBootSector->Bpb.Bpb331.cTotalSectors32     = cTotalSectors <= UINT32_MAX     ? (uint32_t)cTotalSectors : 0;
+    /* XP barfs if both cTotalSectors32 and cTotalSectors16 are set */
+    pBootSector->Bpb.Bpb331.cTotalSectors32     = cTotalSectors <= UINT32_MAX && pBootSector->Bpb.Bpb331.cTotalSectors16 == 0
+                                                ? (uint32_t)cTotalSectors : 0;
     if (enmFatType != RTFSFATTYPE_FAT32)
     {