diff --git a/Aaru.Tests/Filesystems/FAT12/MBR.cs b/Aaru.Tests/Filesystems/FAT12/MBR.cs index ea4e9cd70..1012c366a 100644 --- a/Aaru.Tests/Filesystems/FAT12/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT12/MBR.cs @@ -60,10 +60,10 @@ namespace Aaru.Tests.Filesystems.FAT12 { TestFile = "drdos_3.40.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 30720, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 3654, + Clusters = 2772, ClusterSize = 4096, SystemId = "IBM 3.2", VolumeName = "VOLUMELABEL" @@ -72,10 +72,10 @@ namespace Aaru.Tests.Filesystems.FAT12 { TestFile = "drdos_3.41.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 28672, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 3520, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 3.2", VolumeName = "VOLUMELABEL" @@ -84,10 +84,10 @@ namespace Aaru.Tests.Filesystems.FAT12 { TestFile = "drdos_5.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 28672, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 3520, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" @@ -96,10 +96,10 @@ namespace Aaru.Tests.Filesystems.FAT12 { TestFile = "drdos_6.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 28672, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 3520, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" @@ -108,10 +108,10 @@ namespace Aaru.Tests.Filesystems.FAT12 { TestFile = "drdos_7.02.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 28672, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 3520, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" @@ -120,10 +120,10 @@ namespace Aaru.Tests.Filesystems.FAT12 { TestFile = "drdos_7.03.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 28672, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 3520, + Clusters = 2890, ClusterSize = 4096, SystemId = "DRDOS 7", VolumeName = "VOLUMELABEL" @@ -132,30 +132,56 @@ namespace Aaru.Tests.Filesystems.FAT12 { TestFile = "drdos_8.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 28672, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 3520, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "1BFB1273" + VolumeSerial = "09F92756" }, new FileSystemTest { - TestFile = "msdos331.aif", + TestFile = "drdos_8.10.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 2890, + ClusterSize = 4096, + SystemId = "IBM 5.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "08FF1164" + }, + new FileSystemTest + { + TestFile = "msdos_3.31.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8192, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 1000, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" }, new FileSystemTest { - TestFile = "msdos401.aif", + TestFile = "msdos_4.00.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 2890, + ClusterSize = 4096, + SystemId = "MSDOS4.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "3C2B0903" + }, + new FileSystemTest + { + TestFile = "msdos_4.01.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 8192, SectorSize = 512, @@ -168,33 +194,46 @@ namespace Aaru.Tests.Filesystems.FAT12 }, new FileSystemTest { - TestFile = "msdos500.aif", + TestFile = "msdos_5.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8192, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 1000, + Clusters = 2890, ClusterSize = 4096, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "345D18FB" + VolumeSerial = "1B08090B" }, new FileSystemTest { - TestFile = "msdos600.aif", + TestFile = "msdos_5.00a.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8192, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 1000, + Clusters = 2890, ClusterSize = 4096, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "332518F4" + VolumeSerial = "3348090C" }, new FileSystemTest { - TestFile = "msdos620rc1.aif", + TestFile = "msdos_6.00.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 2890, + ClusterSize = 4096, + SystemId = "MSDOS5.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "124008FB" + }, + new FileSystemTest + { + TestFile = "msdos_6.20rc1.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 8192, SectorSize = 512, @@ -207,46 +246,46 @@ namespace Aaru.Tests.Filesystems.FAT12 }, new FileSystemTest { - TestFile = "msdos620.aif", + TestFile = "msdos_6.20.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8192, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 1000, + Clusters = 2890, ClusterSize = 4096, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "076718EF" + VolumeSerial = "31190907" }, new FileSystemTest { - TestFile = "msdos621.aif", + TestFile = "msdos_6.21.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8192, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 1000, + Clusters = 2890, ClusterSize = 4096, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "1371181B" + VolumeSerial = "27230917" }, new FileSystemTest { - TestFile = "msdos622.aif", + TestFile = "msdos_6.22.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8192, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 1000, + Clusters = 2890, ClusterSize = 4096, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "23281816" + VolumeSerial = "156308F3" }, new FileSystemTest { - TestFile = "msdos710.aif", + TestFile = "msdos_7.10.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 16384, SectorSize = 512, @@ -261,10 +300,10 @@ namespace Aaru.Tests.Filesystems.FAT12 { TestFile = "novelldos_7.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 28672, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 3520, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" @@ -273,30 +312,30 @@ namespace Aaru.Tests.Filesystems.FAT12 { TestFile = "opendos_7.01.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 28672, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 3520, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" }, new FileSystemTest { - TestFile = "pcdos2000.aif", + TestFile = "pcdos_2000.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 32768, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 4024, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 7.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "294F100F" + VolumeSerial = "390F090A" }, new FileSystemTest { - TestFile = "pcdos200.aif", + TestFile = "pcdos_2.00.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 32768, SectorSize = 512, @@ -307,7 +346,7 @@ namespace Aaru.Tests.Filesystems.FAT12 }, new FileSystemTest { - TestFile = "pcdos210.aif", + TestFile = "pcdos_2.10.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 32768, SectorSize = 512, @@ -318,7 +357,7 @@ namespace Aaru.Tests.Filesystems.FAT12 }, new FileSystemTest { - TestFile = "pcdos300.aif", + TestFile = "pcdos_3.00.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 32768, SectorSize = 512, @@ -329,7 +368,7 @@ namespace Aaru.Tests.Filesystems.FAT12 }, new FileSystemTest { - TestFile = "pcdos310.aif", + TestFile = "pcdos_3.10.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 32768, SectorSize = 512, @@ -340,7 +379,19 @@ namespace Aaru.Tests.Filesystems.FAT12 }, new FileSystemTest { - TestFile = "pcdos330.aif", + TestFile = "pcdos_3.20.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 2890, + ClusterSize = 4096, + SystemId = "IBM 3.2", + VolumeName = "VOLUMELABEL" + }, + new FileSystemTest + { + TestFile = "pcdos_3.30.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 32768, SectorSize = 512, @@ -351,7 +402,7 @@ namespace Aaru.Tests.Filesystems.FAT12 }, new FileSystemTest { - TestFile = "pcdos400.aif", + TestFile = "pcdos_4.00.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 32768, SectorSize = 512, @@ -364,59 +415,72 @@ namespace Aaru.Tests.Filesystems.FAT12 }, new FileSystemTest { - TestFile = "pcdos500.aif", + TestFile = "pcdos_5.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 32768, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 4024, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "1A5E0FF9" + VolumeSerial = "363B0904" }, new FileSystemTest { - TestFile = "pcdos502.aif", + TestFile = "pcdos_5.02.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 32768, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 4024, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "1D2F0FFE" + VolumeSerial = "10650902" }, new FileSystemTest { - TestFile = "pcdos610.aif", + TestFile = "pcdos_6.10.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 32768, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 4024, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 6.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "076C1004" + VolumeSerial = "313208FE" }, new FileSystemTest { - TestFile = "pcdos630.aif", + TestFile = "pcdos_6.30.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 32768, + Sectors = 24576, SectorSize = 512, Bootable = true, - Clusters = 4024, + Clusters = 2890, ClusterSize = 4096, SystemId = "IBM 6.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "2C481009" + VolumeSerial = "253E0901" }, new FileSystemTest { - TestFile = "toshibamsdos330.aif", + TestFile = "pcdos_7.00.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 24576, + SectorSize = 512, + Bootable = true, + Clusters = 2890, + ClusterSize = 4096, + SystemId = "IBM 7.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "0E1E090D" + }, + new FileSystemTest + { + TestFile = "toshibamsdos_3.30.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 8192, SectorSize = 512, @@ -428,7 +492,7 @@ namespace Aaru.Tests.Filesystems.FAT12 }, new FileSystemTest { - TestFile = "toshibamsdos401.aif", + TestFile = "toshibamsdos_4.01.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 8192, SectorSize = 512, diff --git a/Aaru.Tests/Filesystems/FAT12/Whole.cs b/Aaru.Tests/Filesystems/FAT12/Whole.cs index 7617b8491..a74f3977c 100644 --- a/Aaru.Tests/Filesystems/FAT12/Whole.cs +++ b/Aaru.Tests/Filesystems/FAT12/Whole.cs @@ -132,6 +132,7 @@ namespace Aaru.Tests.Filesystems.FAT12 Bootable = true, Clusters = 2880, ClusterSize = 512, + VolumeName = "VOLUMELABEL", SystemId = "DIGITAL " }, new FileSystemTest @@ -209,6 +210,7 @@ namespace Aaru.Tests.Filesystems.FAT12 Bootable = true, Clusters = 2880, ClusterSize = 512, + VolumeName = "VOLUMELABEL", SystemId = "DIGITAL " }, new FileSystemTest @@ -286,6 +288,7 @@ namespace Aaru.Tests.Filesystems.FAT12 Bootable = true, Clusters = 2880, ClusterSize = 512, + VolumeName = "VOLUMELABEL", SystemId = "IBM 3.3" }, new FileSystemTest @@ -482,7 +485,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "DRDOS 7", VolumeName = "VOLUMELABEL", - VolumeSerial = "1BF82777" + VolumeSerial = "1607282D" }, new FileSystemTest { @@ -586,7 +589,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "DRDOS 7", VolumeName = "VOLUMELABEL", - VolumeSerial = "0CEF2739" + VolumeSerial = "16080521" }, new FileSystemTest { @@ -664,7 +667,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "DRDOS 7", VolumeName = "VOLUMELABEL", - VolumeSerial = "1BFC117D" + VolumeSerial = "16081A56" }, new FileSystemTest { @@ -693,6 +696,31 @@ namespace Aaru.Tests.Filesystems.FAT12 VolumeSerial = "1BFE1423" }, new FileSystemTest + { + TestFile = "drdos_8.10_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Bootable = true, + Clusters = 2880, + ClusterSize = 512, + SystemId = "DRDOS 7", + VolumeName = "VOLUMELABEL", + VolumeSerial = "00000000" + }, + new FileSystemTest + { + TestFile = "msdos_3.30_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Bootable = true, + Clusters = 2880, + ClusterSize = 512, + VolumeName = "VOLUMELABEL", + SystemId = "MSDOS3.3" + }, + new FileSystemTest { TestFile = "msdos_3.30A_dsdd.img.lz", MediaType = MediaType.DOS_525_DS_DD_9, @@ -744,6 +772,7 @@ namespace Aaru.Tests.Filesystems.FAT12 Bootable = true, Clusters = 2880, ClusterSize = 512, + VolumeName = "VOLUMELABEL", SystemId = "MSDOS3.3" }, new FileSystemTest @@ -819,6 +848,7 @@ namespace Aaru.Tests.Filesystems.FAT12 Bootable = true, Clusters = 2880, ClusterSize = 512, + VolumeName = "VOLUMELABEL", SystemId = "IBM 3.3" }, new FileSystemTest @@ -843,6 +873,19 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512 }, new FileSystemTest + { + TestFile = "msdos_4.00_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Bootable = true, + Clusters = 2880, + ClusterSize = 512, + SystemId = "MSDOS4.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "07200903" + }, + new FileSystemTest { TestFile = "msdos_4.01_dsdd.img.lz", MediaType = MediaType.DOS_525_DS_DD_9, @@ -1000,7 +1043,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "415118FC" + VolumeSerial = "2159090B" }, new FileSystemTest { @@ -1026,6 +1069,19 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512 }, new FileSystemTest + { + TestFile = "msdos_5.00a_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Bootable = true, + Clusters = 2880, + ClusterSize = 512, + SystemId = "MSDOS5.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "383D090C" + }, + new FileSystemTest { TestFile = "msdos_6.00_dsdd.img.lz", MediaType = MediaType.DOS_525_DS_DD_9, @@ -1098,7 +1154,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "172418F4" + VolumeSerial = "1A2C08FB" }, new FileSystemTest { @@ -1196,7 +1252,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "364C18F0" + VolumeSerial = "2C090907" }, new FileSystemTest { @@ -1392,7 +1448,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "237118E1" + VolumeSerial = "214B0917" }, new FileSystemTest { @@ -1490,7 +1546,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "185E1817" + VolumeSerial = "0F2808F3" }, new FileSystemTest { @@ -2356,7 +2412,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "NWDOS7.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "1BE61143" + VolumeSerial = "161B1226" }, new FileSystemTest { @@ -2460,7 +2516,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "OPENDOS7", VolumeName = "VOLUMELABEL", - VolumeSerial = "1BEC0C5D" + VolumeSerial = "16090D37" }, new FileSystemTest { @@ -2583,7 +2639,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "IBM 7.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "1D491013" + VolumeSerial = "3E46090A" }, new FileSystemTest { @@ -2631,6 +2687,18 @@ namespace Aaru.Tests.Filesystems.FAT12 SystemId = "IBM 3.1" }, new FileSystemTest + { + TestFile = "pcdos_3.20_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Bootable = true, + Clusters = 2880, + ClusterSize = 512, + VolumeName = "VOLUMELABEL", + SystemId = "IBM 3.2" + }, + new FileSystemTest { TestFile = "pcdos_3.30_dshd.img.lz", MediaType = MediaType.DOS_525_HD, @@ -2676,7 +2744,20 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "IBM 4.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "2E3E0FE1" + VolumeSerial = "0E6409F3" + }, + new FileSystemTest + { + TestFile = "pcdos_4.01_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Bootable = true, + Clusters = 2880, + ClusterSize = 512, + SystemId = "IBM 4.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "0F2F0A01" }, new FileSystemTest { @@ -2751,7 +2832,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "IBM 5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "0D550FFC" + VolumeSerial = "31090904" }, new FileSystemTest { @@ -2849,7 +2930,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "IBM 5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "3F4F0FFE" + VolumeSerial = "09410902" }, new FileSystemTest { @@ -2947,7 +3028,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "IBM 6.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "355A1006" + VolumeSerial = "382408FE" }, new FileSystemTest { @@ -3045,7 +3126,7 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512, SystemId = "IBM 6.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "0B59100B" + VolumeSerial = "1F2A0901" }, new FileSystemTest { @@ -3071,6 +3152,19 @@ namespace Aaru.Tests.Filesystems.FAT12 ClusterSize = 512 }, new FileSystemTest + { + TestFile = "pcdos_7.00_mf2hd.img.lz", + MediaType = MediaType.DOS_35_HD, + Sectors = 2880, + SectorSize = 512, + Bootable = true, + Clusters = 2880, + ClusterSize = 512, + SystemId = "IBM 7.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "1407090D" + }, + new FileSystemTest { TestFile = "mkfs.vfat_dshd.img.lz", MediaType = MediaType.DOS_525_HD, diff --git a/Aaru.Tests/Filesystems/FAT16/MBR.cs b/Aaru.Tests/Filesystems/FAT16/MBR.cs index ee9995d4d..2237f0f93 100644 --- a/Aaru.Tests/Filesystems/FAT16/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT16/MBR.cs @@ -49,11 +49,11 @@ namespace Aaru.Tests.Filesystems.FAT16 { TestFile = "drdos_3.40.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63882, - ClusterSize = 8192, + Clusters = 32508, + ClusterSize = 4096, SystemId = "IBM 3.2", VolumeName = "VOLUMELABEL" }, @@ -61,11 +61,11 @@ namespace Aaru.Tests.Filesystems.FAT16 { TestFile = "drdos_3.41.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 32626, + ClusterSize = 4096, SystemId = "IBM 3.2", VolumeName = "VOLUMELABEL" }, @@ -73,11 +73,11 @@ namespace Aaru.Tests.Filesystems.FAT16 { TestFile = "drdos_5.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 32626, + ClusterSize = 4096, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" }, @@ -85,11 +85,11 @@ namespace Aaru.Tests.Filesystems.FAT16 { TestFile = "drdos_6.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" }, @@ -97,11 +97,11 @@ namespace Aaru.Tests.Filesystems.FAT16 { TestFile = "drdos_7.02.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 32626, + ClusterSize = 4096, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" }, @@ -109,11 +109,11 @@ namespace Aaru.Tests.Filesystems.FAT16 { TestFile = "drdos_7.03.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 32626, + ClusterSize = 4096, SystemId = "DRDOS 7", VolumeName = "VOLUMELABEL" }, @@ -121,29 +121,78 @@ namespace Aaru.Tests.Filesystems.FAT16 { TestFile = "drdos_8.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "IBM 5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "1BFB0748" + VolumeSerial = "0A070554" }, new FileSystemTest { - TestFile = "msdos331.aif", + TestFile = "drdos_8.10.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65252, + ClusterSize = 2048, + SystemId = "IBM 5.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "0A1A113F" + }, + new FileSystemTest + { + TestFile = "msdos_3.30.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, - SystemId = "IBM 3.3" + Clusters = 16364, + ClusterSize = 2048, + SystemId = "MSDOS3.3" }, new FileSystemTest { - TestFile = "msdos401.aif", + TestFile = "msdos_3.30A.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 16364, + ClusterSize = 2048, + SystemId = "MSDOS3.3" + }, + new FileSystemTest + { + TestFile = "msdos_3.31.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 32626, + ClusterSize = 4096, + SystemId = "IBM 3.3", + VolumeName = "VOLUMELABEL" + }, + new FileSystemTest + { + TestFile = "msdos_4.00.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65252, + ClusterSize = 2048, + SystemId = "MSDOS4.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "0F2E0A16" + }, + new FileSystemTest + { + TestFile = "msdos_4.01.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 1024000, SectorSize = 512, @@ -156,33 +205,46 @@ namespace Aaru.Tests.Filesystems.FAT16 }, new FileSystemTest { - TestFile = "msdos500.aif", + TestFile = "msdos_5.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "0C6D18FC" + VolumeSerial = "19320A14" }, new FileSystemTest { - TestFile = "msdos600.aif", + TestFile = "msdos_5.00a.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "382B18F4" + VolumeSerial = "30400A09" }, new FileSystemTest { - TestFile = "msdos620rc1.aif", + TestFile = "msdos_6.00.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65252, + ClusterSize = 2048, + SystemId = "MSDOS5.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "39660A0C" + }, + new FileSystemTest + { + TestFile = "msdos_6.20rc1.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 1024000, SectorSize = 512, @@ -195,46 +257,46 @@ namespace Aaru.Tests.Filesystems.FAT16 }, new FileSystemTest { - TestFile = "msdos620.aif", + TestFile = "msdos_6.20.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "0D2418EF" + VolumeSerial = "10550A18" }, new FileSystemTest { - TestFile = "msdos621.aif", + TestFile = "msdos_6.21.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "195A181B" + VolumeSerial = "05580A12" }, new FileSystemTest { - TestFile = "msdos622.aif", + TestFile = "msdos_6.22.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "MSDOS5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "27761816" + VolumeSerial = "054C0A08" }, new FileSystemTest { - TestFile = "msdos710.aif", + TestFile = "msdos_7.10.aif", MediaType = MediaType.GENERIC_HDD, Sectors = 1024000, SectorSize = 512, @@ -249,11 +311,11 @@ namespace Aaru.Tests.Filesystems.FAT16 { TestFile = "novelldos_7.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" }, @@ -261,91 +323,117 @@ namespace Aaru.Tests.Filesystems.FAT16 { TestFile = "opendos_7.01.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "IBM 3.3", VolumeName = "VOLUMELABEL" }, new FileSystemTest { - TestFile = "pcdos2000.aif", + TestFile = "pcdos_2000.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "IBM 7.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "2272100F" + VolumeSerial = "30490A0F" }, new FileSystemTest { - TestFile = "pcdos400.aif", + TestFile = "pcdos_4.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "IBM 4.0", - VolumeName = "NO NAME", - VolumeSerial = "07280FE1" + VolumeName = "VOLUMELABEL", + VolumeSerial = "2D670A17" }, new FileSystemTest { - TestFile = "pcdos500.aif", + TestFile = "pcdos_4.01.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, + SystemId = "IBM 4.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "23350A15" + }, + new FileSystemTest + { + TestFile = "pcdos_5.00.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65252, + ClusterSize = 2048, SystemId = "IBM 5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "1F630FF9" + VolumeSerial = "1B290A0D" }, new FileSystemTest { - TestFile = "pcdos502.aif", + TestFile = "pcdos_5.02.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "IBM 5.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "18340FFE" + VolumeSerial = "340B0A13" }, new FileSystemTest { - TestFile = "pcdos610.aif", + TestFile = "pcdos_6.10.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "IBM 6.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "3F3F1003" + VolumeSerial = "052A0A0B" }, new FileSystemTest { - TestFile = "pcdos630.aif", + TestFile = "pcdos_6.30.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 1024000, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 63941, - ClusterSize = 8192, + Clusters = 65252, + ClusterSize = 2048, SystemId = "IBM 6.0", VolumeName = "VOLUMELABEL", - VolumeSerial = "273D1009" + VolumeSerial = "1E3D0A0F" + }, + new FileSystemTest + { + TestFile = "pcdos_7.00.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 65252, + ClusterSize = 2048, + SystemId = "IBM 7.0", + VolumeName = "VOLUMELABEL", + VolumeSerial = "2A420A06" }, new FileSystemTest { diff --git a/Aaru.Tests/Filesystems/FAT32/MBR.cs b/Aaru.Tests/Filesystems/FAT32/MBR.cs index 8099052c1..548e5cd41 100644 --- a/Aaru.Tests/Filesystems/FAT32/MBR.cs +++ b/Aaru.Tests/Filesystems/FAT32/MBR.cs @@ -62,14 +62,27 @@ namespace Aaru.Tests.Filesystems.FAT32 { TestFile = "drdos_8.00.aif", MediaType = MediaType.GENERIC_HDD, - Sectors = 8388608, + Sectors = 262144, SectorSize = 512, Bootable = true, - Clusters = 1048233, - ClusterSize = 4096, + Clusters = 261009, + ClusterSize = 512, SystemId = "IBM 7.1", VolumeName = "VOLUMELABEL", - VolumeSerial = "1BFB1A43" + VolumeSerial = "09F93020" + }, + new FileSystemTest + { + TestFile = "drdos_8.10.aif", + MediaType = MediaType.GENERIC_HDD, + Sectors = 262144, + SectorSize = 512, + Bootable = true, + Clusters = 261009, + ClusterSize = 512, + SystemId = "IBM 7.1", + VolumeName = "VOLUMELABEL", + VolumeSerial = "09FF2765" }, new FileSystemTest {