diff --git a/DiscImageChef.Tests/DiscImageChef.Tests.csproj b/DiscImageChef.Tests/DiscImageChef.Tests.csproj index d612e72dc..63ff6d934 100644 --- a/DiscImageChef.Tests/DiscImageChef.Tests.csproj +++ b/DiscImageChef.Tests/DiscImageChef.Tests.csproj @@ -68,6 +68,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -116,7 +152,7 @@ - + diff --git a/DiscImageChef.Tests/Filesystems/BeFS.cs b/DiscImageChef.Tests/Filesystems/BeFS.cs index 75fde05e7..3b9faa0c4 100644 --- a/DiscImageChef.Tests/Filesystems/BeFS.cs +++ b/DiscImageChef.Tests/Filesystems/BeFS.cs @@ -35,13 +35,77 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; +using System.IO; +using DiscImageChef.CommonTypes; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; +using DiscImageChef.ImagePlugins; +using NUnit.Framework; + namespace DiscImageChef.Tests.Filesystems { + [TestFixture] public class BeFS { - public BeFS() + readonly string[] testfiles = { + "beos_r3.1.img.lz", "beos_r4.5.img.lz", + }; + + readonly MediaType[] mediatypes = { + MediaType.DOS_35_HD, MediaType.DOS_35_HD, + }; + + readonly ulong[] sectors = { + 2880, 2880, + }; + + readonly uint[] sectorsize = { + 512, 512, + }; + + readonly long[] clusters = { + 1440, 1440, + }; + + readonly int[] clustersize = { + 1024, 1024, + }; + + readonly string[] volumename = { + "Volume label","Volume label", + }; + + readonly string[] volumeserial = { + null, null, + }; + + readonly string[] oemid = { + null, null, + }; + + [Test] + public void Test() { + for(int i = 0; i < testfiles.Length; i++) + { + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "befs", testfiles[i]); + Filter filter = new LZip(); + filter.Open(location); + ImagePlugin image = new ZZZRawImage(); + Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(mediatypes[i], image.ImageInfo.mediaType, testfiles[i]); + Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); + Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); + Filesystem fs = new DiscImageChef.Filesystems.BeFS(); + Assert.AreEqual(true, fs.Identify(image, 0, image.ImageInfo.sectors - 1), testfiles[i]); + fs.GetInformation(image, 0, image.ImageInfo.sectors - 1, out string information); + Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); + Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); + Assert.AreEqual("BeFS", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + } } } } diff --git a/DiscImageChef.Tests/Filesystems/BeFS_APM.cs b/DiscImageChef.Tests/Filesystems/BeFS_APM.cs index 48b4ed7f9..1fc45d68f 100644 --- a/DiscImageChef.Tests/Filesystems/BeFS_APM.cs +++ b/DiscImageChef.Tests/Filesystems/BeFS_APM.cs @@ -35,13 +35,87 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; +using System.Collections.Generic; +using System.IO; +using DiscImageChef.CommonTypes; +using DiscImageChef.DiscImages; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; +using DiscImageChef.ImagePlugins; +using DiscImageChef.PartPlugins; +using NUnit.Framework; + namespace DiscImageChef.Tests.Filesystems { + [TestFixture] public class BeFS_APM { - public BeFS_APM() + readonly string[] testfiles = { + "beos_r3.1.vdi.lz", "beos_r4.5.vdi.lz", + }; + + readonly ulong[] sectors = { + 1572864, 1572864, + }; + + readonly uint[] sectorsize = { + 512, 512, + }; + + readonly long[] clusters = { + 786400, 785232, + }; + + readonly int[] clustersize = { + 1024, 1024, + }; + + readonly string[] volumename = { + "Volume label","Volume label", + }; + + readonly string[] volumeserial = { + null,null, + }; + + readonly string[] oemid = { + null,null, + }; + + [Test] + public void Test() { + for(int i = 0; i < testfiles.Length; i++) + { + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "befs_apm", testfiles[i]); + Filter filter = new LZip(); + filter.Open(location); + ImagePlugin image = new VDI(); + Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); + Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); + PartPlugin parts = new AppleMap(); + Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); + Filesystem fs = new DiscImageChef.Filesystems.BeFS(); + int part = -1; + for(int j = 0; j < partitions.Count; j++) + { + if(partitions[j].PartitionType == "Be_BFS") + { + part = j; + break; + } + } + Assert.AreNotEqual(-1, part, "Partition not found"); + Assert.AreEqual(true, fs.Identify(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1), testfiles[i]); + fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); + Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); + Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); + Assert.AreEqual("BeFS", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + } } } } diff --git a/DiscImageChef.Tests/Filesystems/BeFS_MBR.cs b/DiscImageChef.Tests/Filesystems/BeFS_MBR.cs index 08f9f6a98..bd423782d 100644 --- a/DiscImageChef.Tests/Filesystems/BeFS_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/BeFS_MBR.cs @@ -35,13 +35,87 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; +using System.Collections.Generic; +using System.IO; +using DiscImageChef.CommonTypes; +using DiscImageChef.DiscImages; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; +using DiscImageChef.ImagePlugins; +using DiscImageChef.PartPlugins; +using NUnit.Framework; + namespace DiscImageChef.Tests.Filesystems { + [TestFixture] public class BeFS_MBR { - public BeFS_MBR() + readonly string[] testfiles = { + "beos_r3.1.vdi.lz", "beos_r4.5.vdi.lz", + }; + + readonly ulong[] sectors = { + 1572864, 1572864, + }; + + readonly uint[] sectorsize = { + 512, 512, + }; + + readonly long[] clusters = { + 786400, 785232, + }; + + readonly int[] clustersize = { + 1024, 1024, + }; + + readonly string[] volumename = { + "Volume label","Volume label", + }; + + readonly string[] volumeserial = { + null,null, + }; + + readonly string[] oemid = { + null,null, + }; + + [Test] + public void Test() { + for(int i = 0; i < testfiles.Length; i++) + { + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "befs_mbr", testfiles[i]); + Filter filter = new LZip(); + filter.Open(location); + ImagePlugin image = new VDI(); + Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); + Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); + PartPlugin parts = new MBR(); + Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); + Filesystem fs = new DiscImageChef.Filesystems.BeFS(); + int part = -1; + for(int j = 0; j < partitions.Count; j++) + { + if(partitions[j].PartitionType == "0xEB") + { + part = j; + break; + } + } + Assert.AreNotEqual(-1, part, "Partition not found"); + Assert.AreEqual(true, fs.Identify(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1), testfiles[i]); + fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); + Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); + Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); + Assert.AreEqual("BeFS", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + } } } } diff --git a/DiscImageChef.Tests/Filesystems/F2FS.cs b/DiscImageChef.Tests/Filesystems/F2FS.cs index 44e02391d..5979ba5ed 100644 --- a/DiscImageChef.Tests/Filesystems/F2FS.cs +++ b/DiscImageChef.Tests/Filesystems/F2FS.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : btrfs.cs +// Filename : F2FS.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,7 +48,7 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class btrfs + public class F2FS { readonly string[] testfiles = { "linux.vdi.lz", @@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - "a4fc5201-85cc-6840-8a68-998cab9ae897", + "81bd3a4e-de0c-484c-becc-aaa479b2070a", }; [Test] @@ -83,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "btrfs", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "f2fs", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -92,7 +92,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.BTRFS(); + Filesystem fs = new DiscImageChef.Filesystems.F2FS(); int part = -1; for(int j = 0; j < partitions.Count; j++) { @@ -107,7 +107,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("B-tree file system", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("F2FS filesystem", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); } diff --git a/DiscImageChef.Tests/Filesystems/FAT12_APM.cs b/DiscImageChef.Tests/Filesystems/FAT12_APM.cs index f33cadbc6..f8e3a2af5 100644 --- a/DiscImageChef.Tests/Filesystems/FAT12_APM.cs +++ b/DiscImageChef.Tests/Filesystems/FAT12_APM.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : FAT16_APM.cs +// Filename : FAT12_APM.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,14 +48,14 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class FAT16_APM + public class FAT12_APM { readonly string[] testfiles = { "macosx.vdi.lz", }; readonly ulong[] sectors = { - 1024000, + 16384, }; readonly uint[] sectorsize = { @@ -63,11 +63,11 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 63995, + 4076, }; readonly int[] clustersize = { - 8192, + 2048, }; readonly string[] volumename = { @@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - "063D1F09", + "32181F09", }; readonly string[] oemid = { @@ -87,7 +87,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat16_apm", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat12_apm", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "DOS_FAT_16") + if(partitions[j].PartitionType == "DOS_FAT_12") { part = j; break; @@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("FAT16", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("FAT12", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/FAT12_GPT.cs b/DiscImageChef.Tests/Filesystems/FAT12_GPT.cs index 0f75de483..eb06187d1 100644 --- a/DiscImageChef.Tests/Filesystems/FAT12_GPT.cs +++ b/DiscImageChef.Tests/Filesystems/FAT12_GPT.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : FAT16_GPT.cs +// Filename : FAT12_GPT.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,14 +48,14 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class FAT16_GPT + public class FAT12_GPT { readonly string[] testfiles = { "macosx.vdi.lz", }; readonly ulong[] sectors = { - 1024000, + 16384, }; readonly uint[] sectorsize = { @@ -63,11 +63,11 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 63995, + 4076, }; readonly int[] clustersize = { - 8192, + 2048, }; readonly string[] volumename = { @@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - "2E8A1F1B", + "66901F1B", }; readonly string[] oemid = { @@ -87,7 +87,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat16_gpt", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat12_gpt", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("FAT16", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("FAT12", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/FAT12_MBR.cs b/DiscImageChef.Tests/Filesystems/FAT12_MBR.cs index 58ce0d5ef..d9e4daad5 100644 --- a/DiscImageChef.Tests/Filesystems/FAT12_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/FAT12_MBR.cs @@ -65,7 +65,7 @@ namespace DiscImageChef.Tests.Filesystems "win10.vdi.lz", "win2000.vdi.lz","win95.vdi.lz","win95osr2.1.vdi.lz", "win95osr2.5.vdi.lz","win95osr2.vdi.lz","win98.vdi.lz","win98se.vdi.lz", "winme.vdi.lz","winnt_3.10.vdi.lz","winnt_3.50.vdi.lz","winnt_3.51.vdi.lz", - "winnt_4.00.vdi.lz","winvista.vdi.lz","beos_r4.5.vdi.lz", + "winnt_4.00.vdi.lz","winvista.vdi.lz","beos_r4.5.vdi.lz","linux.vdi.lz", }; readonly ulong[] sectors = { @@ -83,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems 16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384, - 16384, 16384, 16384, + 16384, 16384, 16384, 16384, }; readonly uint[] sectorsize = { @@ -101,7 +101,7 @@ namespace DiscImageChef.Tests.Filesystems 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, - 512, 512, 512, + 512, 512, 512, 512, }; readonly long[] clusters = { @@ -119,7 +119,7 @@ namespace DiscImageChef.Tests.Filesystems 3552, 4088, 2008, 2008, 2008, 2008, 2044, 2044, 2044, 4016, 2044, 2044, - 4016, 3072, 2040, + 4016, 3072, 2040, 3584, }; readonly int[] clustersize = { @@ -137,7 +137,7 @@ namespace DiscImageChef.Tests.Filesystems 2048, 2048, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 2048, 4096, 4096, - 2048, 2048, 4096, + 2048, 2048, 4096, 2048, }; readonly string[] volumename = { @@ -155,7 +155,7 @@ namespace DiscImageChef.Tests.Filesystems "NO NAME ","NO NAME ","VOLUMELABEL","VOLUMELABEL", "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", "VOLUMELABEL","NO NAME ","NO NAME ","NO NAME ", - "NO NAME ","NO NAME ","NO NAME ", + "NO NAME ","NO NAME ","NO NAME ","VolumeLabel", }; readonly string[] volumeserial = { @@ -173,7 +173,7 @@ namespace DiscImageChef.Tests.Filesystems "74F4921D","C4B64D11","29200D0C","234F0DE4", "074C0DFC","33640D18","0E121460","094C0EED", "38310F02","50489A1B","2CE52101","94313E7E", - "BC184FE6","BAD08A1E","00000000" + "BC184FE6","BAD08A1E","00000000","8D418102", }; readonly string[] oemid = { @@ -191,7 +191,7 @@ namespace DiscImageChef.Tests.Filesystems "MSDOS5.0", "MSDOS5.0", "MSWIN4.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", - "MSDOS5.0", "MSDOS5.0", "BeOS ", + "MSDOS5.0", "MSDOS5.0", "BeOS ", "mkfs.fat", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/FAT16_APM.cs b/DiscImageChef.Tests/Filesystems/FAT16_APM.cs index eddf88b97..f33cadbc6 100644 --- a/DiscImageChef.Tests/Filesystems/FAT16_APM.cs +++ b/DiscImageChef.Tests/Filesystems/FAT16_APM.cs @@ -35,13 +35,87 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; +using System.Collections.Generic; +using System.IO; +using DiscImageChef.CommonTypes; +using DiscImageChef.DiscImages; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; +using DiscImageChef.ImagePlugins; +using DiscImageChef.PartPlugins; +using NUnit.Framework; + namespace DiscImageChef.Tests.Filesystems { + [TestFixture] public class FAT16_APM { - public FAT16_APM() + readonly string[] testfiles = { + "macosx.vdi.lz", + }; + + readonly ulong[] sectors = { + 1024000, + }; + + readonly uint[] sectorsize = { + 512, + }; + + readonly long[] clusters = { + 63995, + }; + + readonly int[] clustersize = { + 8192, + }; + + readonly string[] volumename = { + "VOLUMELABEL", + }; + + readonly string[] volumeserial = { + "063D1F09", + }; + + readonly string[] oemid = { + "BSD 4.4", + }; + + [Test] + public void Test() { + for(int i = 0; i < testfiles.Length; i++) + { + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat16_apm", testfiles[i]); + Filter filter = new LZip(); + filter.Open(location); + ImagePlugin image = new VDI(); + Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); + Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); + PartPlugin parts = new AppleMap(); + Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); + Filesystem fs = new DiscImageChef.Filesystems.FAT(); + int part = -1; + for(int j = 0; j < partitions.Count; j++) + { + if(partitions[j].PartitionType == "DOS_FAT_16") + { + part = j; + break; + } + } + Assert.AreNotEqual(-1, part, "Partition not found"); + Assert.AreEqual(true, fs.Identify(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1), testfiles[i]); + fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); + Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); + Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); + Assert.AreEqual("FAT16", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + } } } } diff --git a/DiscImageChef.Tests/Filesystems/FAT16_GPT.cs b/DiscImageChef.Tests/Filesystems/FAT16_GPT.cs index f33cadbc6..0f75de483 100644 --- a/DiscImageChef.Tests/Filesystems/FAT16_GPT.cs +++ b/DiscImageChef.Tests/Filesystems/FAT16_GPT.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : FAT16_APM.cs +// Filename : FAT16_GPT.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,7 +48,7 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class FAT16_APM + public class FAT16_GPT { readonly string[] testfiles = { "macosx.vdi.lz", @@ -75,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumeserial = { - "063D1F09", + "2E8A1F1B", }; readonly string[] oemid = { @@ -87,20 +87,20 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat16_apm", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat16_gpt", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); - PartPlugin parts = new AppleMap(); + PartPlugin parts = new GuidPartitionTable(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); Filesystem fs = new DiscImageChef.Filesystems.FAT(); int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "DOS_FAT_16") + if(partitions[j].PartitionType == "Microsoft Basic data") { part = j; break; diff --git a/DiscImageChef.Tests/Filesystems/FAT16_MBR.cs b/DiscImageChef.Tests/Filesystems/FAT16_MBR.cs index 882bff43f..dc3c27753 100644 --- a/DiscImageChef.Tests/Filesystems/FAT16_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/FAT16_MBR.cs @@ -63,7 +63,7 @@ namespace DiscImageChef.Tests.Filesystems "win10.vdi.lz", "win2000.vdi.lz", "win95osr2.1.vdi.lz", "win95osr2.5.vdi.lz", "win95osr2.vdi.lz", "win95.vdi.lz", "win98se.vdi.lz", "win98.vdi.lz", "winme.vdi.lz", "winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", "winnt_3.51.vdi.lz", - "winnt_4.00.vdi.lz", "winvista.vdi.lz", "beos_r4.5.vdi.lz" + "winnt_4.00.vdi.lz", "winvista.vdi.lz", "beos_r4.5.vdi.lz", "linux.vdi.lz", }; readonly ulong[] sectors = { @@ -79,7 +79,7 @@ namespace DiscImageChef.Tests.Filesystems 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, - 1024000, 1024000, 1024000, + 1024000, 1024000, 1024000, 262144, }; readonly uint[] sectorsize = { @@ -95,7 +95,7 @@ namespace DiscImageChef.Tests.Filesystems 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, - 512, 512, 512, + 512, 512, 512, 512, }; readonly long[] clusters = { @@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Filesystems 63864, 63252, 63941, 63941, 63941, 63941, 63998, 63998, 63998, 63941, 63998, 63998, - 63941, 63616, 63996, + 63941, 63616, 63996, 65024, }; readonly int[] clustersize = { @@ -127,11 +127,7 @@ namespace DiscImageChef.Tests.Filesystems 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, - 8192, 8192, 8192, 8192, - 8192, 8192, 8192, 8192, - 8192, 8192, 8192, 8192, - 8192, 8192, 8192, 8192, - 8192, 8192, 8192, + 8192, 8192, 8192, 2048, }; readonly string[] volumename = { @@ -147,7 +143,7 @@ namespace DiscImageChef.Tests.Filesystems "NO NAME ","NO NAME ","VOLUMELABEL","VOLUMELABEL", "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", "VOLUMELABEL","NO NAME ","NO NAME ","NO NAME ", - "NO NAME ","NO NAME ","NO NAME ", + "NO NAME ","NO NAME ","NO NAME ","VolumeLabel", }; readonly string[] volumeserial = { @@ -163,7 +159,7 @@ namespace DiscImageChef.Tests.Filesystems "DAF97911","305637BD","275B0DE4","09650DFC", "38270D18","2E620D0C","0B4F0EED","0E122464", "3B5F0F02","C84CB6F2","D0E9AD4E","C039A2EC", - "501F9FA6","9AAA4216","00000000", + "501F9FA6","9AAA4216","00000000","A132D985", }; readonly string[] oemid = { @@ -179,7 +175,7 @@ namespace DiscImageChef.Tests.Filesystems "MSDOS5.0", "MSDOS5.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSDOS5.0", "MSDOS5.0", "MSDOS5.0", - "MSDOS5.0", "MSDOS5.0", "BeOS ", + "MSDOS5.0", "MSDOS5.0", "BeOS ", "mkfs.fat", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/FAT32_APM.cs b/DiscImageChef.Tests/Filesystems/FAT32_APM.cs index f33cadbc6..b96af8ccf 100644 --- a/DiscImageChef.Tests/Filesystems/FAT32_APM.cs +++ b/DiscImageChef.Tests/Filesystems/FAT32_APM.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : FAT16_APM.cs +// Filename : FAT32_APM.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,14 +48,14 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class FAT16_APM + public class FAT32_APM { readonly string[] testfiles = { "macosx.vdi.lz", }; readonly ulong[] sectors = { - 1024000, + 4194304, }; readonly uint[] sectorsize = { @@ -63,19 +63,19 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 63995, + 524278, }; readonly int[] clustersize = { - 8192, + 4096, }; readonly string[] volumename = { - "VOLUMELABEL", + null, }; readonly string[] volumeserial = { - "063D1F09", + "35BD1F0A", }; readonly string[] oemid = { @@ -87,7 +87,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat16_apm", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat32_apm", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "DOS_FAT_16") + if(partitions[j].PartitionType == "DOS_FAT_32") { part = j; break; @@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("FAT16", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("FAT32", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/FAT32_GPT.cs b/DiscImageChef.Tests/Filesystems/FAT32_GPT.cs index 0f75de483..22cf0bb3d 100644 --- a/DiscImageChef.Tests/Filesystems/FAT32_GPT.cs +++ b/DiscImageChef.Tests/Filesystems/FAT32_GPT.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : FAT16_GPT.cs +// Filename : FAT32_GPT.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,14 +48,14 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class FAT16_GPT + public class FAT32_GPT { readonly string[] testfiles = { "macosx.vdi.lz", }; readonly ulong[] sectors = { - 1024000, + 4194304, }; readonly uint[] sectorsize = { @@ -63,19 +63,19 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 63995, + 523775, }; readonly int[] clustersize = { - 8192, + 4096, }; readonly string[] volumename = { - "VOLUMELABEL", + null, }; readonly string[] volumeserial = { - "2E8A1F1B", + "7ABE1F1B", }; readonly string[] oemid = { @@ -87,7 +87,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat16_gpt", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat32_gpt", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("FAT16", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("FAT32", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/FAT32_MBR.cs b/DiscImageChef.Tests/Filesystems/FAT32_MBR.cs index 3083e7cc4..9cd587e10 100644 --- a/DiscImageChef.Tests/Filesystems/FAT32_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/FAT32_MBR.cs @@ -54,56 +54,56 @@ namespace DiscImageChef.Tests.Filesystems "drdos_7.03.vdi.lz", "drdos_8.00.vdi.lz", "msdos_7.10.vdi.lz", "macosx.vdi.lz", "win10.vdi.lz", "win2000.vdi.lz", "win95osr2.1.vdi.lz", "win95osr2.5.vdi.lz", "win95osr2.vdi.lz", "win98se.vdi.lz", "win98.vdi.lz", "winme.vdi.lz", - "winvista.vdi.lz", "beos_r4.5.vdi.lz" + "winvista.vdi.lz", "beos_r4.5.vdi.lz", "linux.vdi.lz", }; readonly ulong[] sectors = { 8388608, 8388608, 8388608, 4194304, 4194304, 8388608, 4194304, 4194304, 4194304, 4194304, 4194304, 4194304, - 4194304, 4194304, + 4194304, 4194304, 262144, }; readonly uint[] sectorsize = { 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, - 512, 512, + 512, 512, 512, }; readonly long[] clusters = { 1048233, 1048233, 1048233, 524287, 524016, 1048233, 524152, 524152, 524152, 524112, 524112, 524112, - 523520, 1048560, + 523520, 1048560, 260096, }; readonly int[] clustersize = { 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, - 4096, 2048, + 4096, 2048, 512 }; readonly string[] volumename = { null,null,null,null, null,null,null,null, null,null,null,null, - null,null, + null,null,null, }; readonly string[] volumeserial = { "5955996C","1BFB1A43","3B331809","42D51EF1", "48073346","EC62E6DE","2A310DE4","0C140DFC", "3E310D18","0D3D0EED","0E131162","3F500F02", - "82EB4C04","00000000", + "82EB4C04","00000000","B488C502" }; readonly string[] oemid = { "DRDOS7.X", "IBM 7.1", "MSWIN4.1", "BSD 4.4", "MSDOS5.0", "MSDOS5.0", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", "MSWIN4.1", - "MSDOS5.0", "BeOS ", + "MSDOS5.0", "BeOS ", "mkfs.fat", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs b/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs index 43e55f045..c1f13d642 100644 --- a/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs +++ b/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs @@ -35,13 +35,87 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; +using System.Collections.Generic; +using System.IO; +using DiscImageChef.CommonTypes; +using DiscImageChef.DiscImages; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; +using DiscImageChef.ImagePlugins; +using DiscImageChef.PartPlugins; +using NUnit.Framework; + namespace DiscImageChef.Tests.Filesystems { + [TestFixture] public class HFSPlus_APM { - public HFSPlus_APM() + readonly string[] testfiles = { + "macosx.vdi.lz", "macosx_journal.vdi.lz", + }; + + readonly ulong[] sectors = { + 409600, 614400, + }; + + readonly uint[] sectorsize = { + 512, 512 + }; + + readonly long[] clusters = { + 51190, 76790, + }; + + readonly int[] clustersize = { + 4096, 4096, + }; + + readonly string[] volumename = { + "Volume label","Volume label", + }; + + readonly string[] volumeserial = { + "UNKNOWN","UNKNOWN", + }; + + readonly string[] oemid = { + "10.0","HFSJ" + }; + + [Test] + public void Test() { + for(int i = 0; i < testfiles.Length; i++) + { + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsplus_apm", testfiles[i]); + Filter filter = new LZip(); + filter.Open(location); + ImagePlugin image = new VDI(); + Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); + Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); + PartPlugin parts = new AppleMap(); + Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); + Filesystem fs = new DiscImageChef.Filesystems.AppleHFSPlus(); + int part = -1; + for(int j = 0; j < partitions.Count; j++) + { + if(partitions[j].PartitionType == "Apple_HFS") + { + part = j; + break; + } + } + Assert.AreNotEqual(-1, part, "Partition not found"); + Assert.AreEqual(true, fs.Identify(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1), testfiles[i]); + fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); + Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); + Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); + Assert.AreEqual("HFS+", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + } } } } diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs b/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs index 46c6a6d8c..ee83fbfb4 100644 --- a/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs +++ b/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs @@ -35,13 +35,87 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; +using System.Collections.Generic; +using System.IO; +using DiscImageChef.CommonTypes; +using DiscImageChef.DiscImages; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; +using DiscImageChef.ImagePlugins; +using DiscImageChef.PartPlugins; +using NUnit.Framework; + namespace DiscImageChef.Tests.Filesystems { + [TestFixture] public class HFSPlus_GPT { - public HFSPlus_GPT() + readonly string[] testfiles = { + "macosx.vdi.lz", "macosx_journal.vdi.lz", + }; + + readonly ulong[] sectors = { + 409600, 614400, + }; + + readonly uint[] sectorsize = { + 512, 512 + }; + + readonly long[] clusters = { + 51190, 76790, + }; + + readonly int[] clustersize = { + 4096, 4096, + }; + + readonly string[] volumename = { + "Volume label","Volume label", + }; + + readonly string[] volumeserial = { + "UNKNOWN","UNKNOWN", + }; + + readonly string[] oemid = { + "10.0","HFSJ" + }; + + [Test] + public void Test() { + for(int i = 0; i < testfiles.Length; i++) + { + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsplus_gpt", testfiles[i]); + Filter filter = new LZip(); + filter.Open(location); + ImagePlugin image = new VDI(); + Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); + Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); + PartPlugin parts = new GuidPartitionTable(); + Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); + Filesystem fs = new DiscImageChef.Filesystems.AppleHFSPlus(); + int part = -1; + for(int j = 0; j < partitions.Count; j++) + { + if(partitions[j].PartitionType == "Apple HFS") + { + part = j; + break; + } + } + Assert.AreNotEqual(-1, part, "Partition not found"); + Assert.AreEqual(true, fs.Identify(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1), testfiles[i]); + fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); + Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); + Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); + Assert.AreEqual("HFS+", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + } } } } diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs b/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs index bd423782d..d0459920c 100644 --- a/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : BeFS_MBR.cs +// Filename : HFSPlus_MBR.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,38 +48,38 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class BeFS_MBR + public class HFSPlus_MBR { readonly string[] testfiles = { - "beos_r3.1.vdi.lz", "beos_r4.5.vdi.lz", + "macosx.vdi.lz", "macosx_journal.vdi.lz", "linux.vdi.lz", "linux_journal.vdi.lz", }; readonly ulong[] sectors = { - 1572864, 1572864, + 303104, 352256, 262144, 262144, }; readonly uint[] sectorsize = { - 512, 512, + 512, 512, 512, 512, }; readonly long[] clusters = { - 786400, 785232, + 37878, 44021, 32512, 32512, }; readonly int[] clustersize = { - 1024, 1024, + 4096, 4096, 4096, 4096, }; readonly string[] volumename = { - "Volume label","Volume label", + "Volume label","Volume label","Volume label","Volume label", }; readonly string[] volumeserial = { - null,null, + "UNKNOWN","UNKNOWN","0000000000000000","0000000000000000", }; readonly string[] oemid = { - null,null, + "10.0","HFSJ","10.0","10.0", }; [Test] @@ -87,7 +87,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "befs_mbr", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsplus_mbr", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -96,11 +96,11 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.BeFS(); + Filesystem fs = new DiscImageChef.Filesystems.AppleHFSPlus(); int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "0xEB") + if(partitions[j].PartitionType == "0xAF") { part = j; break; @@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("BeFS", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("HFS+", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/HFSX_APM.cs b/DiscImageChef.Tests/Filesystems/HFSX_APM.cs index c2978eb9e..ff0ff726f 100644 --- a/DiscImageChef.Tests/Filesystems/HFSX_APM.cs +++ b/DiscImageChef.Tests/Filesystems/HFSX_APM.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : HFSPlus_APM.cs +// Filename : HFSX_APM.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,14 +48,14 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class HFSPlus_APM + public class HFSX_APM { readonly string[] testfiles = { "macosx.vdi.lz", "macosx_journal.vdi.lz", }; readonly ulong[] sectors = { - 1572864, 1024000, + 819200, 1228800, }; readonly uint[] sectorsize = { @@ -63,7 +63,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 51190, 76790, + 102390, 153590, }; readonly int[] clustersize = { @@ -87,7 +87,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsplus_apm", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsx_apm", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -100,7 +100,7 @@ namespace DiscImageChef.Tests.Filesystems int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "Apple_HFS") + if(partitions[j].PartitionType == "Apple_HFSX") { part = j; break; @@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("HFS+", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("HFSX", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs b/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs index 3212ac065..afeaac5c6 100644 --- a/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs +++ b/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : HFSPlus_GPT.cs +// Filename : HFSX_GPT.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,14 +48,14 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class HFSPlus_GPT + public class HFSX_GPT { readonly string[] testfiles = { "macosx.vdi.lz", "macosx_journal.vdi.lz", }; readonly ulong[] sectors = { - 1572864, 1024000, + 819200, 1228800, }; readonly uint[] sectorsize = { @@ -63,7 +63,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 51190, 76790, + 102390, 153590, }; readonly int[] clustersize = { @@ -87,7 +87,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsplus_apm", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsx_apm", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("HFS+", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("HFSX", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs b/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs index 50ad2353e..4e4fbda61 100644 --- a/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : BeFS_MBR.cs +// Filename : HFSX_MBR.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,38 +48,38 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class HFSPlus_MBR + public class HFSX_MBR { readonly string[] testfiles = { - "macosx.vdi.lz", "macosx_journal.vdi.lz", + "macosx.vdi.lz", "macosx_journal.vdi.lz", "linux.vdi.lz", "linux_journal.vdi.lz", }; readonly ulong[] sectors = { - 1572864, 1572864, + 393216, 409600, 262144, 262144, }; readonly uint[] sectorsize = { - 512, 512, + 512, 512, 512, 512, }; readonly long[] clusters = { - 37878, 44021, + 102390, 153590, 32512, 32512, }; readonly int[] clustersize = { - 4096, 4096, + 4096, 4096, 4096, 4096 }; readonly string[] volumename = { - "Volume label","Volume label", + "Volume label", "Volume label", "Volume label", "Volume label", }; readonly string[] volumeserial = { - "UNKNOWN","UNKNOWN", + "UNKNOWN","UNKNOWN","0000000000000000","0000000000000000" }; readonly string[] oemid = { - "10.0","HFSJ", + "10.0","HFSJ","10.0","10.0" }; [Test] @@ -87,7 +87,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsplus_mbr", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsx_mbr", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -111,7 +111,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("HFS+", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("HFSX", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/HFS_MBR.cs b/DiscImageChef.Tests/Filesystems/HFS_MBR.cs index 394ffa3b5..e7659623a 100644 --- a/DiscImageChef.Tests/Filesystems/HFS_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/HFS_MBR.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : HFSPlus_MBR.cs +// Filename : HFS_MBR.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,38 +48,34 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class HFSPlus_MBR + public class HFS_MBR { readonly string[] testfiles = { - "macosx.vdi.lz", "macosx_journal.vdi.lz", + "linux.vdi.lz", }; readonly ulong[] sectors = { - 303104, 352256, + 262144, }; readonly uint[] sectorsize = { - 512, 512, + 512, }; readonly long[] clusters = { - 37878, 44021, + 65018, }; readonly int[] clustersize = { - 4096, 4096, + 2048, }; readonly string[] volumename = { - "Volume label","Volume label", + "Volume label", }; readonly string[] volumeserial = { - "UNKNOWN","UNKNOWN", - }; - - readonly string[] oemid = { - "10.0","HFSJ", + "0000000000000000", }; [Test] @@ -96,7 +92,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.AppleHFSPlus(); + Filesystem fs = new DiscImageChef.Filesystems.AppleHFS(); int part = -1; for(int j = 0; j < partitions.Count; j++) { @@ -111,10 +107,9 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("HFS+", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("HFS", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); - Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/JFS2.cs b/DiscImageChef.Tests/Filesystems/JFS2.cs index 44e02391d..57728e852 100644 --- a/DiscImageChef.Tests/Filesystems/JFS2.cs +++ b/DiscImageChef.Tests/Filesystems/JFS2.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : btrfs.cs +// Filename : JFS2.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,34 +48,34 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class btrfs + public class JFS2 { readonly string[] testfiles = { - "linux.vdi.lz", + "linux.vdi.lz","linux_caseinsensitive.vdi.lz", }; readonly ulong[] sectors = { - 262144, + 262144, 262144, }; readonly uint[] sectorsize = { - 512, + 512, 512, }; readonly long[] clusters = { - 32512, + 257632, 257632, }; readonly int[] clustersize = { - 4096, + 4096, 4096, }; readonly string[] volumename = { - "VolumeLabel", + "Volume labe", "Volume labe", }; readonly string[] volumeserial = { - "a4fc5201-85cc-6840-8a68-998cab9ae897", + "8033b783-0cd1-1645-8ecc-f8f113ad6a47", "d6cd91e9-3899-7e40-8468-baab688ee2e2", }; [Test] @@ -83,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "btrfs", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "jfs2", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -92,11 +92,11 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.BTRFS(); + Filesystem fs = new DiscImageChef.Filesystems.JFS(); int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "0x83") + if(partitions[j].PartitionType == "0x83" || partitions[j].PartitionType == "0x07") { part = j; break; @@ -107,7 +107,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("B-tree file system", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("JFS filesystem", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); } diff --git a/DiscImageChef.Tests/Filesystems/LisaFS.cs b/DiscImageChef.Tests/Filesystems/LisaFS.cs index 40dec14a7..bd866ee07 100644 --- a/DiscImageChef.Tests/Filesystems/LisaFS.cs +++ b/DiscImageChef.Tests/Filesystems/LisaFS.cs @@ -35,13 +35,88 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; +using System.IO; +using DiscImageChef.CommonTypes; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; +using DiscImageChef.ImagePlugins; +using NUnit.Framework; + namespace DiscImageChef.Tests.Filesystems { + [TestFixture] public class LisaFS { - public LisaFS() + readonly string[] testfiles = { + "166files.dc42.lz", "222files.dc42.lz", "blank2.0.dc42.lz", "blank-disk.dc42.lz", "file-with-a-password.dc42.lz", + "tfwdndrc-has-been-erased.dc42.lz", "tfwdndrc-has-been-restored.dc42.lz", "three-empty-folders.dc42.lz", + "three-folders-with-differently-named-docs.dc42.lz", + "three-folders-with-differently-named-docs-root-alphabetical.dc42.lz", + "three-folders-with-differently-named-docs-root-chronological.dc42.lz", + "three-folders-with-identically-named-docs.dc42.lz", + }; + + readonly MediaType[] mediatypes = { + MediaType.AppleSonySS,MediaType.AppleSonySS,MediaType.AppleSonySS,MediaType.AppleSonySS, + MediaType.AppleSonySS,MediaType.AppleSonySS,MediaType.AppleSonySS,MediaType.AppleSonySS, + MediaType.AppleSonySS,MediaType.AppleSonySS,MediaType.AppleSonySS,MediaType.AppleSonySS, + }; + + readonly ulong[] sectors = { + 800, 800, 800, 800, 800, 800, 800, 800, 800, 800, 800, 800, + }; + + readonly uint[] sectorsize = { + 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, + }; + + readonly long[] clusters = { + 800, 800, 792, 800, 800, 800, 800, 800, 800, 800, 800, 800, + }; + + readonly int[] clustersize = { + 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, + }; + + readonly string[] volumename = { + "166Files", "222Files", "AOS 4:59 pm 10/02/87", "AOS 3.0", + "AOS 3.0", "AOS 3.0", "AOS 3.0", "AOS 3.0", + "AOS 3.0", "AOS 3.0", "AOS 3.0", "AOS 3.0", + }; + + readonly string[] volumeserial = { + "A23703A202010663", "A23703A201010663", "A32D261301010663", "A22CB48D01010663", + "A22CC3A702010663", "A22CB48D14010663", "A22CB48D14010663", "A22CB48D01010663", + "A22CB48D01010663", "A22CB48D01010663", "A22CB48D01010663", "A22CB48D01010663", + }; + + readonly string[] oemid = { + null, null, null, null, null, null, null, null, null, null, null, null, + }; + + [Test] + public void Test() { + for(int i = 0; i < testfiles.Length; i++) + { + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "lisafs", testfiles[i]); + Filter filter = new LZip(); + filter.Open(location); + ImagePlugin image = new DiskCopy42(); + Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(mediatypes[i], image.ImageInfo.mediaType, testfiles[i]); + Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); + Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); + Filesystem fs = new DiscImageChef.Filesystems.LisaFS.LisaFS(); + Assert.AreEqual(true, fs.Identify(image, 0, image.ImageInfo.sectors - 1), testfiles[i]); + fs.GetInformation(image, 0, image.ImageInfo.sectors - 1, out string information); + Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); + Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); + Assert.AreEqual("LisaFS", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + } } } } diff --git a/DiscImageChef.Tests/Filesystems/Locus.cs b/DiscImageChef.Tests/Filesystems/Locus.cs index 0b6c4638e..b75c0c487 100644 --- a/DiscImageChef.Tests/Filesystems/Locus.cs +++ b/DiscImageChef.Tests/Filesystems/Locus.cs @@ -41,1420 +41,47 @@ using DiscImageChef.Filesystems; using DiscImageChef.Filters; using DiscImageChef.ImagePlugins; using NUnit.Framework; +using System; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class FAT12 + public class Locus { readonly string[] testfiles = { - // Concurrent DOS 6.00 - "concurrentdos_6.00_dshd.img.lz", "concurrentdos_6.00_mf2dd.img.lz", "concurrentdos_6.00_mf2hd.img.lz", - // DR-DOS 3.40 - "drdos_3.40_dsdd.img.lz", "drdos_3.40_dsdd8.img.lz", "drdos_3.40_dshd.img.lz", "drdos_3.40_mf2dd.img.lz", - "drdos_3.40_mf2hd.img.lz", "drdos_3.40_ssdd.img.lz", "drdos_3.40_ssdd8.img.lz", - // DR-DOS 3.41 - "drdos_3.41_dsdd.img.lz", "drdos_3.41_dsdd8.img.lz", "drdos_3.41_dshd.img.lz", "drdos_3.41_mf2dd.img.lz", - "drdos_3.41_mf2hd.img.lz", "drdos_3.41_ssdd.img.lz", "drdos_3.41_ssdd8.img.lz", - // DR-DOS 5.00 - "drdos_5.00_dsdd.img.lz", "drdos_5.00_dsdd8.img.lz", "drdos_5.00_dshd.img.lz", "drdos_5.00_mf2dd.img.lz", - "drdos_5.00_mf2hd.img.lz", "drdos_5.00_ssdd.img.lz", "drdos_5.00_ssdd8.img.lz", - // DR-DOS 6.00 - "drdos_6.00_dsdd.img.lz", "drdos_6.00_dsdd8.img.lz", "drdos_6.00_dshd.img.lz", "drdos_6.00_mf2dd.img.lz", - "drdos_6.00_mf2ed.img.lz", "drdos_6.00_mf2hd.img.lz", "drdos_6.00_ssdd.img.lz", "drdos_6.00_ssdd8.img.lz", - // DR-DOS 7.02 - "drdos_7.02_dsdd.img.lz", "drdos_7.02_dsdd8.img.lz", "drdos_7.02_dshd.img.lz", "drdos_7.02_mf2dd.img.lz", - "drdos_7.02_mf2ed.img.lz", "drdos_7.02_mf2hd.img.lz", "drdos_7.02_ssdd.img.lz", "drdos_7.02_ssdd8.img.lz", - // DR-DOS 7.03 - "drdos_7.03_dsdd.img.lz", "drdos_7.03_dsdd8.img.lz", "drdos_7.03_dshd.img.lz", "drdos_7.03_mf2dd.img.lz", - "drdos_7.03_mf2ed.img.lz", "drdos_7.03_mf2hd.img.lz", - // DR-DOS 8.00 - "drdos_8.00_dsdd.img.lz", "drdos_8.00_dsdd8.img.lz", "drdos_8.00_dshd.img.lz", "drdos_8.00_mf2dd.img.lz", - "drdos_8.00_mf2ed.img.lz", "drdos_8.00_mf2hd.img.lz", "drdos_8.00_ssdd.img.lz", "drdos_8.00_ssdd8.img.lz", - // MS-DOS 3.30A - "msdos_3.30A_dsdd.img.lz","msdos_3.30A_dsdd8.img.lz","msdos_3.30A_dshd.img.lz","msdos_3.30A_mf2dd.img.lz", - "msdos_3.30A_mf2ed.img.lz","msdos_3.30A_mf2hd.img.lz","msdos_3.30A_ssdd.img.lz","msdos_3.30A_ssdd8.img.lz", - // MS-DOS 3.31 - "msdos_3.31_dsdd.img.lz","msdos_3.31_dsdd8.img.lz","msdos_3.31_dshd.img.lz","msdos_3.31_mf2dd.img.lz", - "msdos_3.31_mf2ed.img.lz","msdos_3.31_mf2hd.img.lz","msdos_3.31_ssdd.img.lz","msdos_3.31_ssdd8.img.lz", - // MS-DOS 4.01 - "msdos_4.01_dsdd.img.lz","msdos_4.01_dsdd8.img.lz","msdos_4.01_dshd.img.lz","msdos_4.01_mf2dd.img.lz", - "msdos_4.01_mf2hd.img.lz","msdos_4.01_ssdd.img.lz","msdos_4.01_ssdd8.img.lz", - // MS-DOS 5.00 - "msdos_5.00_dsdd.img.lz","msdos_5.00_dsdd8.img.lz","msdos_5.00_dshd.img.lz","msdos_5.00_mf2dd.img.lz", - "msdos_5.00_mf2ed.img.lz","msdos_5.00_mf2hd.img.lz","msdos_5.00_ssdd.img.lz","msdos_5.00_ssdd8.img.lz", - // MS-DOS 6.00 - "msdos_6.00_dsdd.img.lz","msdos_6.00_dsdd8.img.lz","msdos_6.00_dshd.img.lz","msdos_6.00_mf2dd.img.lz", - "msdos_6.00_mf2ed.img.lz","msdos_6.00_mf2hd.img.lz","msdos_6.00_ssdd.img.lz","msdos_6.00_ssdd8.img.lz", - // MS-DOS 6.20 - "msdos_6.20_dsdd.img.lz","msdos_6.20_dsdd8.img.lz","msdos_6.20_dshd.img.lz","msdos_6.20_mf2dd.img.lz", - "msdos_6.20_mf2ed.img.lz","msdos_6.20_mf2hd.img.lz","msdos_6.20_ssdd.img.lz","msdos_6.20_ssdd8.img.lz", - // MS-DOS 6.20 RC1 - "msdos_6.20rc1_dsdd.img.lz","msdos_6.20rc1_dsdd8.img.lz","msdos_6.20rc1_dshd.img.lz","msdos_6.20rc1_mf2dd.img.lz", - "msdos_6.20rc1_mf2ed.img.lz","msdos_6.20rc1_mf2hd.img.lz","msdos_6.20rc1_ssdd.img.lz","msdos_6.20rc1_ssdd8.img.lz", - // MS-DOS 6.21 - "msdos_6.21_dsdd.img.lz","msdos_6.21_dsdd8.img.lz","msdos_6.21_dshd.img.lz","msdos_6.21_mf2dd.img.lz", - "msdos_6.21_mf2ed.img.lz","msdos_6.21_mf2hd.img.lz","msdos_6.21_ssdd.img.lz","msdos_6.21_ssdd8.img.lz", - // MS-DOS 6.22 - "msdos_6.22_dsdd.img.lz","msdos_6.22_dsdd8.img.lz","msdos_6.22_dshd.img.lz","msdos_6.22_mf2dd.img.lz", - "msdos_6.22_mf2ed.img.lz","msdos_6.22_mf2hd.img.lz","msdos_6.22_ssdd.img.lz","msdos_6.22_ssdd8.img.lz", - // MS-DOS 7.10 - "msdos_7.10_dsdd.img.lz","msdos_7.10_dsdd8.img.lz","msdos_7.10_dshd.img.lz","msdos_7.10_mf2dd.img.lz", - "msdos_7.10_mf2ed.img.lz","msdos_7.10_mf2hd.img.lz","msdos_7.10_ssdd.img.lz","msdos_7.10_ssdd8.img.lz", - // MS-DOS 3.20 for Amstrad - "msdos_amstrad_3.20_dsdd.img.lz","msdos_amstrad_3.20_dsdd8.img.lz","msdos_amstrad_3.20_dshd.img.lz", - "msdos_amstrad_3.20_mf2dd.img.lz","msdos_amstrad_3.20_ssdd.img.lz","msdos_amstrad_3.20_ssdd8.img.lz", - // MS-DOS 2.11 for AT&T - "msdos_att_2.11_dsdd.img.lz", - // MS-DOS 3.30 for DeLL - "msdos_dell_3.30_dsdd.img.lz","msdos_dell_3.30_dsdd8.img.lz","msdos_dell_3.30_dshd.img.lz", - "msdos_dell_3.30_mf2dd.img.lz","msdos_dell_3.30_mf2hd.img.lz","msdos_dell_3.30_ssdd.img.lz", - "msdos_dell_3.30_ssdd8.img.lz", - // MS-DOS 3.10 for Epson - "msdos_epson_3.10_dsdd.img.lz","msdos_epson_3.10_dsdd8.img.lz","msdos_epson_3.10_dshd.img.lz", - // MS-DOS 3.20 for Epson - "msdos_epson_3.20_dsdd.img.lz","msdos_epson_3.20_dsdd8.img.lz","msdos_epson_3.20_dshd.img.lz", - "msdos_epson_3.20_mf2dd.img.lz","msdos_epson_3.20_ssdd.img.lz","msdos_epson_3.20_ssdd8.img.lz", - // MS-DOS 3.20 for HP - "msdos_hp_3.20_dsdd.img.lz","msdos_hp_3.20_dsdd8.img.lz","msdos_hp_3.20_dshd.img.lz", - "msdos_hp_3.20_mf2dd.img.lz","msdos_hp_3.20_mf2hd.img.lz","msdos_hp_3.20_ssdd.img.lz", - "msdos_hp_3.20_ssdd8.img.lz", - // MS-DOS 3.21 for Hyosung - "msdos_hyonsung_3.21_dsdd.img.lz","msdos_hyonsung_3.21_dsdd8.img.lz","msdos_hyonsung_3.21_dshd.img.lz", - "msdos_hyonsung_3.21_mf2dd.img.lz","msdos_hyonsung_3.21_mf2hd.img.lz","msdos_hyonsung_3.21_ssdd.img.lz", - "msdos_hyonsung_3.21_ssdd8.img.lz", - // MS-DOS 3.21 for Kaypro - "msdos_kaypro_3.21_dsdd.img.lz","msdos_kaypro_3.21_dsdd8.img.lz","msdos_kaypro_3.21_dshd.img.lz", - "msdos_kaypro_3.21_mf2dd.img.lz","msdos_kaypro_3.21_mf2hd.img.lz","msdos_kaypro_3.21_ssdd.img.lz", - //"msdos_kaypro_3.21_ssdd8.img.lz", - // MS-DOS 3.10 for Olivetti - "msdos_olivetti_3.10_dsdd.img.lz","msdos_olivetti_3.10_dshd.img.lz","msdos_olivetti_3.10_ssdd.img.lz", - // MS-DOS 3.30 for Toshiba - "msdos_toshiba_3.30_dsdd.img.lz","msdos_toshiba_3.30_dsdd8.img.lz","msdos_toshiba_3.30_dshd.img.lz", - "msdos_toshiba_3.30_mf2dd.img.lz","msdos_toshiba_3.30_mf2hd.img.lz","msdos_toshiba_3.30_ssdd.img.lz", - "msdos_toshiba_3.30_ssdd8.img.lz", - // MS-DOS 4.01 for Toshiba - "msdos_toshiba_4.01_dsdd.img.lz","msdos_toshiba_4.01_dsdd8.img.lz","msdos_toshiba_4.01_dshd.img.lz", - "msdos_toshiba_4.01_mf2dd.img.lz","msdos_toshiba_4.01_mf2hd.img.lz","msdos_toshiba_4.01_ssdd.img.lz", - "msdos_toshiba_4.01_ssdd8.img.lz", - // Novell DOS 7.00 - "novelldos_7.00_dsdd.img.lz","novelldos_7.00_dsdd8.img.lz","novelldos_7.00_dshd.img.lz","novelldos_7.00_mf2dd.img.lz", - "novelldos_7.00_mf2ed.img.lz","novelldos_7.00_mf2hd.img.lz","novelldos_7.00_ssdd.img.lz","novelldos_7.00_ssdd8.img.lz", - // OpenDOS 7.01 - "opendos_7.01_dsdd.img.lz","opendos_7.01_dsdd8.img.lz","opendos_7.01_dshd.img.lz","opendos_7.01_mf2dd.img.lz", - "opendos_7.01_mf2ed.img.lz","opendos_7.01_mf2hd.img.lz","opendos_7.01_ssdd.img.lz","opendos_7.01_ssdd8.img.lz", - // PC-DOS 2.00 - "pcdos_2.00_dsdd.img.lz", - // PC-DOS 2.10 - "pcdos_2.10_dsdd.img.lz", - // PC-DOS 2000 - "pcdos_2000_dsdd.img.lz","pcdos_2000_dsdd8.img.lz","pcdos_2000_dshd.img.lz","pcdos_2000_mf2dd.img.lz", - "pcdos_2000_mf2ed.img.lz","pcdos_2000_mf2hd.img.lz","pcdos_2000_ssdd.img.lz","pcdos_2000_ssdd8.img.lz", - // PC-DOS 3.00 - "pcdos_3.00_dshd.img.lz", - // PC-DOS 3.10 - "pcdos_3.10_dshd.img.lz", - // PC-DOS 3.30 - "pcdos_3.30_dshd.img.lz","pcdos_3.30_mf2hd.img.lz", - // PC-DOS 4.00 - "pcdos_4.00_dshd.img.lz","pcdos_4.00_mf2hd.img.lz", - // PC-DOS 5.00 - "pcdos_5.00_dsdd.img.lz","pcdos_5.00_dsdd8.img.lz","pcdos_5.00_dshd.img.lz","pcdos_5.00_mf2dd.img.lz", - "pcdos_5.00_mf2ed.img.lz","pcdos_5.00_mf2hd.img.lz","pcdos_5.00_ssdd.img.lz","pcdos_5.00_ssdd8.img.lz", - // PC-DOS 5.02 - "pcdos_5.02_dsdd.img.lz","pcdos_5.02_dsdd8.img.lz","pcdos_5.02_dshd.img.lz","pcdos_5.02_mf2dd.img.lz", - "pcdos_5.02_mf2ed.img.lz","pcdos_5.02_mf2hd.img.lz","pcdos_5.02_ssdd.img.lz","pcdos_5.02_ssdd8.img.lz", - // PC-DOS 6.10 - "pcdos_6.10_dsdd.img.lz","pcdos_6.10_dsdd8.img.lz","pcdos_6.10_dshd.img.lz","pcdos_6.10_mf2dd.img.lz", - "pcdos_6.10_mf2ed.img.lz","pcdos_6.10_mf2hd.img.lz","pcdos_6.10_ssdd.img.lz","pcdos_6.10_ssdd8.img.lz", - // PC-DOS 6.30 - "pcdos_6.30_dsdd.img.lz","pcdos_6.30_dsdd8.img.lz","pcdos_6.30_dshd.img.lz","pcdos_6.30_mf2dd.img.lz", - "pcdos_6.30_mf2ed.img.lz","pcdos_6.30_mf2hd.img.lz","pcdos_6.30_ssdd.img.lz","pcdos_6.30_ssdd8.img.lz", - // mkfs.vfat - "mkfs.vfat_dshd.img.lz","mkfs.vfat_mf2dd.img.lz","mkfs.vfat_mf2ed.img.lz","mkfs.vfat_mf2hd.img.lz", - // mkfs.vfat for Atari - "mkfs.vfat_atari_dshd.img.lz","mkfs.vfat_atari_mf2dd.img.lz","mkfs.vfat_atari_mf2ed.img.lz","mkfs.vfat_atari_mf2hd.img.lz", - // Microsoft OS/2 1.00 for Tandy - "msos2_1.00_tandy_dsdd.img.lz","msos2_1.00_tandy_dshd.img.lz","msos2_1.00_tandy_mf2dd.img.lz","msos2_1.00_tandy_mf2hd.img.lz", - // Microsoft OS/2 1.10 for AST - "msos2_1.10_ast_dsdd.img.lz","msos2_1.10_ast_dshd.img.lz","msos2_1.10_ast_mf2dd.img.lz","msos2_1.10_ast_mf2hd.img.lz", - // Microsoft OS/2 1.10 for Nokia - "msos2_1.10_nokia_dsdd.img.lz","msos2_1.10_nokia_dshd.img.lz","msos2_1.10_nokia_mf2dd.img.lz","msos2_1.10_nokia_mf2hd.img.lz", - // Microsoft OS/2 1.21 - "msos2_1.21_dsdd.img.lz","msos2_1.21_dshd.img.lz","msos2_1.21_mf2dd.img.lz","msos2_1.21_mf2hd.img.lz", - // Microsoft OS/2 1.30.1 - "msos2_1.30.1_dsdd.img.lz","msos2_1.30.1_dshd.img.lz","msos2_1.30.1_mf2dd.img.lz","msos2_1.30.1_mf2ed.img.lz","msos2_1.30.1_mf2hd.img.lz", - // OS/2 1.20 - "os2_1.20_dsdd.img.lz","os2_1.20_dshd.img.lz","os2_1.20_mf2dd.img.lz","os2_1.20_mf2hd.img.lz", - // OS/2 1.30 - "os2_1.30_dsdd.img.lz","os2_1.30_dshd.img.lz","os2_1.30_mf2dd.img.lz","os2_1.30_mf2hd.img.lz", - // OS/2 2.00 - "os2_6.307_dsdd.img.lz","os2_6.307_dshd.img.lz","os2_6.307_mf2dd.img.lz","os2_6.307_mf2ed.img.lz","os2_6.307_mf2hd.img.lz", - // OS/2 2.10 - "os2_6.514_dsdd.img.lz","os2_6.514_dshd.img.lz","os2_6.514_mf2dd.img.lz","os2_6.514_mf2ed.img.lz","os2_6.514_mf2hd.img.lz", - // OS/2 2.11 - "os2_6.617_dsdd.img.lz","os2_6.617_dshd.img.lz","os2_6.617_mf2dd.img.lz","os2_6.617_mf2ed.img.lz","os2_6.617_mf2hd.img.lz", - // OS/2 Warp 3 - "os2_8.162_dshd.img.lz","os2_8.162_mf2dd.img.lz","os2_8.162_mf2ed.img.lz","os2_8.162_mf2hd.img.lz", - // OS/2 Warp 4 - "os2_9.023_dshd.img.lz","os2_9.023_mf2dd.img.lz","os2_9.023_mf2ed.img.lz","os2_9.023_mf2hd.img.lz", - // eComStation - "ecs_dshd.img.lz","ecs_mf2dd.img.lz","ecs_mf2ed.img.lz","ecs_mf2hd.img.lz", - // Windows 95 - "win95_dsdd8.img.lz","win95_dsdd.img.lz","win95_dshd.img.lz","win95_mf2dd.img.lz", - "win95_mf2ed.img.lz","win95_mf2hd.img.lz","win95_ssdd8.img.lz","win95_ssdd.img.lz", - // Windows 95 OSR 2 - "win95osr2_dsdd8.img.lz","win95osr2_dsdd.img.lz","win95osr2_dshd.img.lz","win95osr2_mf2dd.img.lz", - "win95osr2_mf2ed.img.lz","win95osr2_mf2hd.img.lz","win95osr2_ssdd8.img.lz","win95osr2_ssdd.img.lz", - /// Windows 95 OSR 2.1 - "win95osr2.1_dsdd8.img.lz","win95osr2.1_dsdd.img.lz","win95osr2.1_dshd.img.lz","win95osr2.1_mf2dd.img.lz", - "win95osr2.1_mf2ed.img.lz","win95osr2.1_mf2hd.img.lz","win95osr2.1_ssdd8.img.lz","win95osr2.1_ssdd.img.lz", - // Windows 95 OSR 2.5 - "win95osr2.5_dsdd8.img.lz","win95osr2.5_dsdd.img.lz","win95osr2.5_dshd.img.lz","win95osr2.5_mf2dd.img.lz", - "win95osr2.5_mf2ed.img.lz","win95osr2.5_mf2hd.img.lz","win95osr2.5_ssdd8.img.lz","win95osr2.5_ssdd.img.lz", - // Windows 98 - "win98_dsdd8.img.lz","win98_dsdd.img.lz","win98_dshd.img.lz","win98_mf2dd.img.lz", - "win98_mf2ed.img.lz","win98_mf2hd.img.lz","win98_ssdd8.img.lz","win98_ssdd.img.lz", - // Windows 98 Second Edition - "win98se_dsdd8.img.lz","win98se_dsdd.img.lz","win98se_dshd.img.lz","win98se_mf2dd.img.lz", - "win98se_mf2ed.img.lz","win98se_mf2hd.img.lz","win98se_ssdd8.img.lz","win98se_ssdd.img.lz", - // Windows Me - "winme_dsdd.img.lz","winme_dshd.img.lz","winme_mf2dd.img.lz","winme_mf2ed.img.lz","winme_mf2hd.img.lz", - // Windows NT 3.10 - "winnt_3.10_dshd.img.lz","winnt_3.10_mf2dd.img.lz","winnt_3.10_mf2ed.img.lz","winnt_3.10_mf2hd.img.lz", - // Windows NT 3.50 - "winnt_3.50_dshd.img.lz","winnt_3.50_mf2dd.img.lz","winnt_3.50_mf2ed.img.lz","winnt_3.50_mf2hd.img.lz", - // Windows NT 3.51 - "winnt_3.51_dshd.img.lz","winnt_3.51_mf2dd.img.lz","winnt_3.51_mf2ed.img.lz","winnt_3.51_mf2hd.img.lz", - // Windows NT 4.00 - "winnt_4_dsdd.img.lz","winnt_4_dshd.img.lz","winnt_4_mf2dd.img.lz","winnt_4_mf2ed.img.lz", - "winnt_4_mf2hd.img.lz","winnt_4_ssdd.img.lz", - // Windows 2000 - "win2000_dsdd.img.lz","win2000_dshd.img.lz","win2000_mf2dd.img.lz","win2000_mf2ed.img.lz","win2000_mf2hd.img.lz", - // Windows Vista - "winvista_dsdd.img.lz","winvista_dshd.img.lz","winvista_mf2dd.img.lz","winvista_mf2ed.img.lz","winvista_mf2hd.img.lz", - // BeOS R4.5 - "beos_r4.5_mf2hd.img.lz", + "mf2dd.img.lz", "mf2hd.img.lz", }; readonly MediaType[] mediatypes = { - // Concurrent DOS 6.00 - MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, - // DR-DOS 3.40 - MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8, - // DR-DOS 3.41 - MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8, - // DR-DOS 5.00 - MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8, - // DR-DOS 6.00 - MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8, - // DR-DOS 7.02 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // DR-DOS 7.03 - MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // DR-DOS 8.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.30A - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.31 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 4.01 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 5.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 6.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 6.20 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 6.20 RC1 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 6.21 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 6.22 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 7.10 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.20 for Amstrad - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 2.11 for AT&T - MediaType.DOS_525_DS_DD_9, - // MS-DOS 3.30 for DeLL - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.10 for Epson - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD, - // MS-DOS 3.20 for Epson - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.20 for HP - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.21 for Hyosung - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.21 for Kaypro - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.10 for Olivetti - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_525_SS_DD_9, - // MS-DOS 3.30 for Toshiba - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 4.01 for Toshiba - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // Novell DOS 7.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // OpenDOS 7.01 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // PC-DOS 2.00 - MediaType.DOS_525_DS_DD_9, - // PC-DOS 2.10 - MediaType.DOS_525_DS_DD_9, - // PC-DOS 2000 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // PC-DOS 3.00 - MediaType.DOS_525_HD, - // PC-DOS 3.10 - MediaType.DOS_525_HD, - // PC-DOS 3.30 - MediaType.DOS_525_HD,MediaType.DOS_35_HD, - // PC-DOS 4.00 - MediaType.DOS_525_HD,MediaType.DOS_35_HD, - // PC-DOS 5.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // PC-DOS 5.02 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // PC-DOS 6.10 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // PC-DOS 6.30 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // mkfs.vfat - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // mkfs.vfat for Atari - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Microsoft OS/2 1.00 for Tandy - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // Microsoft OS/2 1.10 for AST - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // Microsoft OS/2 1.10 for Nokia - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // Microsoft OS/2 1.21 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // Microsoft OS/2 1.30.1 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // OS/2 1.20 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // OS/2 1.30 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // OS/2 2.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // OS/2 2.10 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // OS/2 2.11 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // OS/2 Warp 3 - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // OS/2 Warp 4 - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // eComStation - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows 95 - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - // Windows 95 OSR 2 - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - /// Windows 95 OSR 2.1 - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - // Windows 95 OSR 2.5 - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - // Windows 98 - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - // Windows 98 Second Edition - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - // Windows Me - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows NT 3.10 - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows NT 3.50 - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows NT 3.51 - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows NT 4.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9, - // Windows 2000 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows Vista - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // BeOS R4.5 - MediaType.DOS_35_HD, + MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, }; readonly ulong[] sectors = { - // Concurrent DOS 6.00 - 2400, 1440, 2880, - // DR-DOS 3.40 - 720, 640, 2400, 1440, 2880, 360, 320, - // DR-DOS 3.41 - 720,640,2400,1440,2880,360,320, - // DR-DOS 5.00 - 720,640,2400,1440,2880,360,320, - // DR-DOS 6.00 - 720,640,2400,1440,5760,2880,360,320, - // DR-DOS 7.02 - 720,640,2400,1440,5760,2880,360,320, - // DR-DOS 7.03 - 720,640,2400,1440,5760,2880, - // DR-DOS 8.00 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 3.30A - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 3.31 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 4.01 - 720,640,2400,1440,2880,360,320, - // MS-DOS 5.00 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 6.00 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 6.20 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 6.20 RC1 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 6.21 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 6.22 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 7.10 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 3.20 for Amstrad - 720,640,2400,1440,360,320, - // MS-DOS 2.11 for AT&T - 720, - // MS-DOS 3.30 for DeLL - 720,640,2400,1440,2880,360,320, - // MS-DOS 3.10 for Epson - 720,640,2400, - // MS-DOS 3.20 for Epson - 720,640,2400,1440,360,320, - // MS-DOS 3.20 for HP - 720,640,2400,1440,2880,360,320, - // MS-DOS 3.21 for Hyosung - 720,640,2400,1440,2880,360,320, - // MS-DOS 3.21 for Kaypro - 720,640,2400,1440,2880,360,320, - // MS-DOS 3.10 for Olivetti - 720,2400,360, - // MS-DOS 3.30 for Toshiba - 720,640,2400,1440,2880,360,320, - // MS-DOS 4.01 for Toshiba - 720,640,2400,1440,2880,360,320, - // Novell DOS 7.00 - 720,640,2400,1440,5760,2880,360,320, - // OpenDOS 7.01 - 720,640,2400,1440,5760,2880,360,320, - // PC-DOS 2.00 - 720, - // PC-DOS 2.10 - 720, - // PC-DOS 2000 - 720,640,2400,1440,5760,2880,360,320, - // PC-DOS 3.00 - 2400, - // PC-DOS 3.10 - 2400, - // PC-DOS 3.30 - 2400,2880, - // PC-DOS 4.00 - 2400,2880, - // PC-DOS 5.00 - 720,640,2400,1440,5760,2880,360,320, - // PC-DOS 5.02 - 720,640,2400,1440,5760,2880,360,320, - // PC-DOS 6.10 - 720,640,2400,1440,5760,2880,360,320, - // PC-DOS 6.30 - 720,640,2400,1440,5760,2880,360,320, - // mkfs.vfat - 2400,1440,5760,2880, - // mkfs.vfat for Atari - 2400,1440,5760,2880, - // Microsoft OS/2 1.00 for Tandy - 720,2400,1440,2880, - // Microsoft OS/2 1.10 for AST - 720,2400,1440,2880, - // Microsoft OS/2 1.10 for Nokia - 720,2400,1440,2880, - // Microsoft OS/2 1.21 - 720,2400,1440,2880, - // Microsoft OS/2 1.30.1 - 720,2400,1440,5760,2880, - // OS/2 1.20 - 720,2400,1440,2880, - // OS/2 1.30 - 720,2400,1440,2880, - // OS/2 2.00 - 720,2400,1440,5760,2880, - // OS/2 2.10 - 720,2400,1440,5760,2880, - // OS/2 2.11 - 720,2400,1440,5760,2880, - // OS/2 Warp 3 - 2400,1440,5760,2880, - // OS/2 Warp 4 - 2400,1440,5760,2880, - // eComStation - 2400,1440,5760,2880, - // Windows 95 - 640,720,2400,1440,5760,2880,320,360, - // Windows 95 OSR 2 - 640,720,2400,1440,5760,2880,320,360, - /// Windows 95 OSR 2.1 - 640,720,2400,1440,5760,2880,320,360, - // Windows 95 OSR 2.5 - 640,720,2400,1440,5760,2880,320,360, - // Windows 98 - 640,720,2400,1440,5760,2880,320,360, - // Windows 98 Second Edition - 640,720,2400,1440,5760,2880,320,360, - // Windows Me - 720,2400,1440,5760,2880, - // Windows NT 3.10 - 2400,1440,5760,2880, - // Windows NT 3.50 - 2400,1440,5760,2880, - // Windows NT 3.51 - 2400,1440,5760,2880, - // Windows NT 4.00 - 720,2400,1440,5760,2880,360, - // Windows 2000 - 720,2400,1440,5760,2880, - // Windows Vista - 720,2400,1440,5760,2880, - // BeOS R4.5 - 2880, + 1440, 2880, }; readonly uint[] sectorsize = { - // Concurrent DOS 6.00 - 512, 512, 512, - // DR-DOS 3.40 - 512, 512, 512, 512, 512, 512, 512, - // DR-DOS 3.41 - 512,512,512,512,512,512,512, - // DR-DOS 5.00 - 512,512,512,512,512,512,512, - // DR-DOS 6.00 - 512,512,512,512,512,512,512,512, - // DR-DOS 7.02 - 512,512,512,512,512,512,512,512, - // DR-DOS 7.03 - 512,512,512,512,512,512, - // DR-DOS 8.00 - 512,512,512,512,512,512,512,512, - // MS-DOS 3.30A - 512,512,512,512,512,512,512,512, - // MS-DOS 3.31 - 512,512,512,512,512,512,512,512, - // MS-DOS 4.01 - 512,512,512,512,512,512,512, - // MS-DOS 5.00 - 512,512,512,512,512,512,512,512, - // MS-DOS 6.00 - 512,512,512,512,512,512,512,512, - // MS-DOS 6.20 - 512,512,512,512,512,512,512,512, - // MS-DOS 6.20 RC1 - 512,512,512,512,512,512,512,512, - // MS-DOS 6.21 - 512,512,512,512,512,512,512,512, - // MS-DOS 6.22 - 512,512,512,512,512,512,512,512, - // MS-DOS 7.10 - 512,512,512,512,512,512,512,512, - // MS-DOS 3.20 for Amstrad - 512,512,512,512,512,512, - // MS-DOS 2.11 for AT&T - 512, - // MS-DOS 3.30 for DeLL - 512,512,512,512,512,512,512, - // MS-DOS 3.10 for Epson - 512,512,512, - // MS-DOS 3.20 for Epson - 512,512,512,512,512,512, - // MS-DOS 3.20 for HP - 512,512,512,512,512,512,512, - // MS-DOS 3.21 for Hyosung - 512,512,512,512,512,512,512, - // MS-DOS 3.21 for Kaypro - 512,512,512,512,512,512,512, - // MS-DOS 3.10 for Olivetti - 512,512,512, - // MS-DOS 3.30 for Toshiba - 512,512,512,512,512,512,512, - // MS-DOS 4.01 for Toshiba - 512,512,512,512,512,512,512, - // Novell DOS 7.00 - 512,512,512,512,512,512,512,512, - // OpenDOS 7.01 - 512,512,512,512,512,512,512,512, - // PC-DOS 2.00 - 512, - // PC-DOS 2.10 - 512, - // PC-DOS 2000 - 512,512,512,512,512,512,512,512, - // PC-DOS 3.00 - 512, - // PC-DOS 3.10 - 512, - // PC-DOS 3.30 - 512,512, - // PC-DOS 4.00 - 512,512, - // PC-DOS 5.00 - 512,512,512,512,512,512,512,512, - // PC-DOS 5.02 - 512,512,512,512,512,512,512,512, - // PC-DOS 6.10 - 512,512,512,512,512,512,512,512, - // PC-DOS 6.30 - 512,512,512,512,512,512,512,512, - // mkfs.vfat - 512,512,512,512, - // mkfs.vfat for Atari - 512,512,512,512, - // Microsoft OS/2 1.00 for Tandy - 512,512,512,512, - // Microsoft OS/2 1.10 for AST - 512,512,512,512, - // Microsoft OS/2 1.10 for Nokia - 512,512,512,512, - // Microsoft OS/2 1.21 - 512,512,512,512, - // Microsoft OS/2 1.30.1 - 512,512,512,512,512, - // OS/2 1.20 - 512,512,512,512, - // OS/2 1.30 - 512,512,512,512, - // OS/2 2.00 - 512,512,512,512,512, - // OS/2 2.10 - 512,512,512,512,512, - // OS/2 2.11 - 512,512,512,512,512, - // OS/2 Warp 3 - 512,512,512,512, - // OS/2 Warp 4 - 512,512,512,512, - // eComStation - 512,512,512,512, - // Windows 95 - 512,512,512,512,512,512,512,512, - // Windows 95 OSR 2 - 512,512,512,512,512,512,512,512, - /// Windows 95 OSR 2.1 - 512,512,512,512,512,512,512,512, - // Windows 95 OSR 2.5 - 512,512,512,512,512,512,512,512, - // Windows 98 - 512,512,512,512,512,512,512,512, - // Windows 98 Second Edition - 512,512,512,512,512,512,512,512, - // Windows Me - 512,512,512,512,512, - // Windows NT 3.10 - 512,512,512,512, - // Windows NT 3.50 - 512,512,512,512, - // Windows NT 3.51 - 512,512,512,512, - // Windows NT 4.00 - 512,512,512,512,512,512, - // Windows 2000 - 512,512,512,512,512, - // Windows Vista - 512,512,512,512,512, - // BeOS R4.5 - 512, + 512, 512, }; readonly long[] clusters = { - // Concurrent DOS 6.00 - 2400, 720, 2880, - // DR-DOS 3.40 - 360,320,2400,720,2880,360,320, - // DR-DOS 3.41 - 360,320,2400,720,2880,360,320, - // DR-DOS 5.00 - 360,320,2400,720,2880,360,320, - // DR-DOS 6.00 - 360,320,2400,720,2880,2880,360,320, - // DR-DOS 7.02 - 360,320,2400,720,2880,2880,360,320, - // DR-DOS 7.03 - 360,320,2400,720,2880,2880, - // DR-DOS 8.00 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 3.30A - 360,320,2400,720,5760,2880,360,320, - // MS-DOS 3.31 - 360,320,2400,720,5760,2880,360,320, - // MS-DOS 4.01 - 360,320,2400,720,2880,360,320, - // MS-DOS 5.00 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 6.00 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 6.20 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 6.20 RC1 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 6.21 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 6.22 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 7.10 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 3.20 for Amstrad - 360,320,2400,720,360,320, - // MS-DOS 2.11 for AT&T - 360, - // MS-DOS 3.30 for DeLL - 360,320,2400,720,2880,360,320, - // MS-DOS 3.10 for Epson - 360,320,2400, - // MS-DOS 3.20 for Epson - 360,320,2400,720,360,320, - // MS-DOS 3.20 for HP - 360,320,2400,720,2880,360,320, - // MS-DOS 3.21 for Hyosung - 360,320,2400,720,2880,360,320, - // MS-DOS 3.21 for Kaypro - 360,320,2400,720,2880,360,320, - // MS-DOS 3.10 for Olivetti - 360,2400,360, - // MS-DOS 3.30 for Toshiba - 360,320,2400,720,2880,360,320, - // MS-DOS 4.01 for Toshiba - 360,320,2400,720,2880,360,320, - // Novell DOS 7.00 - 360,320,2400,720,2880,2880,360,320, - // OpenDOS 7.01 - 360,320,2400,720,2880,2880,360,320, - // PC-DOS 2.00 - 360, - // PC-DOS 2.10 - 360, - // PC-DOS 2000 - 360,320,2400,720,2880,2880,360,320, - // PC-DOS 3.00 - 2400, - // PC-DOS 3.10 - 2400, - // PC-DOS 3.30 - 2400,2880, - // PC-DOS 4.00 - 2400,2880, - // PC-DOS 5.00 - 360,320,2400,720,2880,2880,360,320, - // PC-DOS 5.02 - 360,320,2400,720,2880,2880,360,320, - // PC-DOS 6.10 - 360,320,2400,720,2880,2880,360,320, - // PC-DOS 6.30 - 360,320,2400,720,2880,2880,360,320, - // mkfs.vfat - 2400,720,2880,2880, - // mkfs.vfat for Atari - 1200,720,2880,1440, - // Microsoft OS/2 1.00 for Tandy - 360,2400,720,2880, - // Microsoft OS/2 1.10 for AST - 360,2400,720,2880, - // Microsoft OS/2 1.10 for Nokia - 360,2400,720,2880, - // Microsoft OS/2 1.21 - 360,2400,720,2880, - // Microsoft OS/2 1.30.1 - 360,2400,720,2880,2880, - // OS/2 1.20 - 360,2400,720,2880, - // OS/2 1.30 - 360,2400,720,2880, - // OS/2 2.00 - 360,2400,720,2880,2880, - // OS/2 2.10 - 360,2400,720,2880,2880, - // OS/2 2.11 - 360,2400,720,2880,2880, - // OS/2 Warp 3 - 2400,720,2880,2880, - // OS/2 Warp 4 - 2400,720,2880,2880, - // eComStation - 2400,720,2880,2880, - // Windows 95 - 320,360,2400,720,2880,2880,320,360, - // Windows 95 OSR 2 - 320,360,2400,720,2880,2880,320,360, - /// Windows 95 OSR 2.1 - 320,360,2400,720,2880,2880,320,360, - // Windows 95 OSR 2.5 - 320,360,2400,720,2880,2880,320,360, - // Windows 98 - 320,360,2400,720,2880,2880,320,360, - // Windows 98 Second Edition - 320,360,2400,720,2880,2880,320,360, - // Windows Me - 360,2400,720,2880,2880, - // Windows NT 3.10 - 2400,720,2880,2880, - // Windows NT 3.50 - 2400,720,2880,2880, - // Windows NT 3.51 - 2400,720,2880,2880, - // Windows NT 4.00 - 360,2400,720,2880,2880,360, - // Windows 2000 - 360,2400,720,2880,2880, - // Windows Vista - 360,2400,720,2880,2880, - // BeOS R4.5 - 2880, + 720, 1440, }; readonly int[] clustersize = { - // Concurrent DOS 6.00 - 512, 1024, 512, - // DR-DOS 3.40 - 1024,1024,512,1024,512,512,512, - // DR-DOS 3.41 - 1024,1024,512,1024,512,512,512, - // DR-DOS 5.00 - 1024,1024,512,1024,512,512,512, - // DR-DOS 6.00 - 1024,1024,512,1024,1024,512,512,512, - // DR-DOS 7.02 - 1024,1024,512,1024,1024,512,512,512, - // DR-DOS 7.03 - 1024,1024,512,1024,1024,512, - // DR-DOS 8.00 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 3.30A - 1024,1024,512,1024,512,512,512,512, - // MS-DOS 3.31 - 1024,1024,512,1024,512,512,512,512, - // MS-DOS 4.01 - 1024,1024,512,1024,512,512,512, - // MS-DOS 5.00 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 6.00 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 6.20 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 6.20 RC1 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 6.21 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 6.22 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 7.10 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 3.20 for Amstrad - 1024,1024,512,1024,512,512, - // MS-DOS 2.11 for AT&T - 1024, - // MS-DOS 3.30 for DeLL - 1024,1024,512,1024,512,512,512, - // MS-DOS 3.10 for Epson - 1024,1024,512, - // MS-DOS 3.20 for Epson - 1024,1024,512,1024,512,512, - // MS-DOS 3.20 for HP - 1024,1024,512,1024,512,512,512, - // MS-DOS 3.21 for Hyosung - 1024,1024,512,1024,512,512,512, - // MS-DOS 3.21 for Kaypro - 1024,1024,512,1024,512,512,512, - // MS-DOS 3.10 for Olivetti - 1024,512,512, - // MS-DOS 3.30 for Toshiba - 1024,1024,512,1024,512,512,512, - // MS-DOS 4.01 for Toshiba - 1024,1024,512,1024,512,512,512, - // Novell DOS 7.00 - 1024,1024,512,1024,1024,512,512,512, - // OpenDOS 7.01 - 1024,1024,512,1024,1024,512,512,512, - // PC-DOS 2.00 - 1024, - // PC-DOS 2.10 - 1024, - // PC-DOS 2000 - 1024,1024,512,1024,1024,512,512,512, - // PC-DOS 3.00 - 512, - // PC-DOS 3.10 - 512, - // PC-DOS 3.30 - 512,512, - // PC-DOS 4.00 - 512,512, - // PC-DOS 5.00 - 1024,1024,512,1024,1024,512,512,512, - // PC-DOS 5.02 - 1024,1024,512,1024,1024,512,512,512, - // PC-DOS 6.10 - 1024,1024,512,1024,1024,512,512,512, - // PC-DOS 6.30 - 1024,1024,512,1024,1024,512,512,512, - // mkfs.vfat - 512,1024,1024,512, - // mkfs.vfat for Atari - 1024,1024,1024,1024, - // Microsoft OS/2 1.00 for Tandy - 1024,512,1024,512, - // Microsoft OS/2 1.10 for AST - 1024,512,1024,512, - // Microsoft OS/2 1.10 for Nokia - 1024,512,1024,512, - // Microsoft OS/2 1.21 - 1024,512,1024,512, - // Microsoft OS/2 1.30.1 - 1024,512,1024,1024,512, - // OS/2 1.20 - 1024,512,1024,512, - // OS/2 1.30 - 1024,512,1024,512, - // OS/2 2.00 - 1024,512,1024,1024,512, - // OS/2 2.10 - 1024,512,1024,1024,512, - // OS/2 2.11 - 1024,512,1024,1024,512, - // OS/2 Warp 3 - 512,1024,1024,512, - // OS/2 Warp 4 - 512,1024,1024,512, - // eComStation - 512,1024,1024,512, - // Windows 95 - 1024,1024,512,1024,1024,512,512,512, - // Windows 95 OSR 2 - 1024,1024,512,1024,1024,512,512,512, - /// Windows 95 OSR 2.1 - 1024,1024,512,1024,1024,512,512,512, - // Windows 95 OSR 2.5 - 1024,1024,512,1024,1024,512,512,512, - // Windows 98 - 1024,1024,512,1024,1024,512,512,512, - // Windows 98 Second Edition - 1024,1024,512,1024,1024,512,512,512, - // Windows Me - 1024,512,1024,1024,512, - // Windows NT 3.10 - 512,1024,1024,512, - // Windows NT 3.50 - 512,1024,1024,512, - // Windows NT 3.51 - 512,1024,1024,512, - // Windows NT 4.00 - 1024,512,1024,512,512,512, - // Windows 2000 - 1024,512,1024,1024,512, - // Windows Vista - 1024,512,1024,1024,512, - // BeOS R4.5 - 512, + 1024, 1024, }; readonly string[] volumename = { - // Concurrent DOS 6.00 - null, null, null, - // DR-DOS 3.40 - null, null, null, null, null, null, null, - // DR-DOS 3.41 - null, null, null, null, null, null, null, - // DR-DOS 5.00 - null, null, null, null, null, null, null, - // DR-DOS 6.00 - null, null, null, null, null, null, null, null, - // DR-DOS 7.02 - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // DR-DOS 7.03 - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // DR-DOS 8.00 - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // MS-DOS 3.30A - null, null, null, null, null, null, null,null, - // MS-DOS 3.31 - null, null, null, null, null, null, null,null, - // MS-DOS 4.01 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 5.00 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 6.00 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 6.20 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 6.20 RC1 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 6.21 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 6.22 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 7.10 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 3.20 for Amstrad - null,null,null,null,null,null, - // MS-DOS 2.11 for AT&T - null, - // MS-DOS 3.30 for DeLL - null,null,null,null,null,null,null, - // MS-DOS 3.10 for Epson - null,null,null, - // MS-DOS 3.20 for Epson - null,null,null,null,null,null, - // MS-DOS 3.20 for HP - null,null,null,null,null,null,null, - // MS-DOS 3.21 for Hyosung - null,null,null,null,null,null,null, - // MS-DOS 3.21 for Kaypro - null,null,null,null,null,null,null, - // MS-DOS 3.10 for Olivetti - null,null,null, - // MS-DOS 3.30 for Toshiba - null,null,null,null,null,null,null, - // MS-DOS 4.01 for Toshiba - "VOLUMELABEL","NO NAME ","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","NO NAME ", - // Novell DOS 7.00 - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // OpenDOS 7.01 - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // PC-DOS 2.00 - null, - // PC-DOS 2.10 - null, - // PC-DOS 2000 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // PC-DOS 3.00 - null, - // PC-DOS 3.10 - null, - // PC-DOS 3.30 - null,null, - // PC-DOS 4.00 - "VOLUMELABEL","VOLUMELABEL", - // PC-DOS 5.00 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // PC-DOS 5.02 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // PC-DOS 6.10 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // PC-DOS 6.30 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // mkfs.vfat - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // mkfs.vfat for Atari - null,null,null,null, - // Microsoft OS/2 1.00 for Tandy - null,null,null,null, - // Microsoft OS/2 1.10 for AST - null,null,null,null, - // Microsoft OS/2 1.10 for Nokia - null,null,null,null, - // Microsoft OS/2 1.21 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Microsoft OS/2 1.30.1 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 1.20 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 1.30 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 2.00 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 2.10 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 2.11 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 Warp 3 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 Warp 4 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // eComStation - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Windows 95 - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - // Windows 95 OSR 2 - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - /// Windows 95 OSR 2.1 - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - // Windows 95 OSR 2.5 - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - // Windows 98 - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - // Windows 98 Second Edition - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - // Windows Me - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // Windows NT 3.10 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Windows NT 3.50 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Windows NT 3.51 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Windows NT 4.00 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - "NO NAME ","NO NAME ", - // Windows 2000 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Windows Vista - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // BeOS R4.5 - "NO NAME ", + "Volume label", "Volume label", }; readonly string[] volumeserial = { - // Concurrent DOS 6.00 - null, null, null, - // DR-DOS 3.40 - null, null, null, null, null, null, null, - // DR-DOS 3.41 - null, null, null, null, null, null, null, - // DR-DOS 5.00 - null, null, null, null, null, null, null, - // DR-DOS 6.00 - null, null, null, null, null, null, null, null, - // DR-DOS 7.02 - "1BF63C69","1BF70E75","1BF7185F","1BF80C4F","1BF90F1D","1BF82777","1BF72430","1BF72F1E", - // DR-DOS 7.03 - "0C1A2013","0CE22B5B","0CEA1D3E","0CEE102F","0CEE3760","0CEF2739", - // DR-DOS 8.00 - "1BFD1977","1BFD2D3F","1BFD3531","1BFC3231","1BFA1D58","1BFC117D","1BFE0971","1BFE1423", - // MS-DOS 3.30A - null, null, null, null, null, null, null,null, - // MS-DOS 3.31 - null, null, null, null, null, null, null,null, - // MS-DOS 4.01 - "122C190A",null,"2480190A","2D471909","0F5A1908","2F3D190A",null, - // MS-DOS 5.00 - "0B6018F8",null,"1E3518F8","285A18FB","231D18FE","415118FC","316118F8",null, - // MS-DOS 6.00 - "067B18F6",null,"193418F6","1F3A18F5","165318F3","172418F4","234918F6",null, - // MS-DOS 6.20 - "265418ED",null,"0B7018EE","127418F0","137F18F2","364C18F0","185C18EE",null, - // MS-DOS 6.20 RC1 - "064B18EB",null,"192518EB","244C18EA","3C3118E7","344118E9","267E18EB",null, - // MS-DOS 6.21 - "2A41181B",null,"0641181C","3B26181C","082518E2","237118E1","123F181C",null, - // MS-DOS 6.22 - "317C1818",null,"0D3A1819","3C251817","387A1815","185E1817","18231819",null, - // MS-DOS 7.10 - "1156180A",null,"2951180A","3057180B","2B4A1811","344B180C","352D180A",null, - // MS-DOS 3.20 for Amstrad - null,null,null,null,null,null, - // MS-DOS 2.11 for AT&T - null, - // MS-DOS 3.30 for DeLL - null,null,null,null,null,null,null, - // MS-DOS 3.10 for Epson - null,null,null, - // MS-DOS 3.20 for Epson - null,null,null,null,null,null, - // MS-DOS 3.20 for HP - null,null,null,null,null,null,null, - // MS-DOS 3.21 for Hyosung - null,null,null,null,null,null,null, - // MS-DOS 3.21 for Kaypro - null,null,null,null,null,null,null, - // MS-DOS 3.10 for Olivetti - null,null,null, - // MS-DOS 3.30 for Toshiba - null,null,null,null,null,null,null, - // MS-DOS 4.01 for Toshiba - "0B2519E7","163419E7","1E3119E7","133919E9","177419EA","317E19E7","3B7319E7", - // Novell DOS 7.00 - "1BE7254C","1BE73024","1BE7397C","1BE63635","1BE51661","1BE61143","1BE80A5D","1BE8144C", - // OpenDOS 7.01 - "1BE93E2B","1BEA234D","1BEA325D","1BEB294F","1BEC2C2E","1BEC0C5D","1BEA3E60","1BEB0E26", - // PC-DOS 2.00 - null, - // PC-DOS 2.10 - null, - // PC-DOS 2000 - "2634100E",null,"3565100E","3B6B1012","3B2D1013","1D491013","4136100E",null, - // PC-DOS 3.00 - null, - // PC-DOS 3.10 - null, - // PC-DOS 3.30 - null,null, - // PC-DOS 4.00 - "3C240FE3","2E3E0FE1", - // PC-DOS 5.00 - "33260FF9",null,"11550FFA","234F0FFB","2F600FFC","0D550FFC","1D630FFA",null, - // PC-DOS 5.02 - "06231000",null,"1A3E1000","1F3B0FFF","3D750FFD","3F4F0FFE","26471000",null, - // PC-DOS 6.10 - "25551004",null,"3E5F1004","142D1006","17541007","355A1006","0D5E1005",null, - // PC-DOS 6.30 - "2B22100C",null,"3B47100C","0C55100C","1B80100A","0B59100B","0A3A100D",null, - // mkfs.vfat - "20C279B1","20FD9501","2132D70A","2118F1AA", - // mkfs.vfat for Atari - null,null,null,null, - // Microsoft OS/2 1.00 for Tandy - "9C170C15","9BFB0C15","9C13FC15","9BF99C15", - // Microsoft OS/2 1.10 for AST - "66A42C15","67696C15","66DEBC15","66DC4C15", - // Microsoft OS/2 1.10 for Nokia - "676B4C15","67768C15","9C12DC15","66A74C15", - // Microsoft OS/2 1.21 - "9C074C15","66BCFC15","66C1AC15","66C7FC15", - // Microsoft OS/2 1.30.1 - "66C47C15","66CBEC15","9C167C15","9C147C15","9C0FEC15", - // OS/2 1.20 - "5BF5E015","5BE61015","5C26F015","5C376015", - // OS/2 1.30 - "5C418015","5BE20015","5C7F1015","5B83C015", - // OS/2 2.00 - "5C3BD015","5B807015","5BE69015","5C187015","5C390015", - // OS/2 2.10 - "1BFCB414","E6C6C414","E6CCF414","E6AF6414","1C005414", - // OS/2 2.11 - "E6AEB414","1C00D414","1C03B414","E6C90414","E6B6E414", - // OS/2 Warp 3 - "E6AF7414","E6D63414","E6A65414","E6AE6414", - // OS/2 Warp 4 - "E6CD9414","1BFAD414","E6DFF414","E6D4C414", - // eComStation - "E6CA5814","E6CBC814","E6B81814","1C013814", - // Windows 95 - null,"3B360D0D","24240D0D","3C260D11", - "30050D10","275A0D11",null,"3B100D0F", - // Windows 95 OSR 2 - null,"1C5B0D19","11510D19","0F1F0D15", - "40200D17","3D610D14",null,"280B0D19", - /// Windows 95 OSR 2.1 - null,"1F3B0D1C","14470D1C","1C510DE4", - "2E250DE2","10640DE4",null,"2B3E0D1C", - // Windows 95 OSR 2.5 - null,"18190DFB","0A240DFB","1E320DE7", - "33230DE8","125B0DE7",null,"21410DFB", - // Windows 98 - null,"40090E0F","28140E0F","0E620E0A", - "14390E0D","0E081246",null,"30600E10", - // Windows 98 Second Edition - null,"1B550EEC","1B100EEB","08410EE6", - "0E0F0EE8","325D0EE4",null,"13380EEC", - // Windows Me - "2F200F02","103A0F01","2F1C0EFC","21570EFF","07040EFB", - // Windows NT 3.10 - "60EA50BC","6C857D51","4009440C","30761EDC", - // Windows NT 3.50 - "0C478404","7CBEB35B","7C1E8DCB","ECB276AF", - // Windows NT 3.51 - "482D8681","8889C95E","54DE6C39","F47D2516", - // Windows NT 4.00 - "D8CAAC1F","E0BB6D70","C08C3C60","9C44B411", - "4C7DD099","4CD82982", - // Windows 2000 - "4019989C","78F30AF8","E4217DDE","80B3B996","28043527", - // Windows Vista - "3C9F0BD2","3A8E465C","B2EFB822","3C30C632","16DAB07A", - // BeOS R4.5 - "00000000", + null, null, }; readonly string[] oemid = { - // Concurrent DOS 6.00 - "DIGITAL ", "DIGITAL ", "DIGITAL ", - // DR-DOS 3.40 - "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", - // DR-DOS 3.41 - "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", - // DR-DOS 5.00 - "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", - // DR-DOS 6.00 - "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", - // DR-DOS 7.02 - "DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7", - // DR-DOS 7.03 - "DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7", - // DR-DOS 8.00 - "DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7", - // MS-DOS 3.30A - "MSDOS3.3",null,"MSDOS3.3","MSDOS3.3","MSDOS3.3","MSDOS3.3","MSDOS3.3",null, - // MS-DOS 3.31 - "IBM 3.3",null,"IBM 3.3","IBM 3.3","IBM 3.3","IBM 3.3","IBM 3.3",null, - // MS-DOS 4.01 - "MSDOS4.0",null,"MSDOS4.0","MSDOS4.0","MSDOS4.0","MSDOS4.0",null, - // MS-DOS 5.00 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 6.00 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 6.20 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 6.20 RC1 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 6.21 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 6.22 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 7.10 - "MSWIN4.1",null,"MSWIN4.1","MSWIN4.1","MSWIN4.1","MSWIN4.1","MSWIN4.1",null, - // MS-DOS 3.20 for Amstrad - "MSDOS3.2",null,"MSDOS3.2","MSDOS3.2","MSDOS3.2",null, - // MS-DOS 2.11 for AT&T - "PSA 1.04", - // MS-DOS 3.30 for DeLL - "IBM 3.3",null,"IBM 3.3","IBM 3.3","IBM 3.3","IBM 3.3",null, - // MS-DOS 3.10 for Epson - "EPS 3.10","EPS 3.10","EPS 3.10", - // MS-DOS 3.20 for Epson - "IBM 3.2","IBM 3.2","IBM 3.2","IBM 3.2","IBM 3.2","IBM 3.2", - // MS-DOS 3.20 for HP - "MSDOS3.2",null,"MSDOS3.2","MSDOS3.2","MSDOS3.2","MSDOS3.2",null, - // MS-DOS 3.21 for Hyosung - "MSDOS3.2",null,"MSDOS3.2","MSDOS3.2","MSDOS3.2","MSDOS3.2",null, - // MS-DOS 3.21 for Kaypro - "MSDOS3.2",null,"MSDOS3.2","MSDOS3.2","MSDOS3.2","MSDOS3.2",null, - // MS-DOS 3.10 for Olivetti - "IBM 3.1","IBM 3.1","IBM 3.1", - // MS-DOS 3.30 for Toshiba - "IBM 3.3",null,"IBM 3.3","IBM 3.3","IBM 3.3","IBM 3.3",null, - // MS-DOS 4.01 for Toshiba - "T V4.00 ","T V4.00 ","T V4.00 ","T V4.00 ","T V4.00 ","T V4.00 ","T V4.00 ", - // Novell DOS 7.00 - "NWDOS7.0","NWDOS7.0","NWDOS7.0","NWDOS7.0","NWDOS7.0","NWDOS7.0","NWDOS7.0","NWDOS7.0", - // OpenDOS 7.01 - "OPENDOS7","OPENDOS7","OPENDOS7","OPENDOS7","OPENDOS7","OPENDOS7","OPENDOS7","OPENDOS7", - // PC-DOS 2.00 - "IBM 2.0", - // PC-DOS 2.10 - "IBM 2.0", - // PC-DOS 2000 - "IBM 7.0",null,"IBM 7.0","IBM 7.0","IBM 7.0","IBM 7.0","IBM 7.0",null, - // PC-DOS 3.00 - "IBM 3.0", - // PC-DOS 3.10 - "IBM 3.1", - // PC-DOS 3.30 - "IBM 3.3","IBM 3.3", - // PC-DOS 4.00 - "IBM 4.0","IBM 4.0", - // PC-DOS 5.00 - "IBM 5.0",null,"IBM 5.0","IBM 5.0","IBM 5.0","IBM 5.0","IBM 5.0",null, - // PC-DOS 5.02 - "IBM 5.0",null,"IBM 5.0","IBM 5.0","IBM 5.0","IBM 5.0","IBM 5.0",null, - // PC-DOS 6.10 - "IBM 6.0",null,"IBM 6.0","IBM 6.0","IBM 6.0","IBM 6.0","IBM 6.0",null, - // PC-DOS 6.30 - "IBM 6.0",null,"IBM 6.0","IBM 6.0","IBM 6.0","IBM 6.0","IBM 6.0",null, - // mkfs.vfat - "mkfs.fat","mkfs.fat","mkfs.fat","mkfs.fat", - // mkfs.vfat for Atari - null,null,null,null, - // Microsoft OS/2 1.00 for Tandy - "TAN 10.0","TAN 10.0","TAN 10.0","TAN 10.0", - // Microsoft OS/2 1.10 for AST - "IBM 10.1","IBM 10.1","IBM 10.1","IBM 10.1", - // Microsoft OS/2 1.10 for Nokia - "IBM 10.1","IBM 10.1","IBM 10.1","IBM 10.1", - // Microsoft OS/2 1.21 - "IBM 10.2","IBM 10.2","IBM 10.2","IBM 10.2", - // Microsoft OS/2 1.30.1 - "IBM 10.2","IBM 10.2","IBM 10.2","IBM 10.2","IBM 10.2", - // OS/2 1.20 - "IBM 10.2","IBM 10.2","IBM 10.2","IBM 10.2", - // OS/2 1.30 - "IBM 10.2","IBM 10.2","IBM 10.2","IBM 10.2", - // OS/2 2.00 - "IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0", - // OS/2 2.10 - "IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0", - // OS/2 2.11 - "IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0", - // OS/2 Warp 3 - "IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0", - // OS/2 Warp 4 - "IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0", - // eComStation - "IBM 4.50","IBM 4.50","IBM 4.50","IBM 4.50", - // Windows 95 - null,"MSWIN4.0","MSWIN4.0","MSWIN4.0", - "MSWIN4.0","MSWIN4.0",null,"MSWIN4.0", - // Windows 95 OSR 2 - null,"MSWIN4.1","MSWIN4.1","MSWIN4.1", - "MSWIN4.1","MSWIN4.1",null,"MSWIN4.1", - /// Windows 95 OSR 2.1 - null,"MSWIN4.1","MSWIN4.1","MSWIN4.1", - "MSWIN4.1","MSWIN4.1",null,"MSWIN4.1", - // Windows 95 OSR 2.5 - null,"MSWIN4.1","MSWIN4.1","MSWIN4.1", - "MSWIN4.1","MSWIN4.1",null,"MSWIN4.1", - // Windows 98 - null,"MSWIN4.1","MSWIN4.1","MSWIN4.1", - "MSWIN4.1","MSWIN4.1",null,"MSWIN4.1", - // Windows 98 Second Edition - null,"MSWIN4.1","MSWIN4.1","MSWIN4.1", - "MSWIN4.1","MSWIN4.1",null,"MSWIN4.1", - // Windows Me - "MSWIN4.1","MSWIN4.1","MSWIN4.1","MSWIN4.1","MSWIN4.1", - // Windows NT 3.10 - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - // Windows NT 3.50 - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - // Windows NT 3.51 - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - // Windows NT 4.00 - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - "MSDOS5.0","MSDOS5.0", - // Windows 2000 - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - // Windows Vista - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - // BeOS R4.5 - "BeOS ", + null, null, }; [Test] @@ -1462,7 +89,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat12", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "locus", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new ZZZRawImage(); @@ -1470,15 +97,17 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(mediatypes[i], image.ImageInfo.mediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); - Filesystem fs = new FAT(); + throw new NotImplementedException("Locus filesystem is not yet implemented"); + /* + Filesystem fs = new DiscImageChef.Filesystems.Locus(); Assert.AreEqual(true, fs.Identify(image, 0, image.ImageInfo.sectors - 1), testfiles[i]); fs.GetInformation(image, 0, image.ImageInfo.sectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("FAT12", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("Locus", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); - Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]);*/ } } } diff --git a/DiscImageChef.Tests/Filesystems/MINIX.cs b/DiscImageChef.Tests/Filesystems/MINIX.cs index 57728e852..0d1f4e203 100644 --- a/DiscImageChef.Tests/Filesystems/MINIX.cs +++ b/DiscImageChef.Tests/Filesystems/MINIX.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : JFS2.cs +// Filename : MINIX.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,34 +48,26 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class JFS2 + public class MINIX { readonly string[] testfiles = { - "linux.vdi.lz","linux_caseinsensitive.vdi.lz", + "linux_v1.vdi.lz", }; readonly ulong[] sectors = { - 262144, 262144, + 262144, }; readonly uint[] sectorsize = { - 512, 512, + 512, }; readonly long[] clusters = { - 257632, 257632, + 65535, }; readonly int[] clustersize = { - 4096, 4096, - }; - - readonly string[] volumename = { - "Volume labe", "Volume labe", - }; - - readonly string[] volumeserial = { - "8033b783-0cd1-1645-8ecc-f8f113ad6a47", "d6cd91e9-3899-7e40-8468-baab688ee2e2", + 1024, }; [Test] @@ -83,7 +75,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "jfs2", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "minix", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -92,11 +84,11 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.JFS(); + Filesystem fs = new DiscImageChef.Filesystems.MinixFS(); int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "0x83" || partitions[j].PartitionType == "0x07") + if(partitions[j].PartitionType == "0x81") { part = j; break; @@ -107,9 +99,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("JFS filesystem", fs.XmlFSType.Type, testfiles[i]); - Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); - Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual("Minix V1", fs.XmlFSType.Type, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/NILFS2.cs b/DiscImageChef.Tests/Filesystems/NILFS2.cs index 44e02391d..b496f51e4 100644 --- a/DiscImageChef.Tests/Filesystems/NILFS2.cs +++ b/DiscImageChef.Tests/Filesystems/NILFS2.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : btrfs.cs +// Filename : NILFS2.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,7 +48,7 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class btrfs + public class NILFS2 { readonly string[] testfiles = { "linux.vdi.lz", @@ -71,11 +71,11 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumename = { - "VolumeLabel", + "Volume label", }; readonly string[] volumeserial = { - "a4fc5201-85cc-6840-8a68-998cab9ae897", + "6b1ca79e-7048-a748-93a0-89c74b02cb5a", }; [Test] @@ -83,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "btrfs", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "nilfs2", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -92,7 +92,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.BTRFS(); + Filesystem fs = new DiscImageChef.Filesystems.NILFS2(); int part = -1; for(int j = 0; j < partitions.Count; j++) { @@ -107,7 +107,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("B-tree file system", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("NILFS2 filesystem", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); } diff --git a/DiscImageChef.Tests/Filesystems/NTFS_MBR.cs b/DiscImageChef.Tests/Filesystems/NTFS_MBR.cs index a6df16c0e..134a5dff2 100644 --- a/DiscImageChef.Tests/Filesystems/NTFS_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/NTFS_MBR.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : BeFS_MBR.cs +// Filename : NTFS_MBR.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,38 +48,47 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class HFSX_MBR + public class NTFS_MBR { readonly string[] testfiles = { - /*"macosx.vdi.lz", */"macosx_journal.vdi.lz", + "win10.vdi.lz", "win2000.vdi.lz", "winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", + "winnt_3.51.vdi.lz", "winnt_4.00.vdi.lz", "winvista.vdi.lz", "linux.vdi.lz", + }; readonly ulong[] sectors = { - 393216, 409600, + 524288, 2097152, 1024000, 524288, + 524288, 524288, 524288, 262144, }; readonly uint[] sectorsize = { - 512, 512, + 512, 512, 512, 512, + 512, 512, 512, 512, }; readonly long[] clusters = { - 102390, 153590, + 65263, 1046511, 1023057, 524256, + 524256, 524096, 64767, 32512, }; readonly int[] clustersize = { - 4096, 4096, + 4096, 1024, 512, 512, + 512, 512, 4096, 4096, }; readonly string[] volumename = { - "Volume label","Volume label", + null, null, null, null, + null, null, null, null, }; readonly string[] volumeserial = { - "UNKNOWN","UNKNOWN", + "C46C1B3C6C1B28A6","8070C8EC70C8E9CC","10CC6AC6CC6AA5A6","7A14F50014F4BFE5", + "24884447884419A6","822C288D2C287E73","E20AF54B0AF51D6B","065BB96B7C1BCFDA", }; readonly string[] oemid = { - "10.0","HFSJ", + null, null, null, null, + null, null, null, null, }; [Test] @@ -87,7 +96,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsx_mbr", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "ntfs_mbr", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -96,11 +105,11 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.AppleHFSPlus(); + Filesystem fs = new DiscImageChef.Filesystems.NTFS(); int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "0xAF") + if(partitions[j].PartitionType == "0x07") { part = j; break; @@ -111,7 +120,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("HFSX", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("NTFS", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); diff --git a/DiscImageChef.Tests/Filesystems/PFS3_RDB.cs b/DiscImageChef.Tests/Filesystems/PFS3_RDB.cs index 33105ab1f..b4bb74fa6 100644 --- a/DiscImageChef.Tests/Filesystems/PFS3_RDB.cs +++ b/DiscImageChef.Tests/Filesystems/PFS3_RDB.cs @@ -35,13 +35,88 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; +using System.Collections.Generic; +using System.IO; +using DiscImageChef.CommonTypes; +using DiscImageChef.DiscImages; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; +using DiscImageChef.ImagePlugins; +using DiscImageChef.PartPlugins; +using NUnit.Framework; + namespace DiscImageChef.Tests.Filesystems { + [TestFixture] public class PFS3_RDB { - public PFS3_RDB() + readonly string[] testfiles = { + "uae.vdi.lz", + }; + + readonly ulong[] sectors = { + 1024128, + }; + + readonly uint[] sectorsize = { + 512, + }; + + readonly long[] clusters = { + 1023552, + }; + + readonly int[] clustersize = { + 512, + }; + + readonly string[] volumename = { + "PFS", + }; + + readonly string[] volumeserial = { + null, + }; + + readonly string[] oemid = { + null, + }; + + [Test] + public void Test() { + for(int i = 0; i < testfiles.Length; i++) + { + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "pfs3", testfiles[i]); + Filter filter = new LZip(); + filter.Open(location); + ImagePlugin image = new VDI(); + Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); + Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); + PartPlugin parts = new AmigaRigidDiskBlock(); + Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); + Filesystem fs = new DiscImageChef.Filesystems.PFS(); + int part = -1; + for(int j = 0; j < partitions.Count; j++) + { + System.Console.WriteLine("{0}", partitions[j].PartitionType); + if(partitions[j].PartitionType == "\"PFS\\1\"") + { + part = j; + break; + } + } + Assert.AreNotEqual(-1, part, "Partition not found"); + Assert.AreEqual(true, fs.Identify(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1), testfiles[i]); + fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); + Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); + Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); + Assert.AreEqual("PFS v3", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + } } } } diff --git a/DiscImageChef.Tests/Filesystems/ReFS_MBR.cs b/DiscImageChef.Tests/Filesystems/ReFS_MBR.cs index 67ff45c9c..5dba87cfc 100644 --- a/DiscImageChef.Tests/Filesystems/ReFS_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/ReFS_MBR.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : NTFS_MBR.cs +// Filename : ReFS_MBR.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -35,6 +35,7 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ +using System; using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; @@ -48,47 +49,39 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class NTFS_MBR + public class ReFS_MBR { readonly string[] testfiles = { - "win10.vdi.lz", "win2000.vdi.lz", "winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", - "winnt_3.51.vdi.lz", "winnt_4.00.vdi.lz", "winvista.vdi.lz", + "win10.vdi.lz", }; readonly ulong[] sectors = { - 524288, 2097152, 1024000, 524288, - 524288, 524288, 524288, + 67108864, }; readonly uint[] sectorsize = { - 512, 512, 512, 512, - 512, 512, 512 + 512, }; readonly long[] clusters = { - 65263, 1046511, 1023057, 524256, - 524256, 524096, 64767, + 8388096, }; readonly int[] clustersize = { - 4096, 1024, 512, 512, - 512, 512, 4096, + 4096, }; readonly string[] volumename = { - null, null, null, null, - null, null, null, + null, }; readonly string[] volumeserial = { - "C46C1B3C6C1B28A6","8070C8EC70C8E9CC","10CC6AC6CC6AA5A6","7A14F50014F4BFE5", - "24884447884419A6","822C288D2C287E73","E20AF54B0AF51D6B", + "UNKNOWN", }; readonly string[] oemid = { - null, null, null, null, - null, null, null, + null, }; [Test] @@ -96,7 +89,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "ntfs_mbr", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "refs_mbr", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -105,7 +98,6 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.NTFS(); int part = -1; for(int j = 0; j < partitions.Count; j++) { @@ -116,14 +108,17 @@ namespace DiscImageChef.Tests.Filesystems } } Assert.AreNotEqual(-1, part, "Partition not found"); + throw new NotImplementedException("ReFS is not yet implemented"); + /* + Filesystem fs = new DiscImageChef.Filesystems.ReFS(); Assert.AreEqual(true, fs.Identify(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1), testfiles[i]); fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("NTFS", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("ReFS", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); - Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]);*/ } } } diff --git a/DiscImageChef.Tests/Filesystems/Reiser3.cs b/DiscImageChef.Tests/Filesystems/Reiser3.cs index 44e02391d..97bf2c647 100644 --- a/DiscImageChef.Tests/Filesystems/Reiser3.cs +++ b/DiscImageChef.Tests/Filesystems/Reiser3.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : btrfs.cs +// Filename : Reiser3.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,34 +48,30 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class btrfs + public class Reiser3 { readonly string[] testfiles = { - "linux.vdi.lz", + "linux_r3.5.vdi.lz", "linux_r3.6.vdi.lz" }; readonly ulong[] sectors = { - 262144, + 262144, 262144, }; readonly uint[] sectorsize = { - 512, + 512, 512, }; readonly long[] clusters = { - 32512, + 32512, 32512, }; readonly int[] clustersize = { - 4096, + 4096, 4096, }; - readonly string[] volumename = { - "VolumeLabel", - }; - - readonly string[] volumeserial = { - "a4fc5201-85cc-6840-8a68-998cab9ae897", + readonly string[] reiserversion = { + "Reiser 3.5 filesystem", "Reiser 3.6 filesystem" }; [Test] @@ -83,7 +79,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "btrfs", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "reiser3", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -92,7 +88,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.BTRFS(); + Filesystem fs = new DiscImageChef.Filesystems.Reiser(); int part = -1; for(int j = 0; j < partitions.Count; j++) { @@ -107,9 +103,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("B-tree file system", fs.XmlFSType.Type, testfiles[i]); - Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); - Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(reiserversion[i], fs.XmlFSType.Type, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/Reiser4.cs b/DiscImageChef.Tests/Filesystems/Reiser4.cs index 44e02391d..9105e05ea 100644 --- a/DiscImageChef.Tests/Filesystems/Reiser4.cs +++ b/DiscImageChef.Tests/Filesystems/Reiser4.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : btrfs.cs +// Filename : Reiser4.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,7 +48,7 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class btrfs + public class Reiser4 { readonly string[] testfiles = { "linux.vdi.lz", @@ -63,7 +63,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 32512, + 32511, }; readonly int[] clustersize = { @@ -71,11 +71,11 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] volumename = { - "VolumeLabel", + "Volume label", }; readonly string[] volumeserial = { - "a4fc5201-85cc-6840-8a68-998cab9ae897", + "b0c1924e-6f10-8c42-b6c5-66a457896460", }; [Test] @@ -83,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "btrfs", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "reiser4", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -92,7 +92,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.BTRFS(); + Filesystem fs = new DiscImageChef.Filesystems.Reiser4(); int part = -1; for(int j = 0; j < partitions.Count; j++) { @@ -107,7 +107,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("B-tree file system", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("Reiser 4 filesystem", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); } diff --git a/DiscImageChef.Tests/Filesystems/SFS_RDB.cs b/DiscImageChef.Tests/Filesystems/SFS_RDB.cs index 9e13e50c2..40fc85297 100644 --- a/DiscImageChef.Tests/Filesystems/SFS_RDB.cs +++ b/DiscImageChef.Tests/Filesystems/SFS_RDB.cs @@ -35,13 +35,88 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; +using System.Collections.Generic; +using System.IO; +using DiscImageChef.CommonTypes; +using DiscImageChef.DiscImages; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; +using DiscImageChef.ImagePlugins; +using DiscImageChef.PartPlugins; +using NUnit.Framework; + namespace DiscImageChef.Tests.Filesystems { + [TestFixture] public class SFS_RDB { - public SFS_RDB() + readonly string[] testfiles = { + "uae.vdi.lz", + }; + + readonly ulong[] sectors = { + 1024128, + }; + + readonly uint[] sectorsize = { + 512, + }; + + readonly long[] clusters = { + 127000, + }; + + readonly int[] clustersize = { + 2048, + }; + + readonly string[] volumename = { + null, + }; + + readonly string[] volumeserial = { + null, + }; + + readonly string[] oemid = { + null, + }; + + [Test] + public void Test() { + for(int i = 0; i < testfiles.Length; i++) + { + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "sfs", testfiles[i]); + Filter filter = new LZip(); + filter.Open(location); + ImagePlugin image = new VDI(); + Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); + Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); + PartPlugin parts = new AmigaRigidDiskBlock(); + Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); + Filesystem fs = new DiscImageChef.Filesystems.SFS(); + int part = -1; + for(int j = 0; j < partitions.Count; j++) + { + System.Console.WriteLine("{0}", partitions[j].PartitionType); + if(partitions[j].PartitionType == "\"SFS\\0\"") + { + part = j; + break; + } + } + Assert.AreNotEqual(-1, part, "Partition not found"); + Assert.AreEqual(true, fs.Identify(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1), testfiles[i]); + fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); + Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); + Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); + Assert.AreEqual("SmartFileSystem", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); + } } } } diff --git a/DiscImageChef.Tests/Filesystems/UDF.cs b/DiscImageChef.Tests/Filesystems/UDF.cs index 0b6c4638e..49b5496ff 100644 --- a/DiscImageChef.Tests/Filesystems/UDF.cs +++ b/DiscImageChef.Tests/Filesystems/UDF.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : FAT12.cs +// Filename : UDF.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -36,1425 +36,69 @@ // ****************************************************************************/ // //$Id$ using System.IO; -using DiscImageChef.CommonTypes; using DiscImageChef.Filesystems; using DiscImageChef.Filters; using DiscImageChef.ImagePlugins; using NUnit.Framework; +using DiscImageChef.DiscImages; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class FAT12 + public class UDF { readonly string[] testfiles = { - // Concurrent DOS 6.00 - "concurrentdos_6.00_dshd.img.lz", "concurrentdos_6.00_mf2dd.img.lz", "concurrentdos_6.00_mf2hd.img.lz", - // DR-DOS 3.40 - "drdos_3.40_dsdd.img.lz", "drdos_3.40_dsdd8.img.lz", "drdos_3.40_dshd.img.lz", "drdos_3.40_mf2dd.img.lz", - "drdos_3.40_mf2hd.img.lz", "drdos_3.40_ssdd.img.lz", "drdos_3.40_ssdd8.img.lz", - // DR-DOS 3.41 - "drdos_3.41_dsdd.img.lz", "drdos_3.41_dsdd8.img.lz", "drdos_3.41_dshd.img.lz", "drdos_3.41_mf2dd.img.lz", - "drdos_3.41_mf2hd.img.lz", "drdos_3.41_ssdd.img.lz", "drdos_3.41_ssdd8.img.lz", - // DR-DOS 5.00 - "drdos_5.00_dsdd.img.lz", "drdos_5.00_dsdd8.img.lz", "drdos_5.00_dshd.img.lz", "drdos_5.00_mf2dd.img.lz", - "drdos_5.00_mf2hd.img.lz", "drdos_5.00_ssdd.img.lz", "drdos_5.00_ssdd8.img.lz", - // DR-DOS 6.00 - "drdos_6.00_dsdd.img.lz", "drdos_6.00_dsdd8.img.lz", "drdos_6.00_dshd.img.lz", "drdos_6.00_mf2dd.img.lz", - "drdos_6.00_mf2ed.img.lz", "drdos_6.00_mf2hd.img.lz", "drdos_6.00_ssdd.img.lz", "drdos_6.00_ssdd8.img.lz", - // DR-DOS 7.02 - "drdos_7.02_dsdd.img.lz", "drdos_7.02_dsdd8.img.lz", "drdos_7.02_dshd.img.lz", "drdos_7.02_mf2dd.img.lz", - "drdos_7.02_mf2ed.img.lz", "drdos_7.02_mf2hd.img.lz", "drdos_7.02_ssdd.img.lz", "drdos_7.02_ssdd8.img.lz", - // DR-DOS 7.03 - "drdos_7.03_dsdd.img.lz", "drdos_7.03_dsdd8.img.lz", "drdos_7.03_dshd.img.lz", "drdos_7.03_mf2dd.img.lz", - "drdos_7.03_mf2ed.img.lz", "drdos_7.03_mf2hd.img.lz", - // DR-DOS 8.00 - "drdos_8.00_dsdd.img.lz", "drdos_8.00_dsdd8.img.lz", "drdos_8.00_dshd.img.lz", "drdos_8.00_mf2dd.img.lz", - "drdos_8.00_mf2ed.img.lz", "drdos_8.00_mf2hd.img.lz", "drdos_8.00_ssdd.img.lz", "drdos_8.00_ssdd8.img.lz", - // MS-DOS 3.30A - "msdos_3.30A_dsdd.img.lz","msdos_3.30A_dsdd8.img.lz","msdos_3.30A_dshd.img.lz","msdos_3.30A_mf2dd.img.lz", - "msdos_3.30A_mf2ed.img.lz","msdos_3.30A_mf2hd.img.lz","msdos_3.30A_ssdd.img.lz","msdos_3.30A_ssdd8.img.lz", - // MS-DOS 3.31 - "msdos_3.31_dsdd.img.lz","msdos_3.31_dsdd8.img.lz","msdos_3.31_dshd.img.lz","msdos_3.31_mf2dd.img.lz", - "msdos_3.31_mf2ed.img.lz","msdos_3.31_mf2hd.img.lz","msdos_3.31_ssdd.img.lz","msdos_3.31_ssdd8.img.lz", - // MS-DOS 4.01 - "msdos_4.01_dsdd.img.lz","msdos_4.01_dsdd8.img.lz","msdos_4.01_dshd.img.lz","msdos_4.01_mf2dd.img.lz", - "msdos_4.01_mf2hd.img.lz","msdos_4.01_ssdd.img.lz","msdos_4.01_ssdd8.img.lz", - // MS-DOS 5.00 - "msdos_5.00_dsdd.img.lz","msdos_5.00_dsdd8.img.lz","msdos_5.00_dshd.img.lz","msdos_5.00_mf2dd.img.lz", - "msdos_5.00_mf2ed.img.lz","msdos_5.00_mf2hd.img.lz","msdos_5.00_ssdd.img.lz","msdos_5.00_ssdd8.img.lz", - // MS-DOS 6.00 - "msdos_6.00_dsdd.img.lz","msdos_6.00_dsdd8.img.lz","msdos_6.00_dshd.img.lz","msdos_6.00_mf2dd.img.lz", - "msdos_6.00_mf2ed.img.lz","msdos_6.00_mf2hd.img.lz","msdos_6.00_ssdd.img.lz","msdos_6.00_ssdd8.img.lz", - // MS-DOS 6.20 - "msdos_6.20_dsdd.img.lz","msdos_6.20_dsdd8.img.lz","msdos_6.20_dshd.img.lz","msdos_6.20_mf2dd.img.lz", - "msdos_6.20_mf2ed.img.lz","msdos_6.20_mf2hd.img.lz","msdos_6.20_ssdd.img.lz","msdos_6.20_ssdd8.img.lz", - // MS-DOS 6.20 RC1 - "msdos_6.20rc1_dsdd.img.lz","msdos_6.20rc1_dsdd8.img.lz","msdos_6.20rc1_dshd.img.lz","msdos_6.20rc1_mf2dd.img.lz", - "msdos_6.20rc1_mf2ed.img.lz","msdos_6.20rc1_mf2hd.img.lz","msdos_6.20rc1_ssdd.img.lz","msdos_6.20rc1_ssdd8.img.lz", - // MS-DOS 6.21 - "msdos_6.21_dsdd.img.lz","msdos_6.21_dsdd8.img.lz","msdos_6.21_dshd.img.lz","msdos_6.21_mf2dd.img.lz", - "msdos_6.21_mf2ed.img.lz","msdos_6.21_mf2hd.img.lz","msdos_6.21_ssdd.img.lz","msdos_6.21_ssdd8.img.lz", - // MS-DOS 6.22 - "msdos_6.22_dsdd.img.lz","msdos_6.22_dsdd8.img.lz","msdos_6.22_dshd.img.lz","msdos_6.22_mf2dd.img.lz", - "msdos_6.22_mf2ed.img.lz","msdos_6.22_mf2hd.img.lz","msdos_6.22_ssdd.img.lz","msdos_6.22_ssdd8.img.lz", - // MS-DOS 7.10 - "msdos_7.10_dsdd.img.lz","msdos_7.10_dsdd8.img.lz","msdos_7.10_dshd.img.lz","msdos_7.10_mf2dd.img.lz", - "msdos_7.10_mf2ed.img.lz","msdos_7.10_mf2hd.img.lz","msdos_7.10_ssdd.img.lz","msdos_7.10_ssdd8.img.lz", - // MS-DOS 3.20 for Amstrad - "msdos_amstrad_3.20_dsdd.img.lz","msdos_amstrad_3.20_dsdd8.img.lz","msdos_amstrad_3.20_dshd.img.lz", - "msdos_amstrad_3.20_mf2dd.img.lz","msdos_amstrad_3.20_ssdd.img.lz","msdos_amstrad_3.20_ssdd8.img.lz", - // MS-DOS 2.11 for AT&T - "msdos_att_2.11_dsdd.img.lz", - // MS-DOS 3.30 for DeLL - "msdos_dell_3.30_dsdd.img.lz","msdos_dell_3.30_dsdd8.img.lz","msdos_dell_3.30_dshd.img.lz", - "msdos_dell_3.30_mf2dd.img.lz","msdos_dell_3.30_mf2hd.img.lz","msdos_dell_3.30_ssdd.img.lz", - "msdos_dell_3.30_ssdd8.img.lz", - // MS-DOS 3.10 for Epson - "msdos_epson_3.10_dsdd.img.lz","msdos_epson_3.10_dsdd8.img.lz","msdos_epson_3.10_dshd.img.lz", - // MS-DOS 3.20 for Epson - "msdos_epson_3.20_dsdd.img.lz","msdos_epson_3.20_dsdd8.img.lz","msdos_epson_3.20_dshd.img.lz", - "msdos_epson_3.20_mf2dd.img.lz","msdos_epson_3.20_ssdd.img.lz","msdos_epson_3.20_ssdd8.img.lz", - // MS-DOS 3.20 for HP - "msdos_hp_3.20_dsdd.img.lz","msdos_hp_3.20_dsdd8.img.lz","msdos_hp_3.20_dshd.img.lz", - "msdos_hp_3.20_mf2dd.img.lz","msdos_hp_3.20_mf2hd.img.lz","msdos_hp_3.20_ssdd.img.lz", - "msdos_hp_3.20_ssdd8.img.lz", - // MS-DOS 3.21 for Hyosung - "msdos_hyonsung_3.21_dsdd.img.lz","msdos_hyonsung_3.21_dsdd8.img.lz","msdos_hyonsung_3.21_dshd.img.lz", - "msdos_hyonsung_3.21_mf2dd.img.lz","msdos_hyonsung_3.21_mf2hd.img.lz","msdos_hyonsung_3.21_ssdd.img.lz", - "msdos_hyonsung_3.21_ssdd8.img.lz", - // MS-DOS 3.21 for Kaypro - "msdos_kaypro_3.21_dsdd.img.lz","msdos_kaypro_3.21_dsdd8.img.lz","msdos_kaypro_3.21_dshd.img.lz", - "msdos_kaypro_3.21_mf2dd.img.lz","msdos_kaypro_3.21_mf2hd.img.lz","msdos_kaypro_3.21_ssdd.img.lz", - //"msdos_kaypro_3.21_ssdd8.img.lz", - // MS-DOS 3.10 for Olivetti - "msdos_olivetti_3.10_dsdd.img.lz","msdos_olivetti_3.10_dshd.img.lz","msdos_olivetti_3.10_ssdd.img.lz", - // MS-DOS 3.30 for Toshiba - "msdos_toshiba_3.30_dsdd.img.lz","msdos_toshiba_3.30_dsdd8.img.lz","msdos_toshiba_3.30_dshd.img.lz", - "msdos_toshiba_3.30_mf2dd.img.lz","msdos_toshiba_3.30_mf2hd.img.lz","msdos_toshiba_3.30_ssdd.img.lz", - "msdos_toshiba_3.30_ssdd8.img.lz", - // MS-DOS 4.01 for Toshiba - "msdos_toshiba_4.01_dsdd.img.lz","msdos_toshiba_4.01_dsdd8.img.lz","msdos_toshiba_4.01_dshd.img.lz", - "msdos_toshiba_4.01_mf2dd.img.lz","msdos_toshiba_4.01_mf2hd.img.lz","msdos_toshiba_4.01_ssdd.img.lz", - "msdos_toshiba_4.01_ssdd8.img.lz", - // Novell DOS 7.00 - "novelldos_7.00_dsdd.img.lz","novelldos_7.00_dsdd8.img.lz","novelldos_7.00_dshd.img.lz","novelldos_7.00_mf2dd.img.lz", - "novelldos_7.00_mf2ed.img.lz","novelldos_7.00_mf2hd.img.lz","novelldos_7.00_ssdd.img.lz","novelldos_7.00_ssdd8.img.lz", - // OpenDOS 7.01 - "opendos_7.01_dsdd.img.lz","opendos_7.01_dsdd8.img.lz","opendos_7.01_dshd.img.lz","opendos_7.01_mf2dd.img.lz", - "opendos_7.01_mf2ed.img.lz","opendos_7.01_mf2hd.img.lz","opendos_7.01_ssdd.img.lz","opendos_7.01_ssdd8.img.lz", - // PC-DOS 2.00 - "pcdos_2.00_dsdd.img.lz", - // PC-DOS 2.10 - "pcdos_2.10_dsdd.img.lz", - // PC-DOS 2000 - "pcdos_2000_dsdd.img.lz","pcdos_2000_dsdd8.img.lz","pcdos_2000_dshd.img.lz","pcdos_2000_mf2dd.img.lz", - "pcdos_2000_mf2ed.img.lz","pcdos_2000_mf2hd.img.lz","pcdos_2000_ssdd.img.lz","pcdos_2000_ssdd8.img.lz", - // PC-DOS 3.00 - "pcdos_3.00_dshd.img.lz", - // PC-DOS 3.10 - "pcdos_3.10_dshd.img.lz", - // PC-DOS 3.30 - "pcdos_3.30_dshd.img.lz","pcdos_3.30_mf2hd.img.lz", - // PC-DOS 4.00 - "pcdos_4.00_dshd.img.lz","pcdos_4.00_mf2hd.img.lz", - // PC-DOS 5.00 - "pcdos_5.00_dsdd.img.lz","pcdos_5.00_dsdd8.img.lz","pcdos_5.00_dshd.img.lz","pcdos_5.00_mf2dd.img.lz", - "pcdos_5.00_mf2ed.img.lz","pcdos_5.00_mf2hd.img.lz","pcdos_5.00_ssdd.img.lz","pcdos_5.00_ssdd8.img.lz", - // PC-DOS 5.02 - "pcdos_5.02_dsdd.img.lz","pcdos_5.02_dsdd8.img.lz","pcdos_5.02_dshd.img.lz","pcdos_5.02_mf2dd.img.lz", - "pcdos_5.02_mf2ed.img.lz","pcdos_5.02_mf2hd.img.lz","pcdos_5.02_ssdd.img.lz","pcdos_5.02_ssdd8.img.lz", - // PC-DOS 6.10 - "pcdos_6.10_dsdd.img.lz","pcdos_6.10_dsdd8.img.lz","pcdos_6.10_dshd.img.lz","pcdos_6.10_mf2dd.img.lz", - "pcdos_6.10_mf2ed.img.lz","pcdos_6.10_mf2hd.img.lz","pcdos_6.10_ssdd.img.lz","pcdos_6.10_ssdd8.img.lz", - // PC-DOS 6.30 - "pcdos_6.30_dsdd.img.lz","pcdos_6.30_dsdd8.img.lz","pcdos_6.30_dshd.img.lz","pcdos_6.30_mf2dd.img.lz", - "pcdos_6.30_mf2ed.img.lz","pcdos_6.30_mf2hd.img.lz","pcdos_6.30_ssdd.img.lz","pcdos_6.30_ssdd8.img.lz", - // mkfs.vfat - "mkfs.vfat_dshd.img.lz","mkfs.vfat_mf2dd.img.lz","mkfs.vfat_mf2ed.img.lz","mkfs.vfat_mf2hd.img.lz", - // mkfs.vfat for Atari - "mkfs.vfat_atari_dshd.img.lz","mkfs.vfat_atari_mf2dd.img.lz","mkfs.vfat_atari_mf2ed.img.lz","mkfs.vfat_atari_mf2hd.img.lz", - // Microsoft OS/2 1.00 for Tandy - "msos2_1.00_tandy_dsdd.img.lz","msos2_1.00_tandy_dshd.img.lz","msos2_1.00_tandy_mf2dd.img.lz","msos2_1.00_tandy_mf2hd.img.lz", - // Microsoft OS/2 1.10 for AST - "msos2_1.10_ast_dsdd.img.lz","msos2_1.10_ast_dshd.img.lz","msos2_1.10_ast_mf2dd.img.lz","msos2_1.10_ast_mf2hd.img.lz", - // Microsoft OS/2 1.10 for Nokia - "msos2_1.10_nokia_dsdd.img.lz","msos2_1.10_nokia_dshd.img.lz","msos2_1.10_nokia_mf2dd.img.lz","msos2_1.10_nokia_mf2hd.img.lz", - // Microsoft OS/2 1.21 - "msos2_1.21_dsdd.img.lz","msos2_1.21_dshd.img.lz","msos2_1.21_mf2dd.img.lz","msos2_1.21_mf2hd.img.lz", - // Microsoft OS/2 1.30.1 - "msos2_1.30.1_dsdd.img.lz","msos2_1.30.1_dshd.img.lz","msos2_1.30.1_mf2dd.img.lz","msos2_1.30.1_mf2ed.img.lz","msos2_1.30.1_mf2hd.img.lz", - // OS/2 1.20 - "os2_1.20_dsdd.img.lz","os2_1.20_dshd.img.lz","os2_1.20_mf2dd.img.lz","os2_1.20_mf2hd.img.lz", - // OS/2 1.30 - "os2_1.30_dsdd.img.lz","os2_1.30_dshd.img.lz","os2_1.30_mf2dd.img.lz","os2_1.30_mf2hd.img.lz", - // OS/2 2.00 - "os2_6.307_dsdd.img.lz","os2_6.307_dshd.img.lz","os2_6.307_mf2dd.img.lz","os2_6.307_mf2ed.img.lz","os2_6.307_mf2hd.img.lz", - // OS/2 2.10 - "os2_6.514_dsdd.img.lz","os2_6.514_dshd.img.lz","os2_6.514_mf2dd.img.lz","os2_6.514_mf2ed.img.lz","os2_6.514_mf2hd.img.lz", - // OS/2 2.11 - "os2_6.617_dsdd.img.lz","os2_6.617_dshd.img.lz","os2_6.617_mf2dd.img.lz","os2_6.617_mf2ed.img.lz","os2_6.617_mf2hd.img.lz", - // OS/2 Warp 3 - "os2_8.162_dshd.img.lz","os2_8.162_mf2dd.img.lz","os2_8.162_mf2ed.img.lz","os2_8.162_mf2hd.img.lz", - // OS/2 Warp 4 - "os2_9.023_dshd.img.lz","os2_9.023_mf2dd.img.lz","os2_9.023_mf2ed.img.lz","os2_9.023_mf2hd.img.lz", - // eComStation - "ecs_dshd.img.lz","ecs_mf2dd.img.lz","ecs_mf2ed.img.lz","ecs_mf2hd.img.lz", - // Windows 95 - "win95_dsdd8.img.lz","win95_dsdd.img.lz","win95_dshd.img.lz","win95_mf2dd.img.lz", - "win95_mf2ed.img.lz","win95_mf2hd.img.lz","win95_ssdd8.img.lz","win95_ssdd.img.lz", - // Windows 95 OSR 2 - "win95osr2_dsdd8.img.lz","win95osr2_dsdd.img.lz","win95osr2_dshd.img.lz","win95osr2_mf2dd.img.lz", - "win95osr2_mf2ed.img.lz","win95osr2_mf2hd.img.lz","win95osr2_ssdd8.img.lz","win95osr2_ssdd.img.lz", - /// Windows 95 OSR 2.1 - "win95osr2.1_dsdd8.img.lz","win95osr2.1_dsdd.img.lz","win95osr2.1_dshd.img.lz","win95osr2.1_mf2dd.img.lz", - "win95osr2.1_mf2ed.img.lz","win95osr2.1_mf2hd.img.lz","win95osr2.1_ssdd8.img.lz","win95osr2.1_ssdd.img.lz", - // Windows 95 OSR 2.5 - "win95osr2.5_dsdd8.img.lz","win95osr2.5_dsdd.img.lz","win95osr2.5_dshd.img.lz","win95osr2.5_mf2dd.img.lz", - "win95osr2.5_mf2ed.img.lz","win95osr2.5_mf2hd.img.lz","win95osr2.5_ssdd8.img.lz","win95osr2.5_ssdd.img.lz", - // Windows 98 - "win98_dsdd8.img.lz","win98_dsdd.img.lz","win98_dshd.img.lz","win98_mf2dd.img.lz", - "win98_mf2ed.img.lz","win98_mf2hd.img.lz","win98_ssdd8.img.lz","win98_ssdd.img.lz", - // Windows 98 Second Edition - "win98se_dsdd8.img.lz","win98se_dsdd.img.lz","win98se_dshd.img.lz","win98se_mf2dd.img.lz", - "win98se_mf2ed.img.lz","win98se_mf2hd.img.lz","win98se_ssdd8.img.lz","win98se_ssdd.img.lz", - // Windows Me - "winme_dsdd.img.lz","winme_dshd.img.lz","winme_mf2dd.img.lz","winme_mf2ed.img.lz","winme_mf2hd.img.lz", - // Windows NT 3.10 - "winnt_3.10_dshd.img.lz","winnt_3.10_mf2dd.img.lz","winnt_3.10_mf2ed.img.lz","winnt_3.10_mf2hd.img.lz", - // Windows NT 3.50 - "winnt_3.50_dshd.img.lz","winnt_3.50_mf2dd.img.lz","winnt_3.50_mf2ed.img.lz","winnt_3.50_mf2hd.img.lz", - // Windows NT 3.51 - "winnt_3.51_dshd.img.lz","winnt_3.51_mf2dd.img.lz","winnt_3.51_mf2ed.img.lz","winnt_3.51_mf2hd.img.lz", - // Windows NT 4.00 - "winnt_4_dsdd.img.lz","winnt_4_dshd.img.lz","winnt_4_mf2dd.img.lz","winnt_4_mf2ed.img.lz", - "winnt_4_mf2hd.img.lz","winnt_4_ssdd.img.lz", - // Windows 2000 - "win2000_dsdd.img.lz","win2000_dshd.img.lz","win2000_mf2dd.img.lz","win2000_mf2ed.img.lz","win2000_mf2hd.img.lz", - // Windows Vista - "winvista_dsdd.img.lz","winvista_dshd.img.lz","winvista_mf2dd.img.lz","winvista_mf2ed.img.lz","winvista_mf2hd.img.lz", - // BeOS R4.5 - "beos_r4.5_mf2hd.img.lz", - }; - - readonly MediaType[] mediatypes = { - // Concurrent DOS 6.00 - MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, - // DR-DOS 3.40 - MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8, - // DR-DOS 3.41 - MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8, - // DR-DOS 5.00 - MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8, - // DR-DOS 6.00 - MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_HD, MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_525_SS_DD_9, MediaType.DOS_525_SS_DD_8, - // DR-DOS 7.02 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // DR-DOS 7.03 - MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // DR-DOS 8.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.30A - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.31 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 4.01 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 5.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 6.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 6.20 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 6.20 RC1 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 6.21 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 6.22 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 7.10 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.20 for Amstrad - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 2.11 for AT&T - MediaType.DOS_525_DS_DD_9, - // MS-DOS 3.30 for DeLL - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.10 for Epson - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD, - // MS-DOS 3.20 for Epson - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.20 for HP - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.21 for Hyosung - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.21 for Kaypro - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 3.10 for Olivetti - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_525_SS_DD_9, - // MS-DOS 3.30 for Toshiba - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // MS-DOS 4.01 for Toshiba - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // Novell DOS 7.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // OpenDOS 7.01 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // PC-DOS 2.00 - MediaType.DOS_525_DS_DD_9, - // PC-DOS 2.10 - MediaType.DOS_525_DS_DD_9, - // PC-DOS 2000 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // PC-DOS 3.00 - MediaType.DOS_525_HD, - // PC-DOS 3.10 - MediaType.DOS_525_HD, - // PC-DOS 3.30 - MediaType.DOS_525_HD,MediaType.DOS_35_HD, - // PC-DOS 4.00 - MediaType.DOS_525_HD,MediaType.DOS_35_HD, - // PC-DOS 5.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // PC-DOS 5.02 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // PC-DOS 6.10 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // PC-DOS 6.30 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9,MediaType.DOS_525_SS_DD_8, - // mkfs.vfat - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // mkfs.vfat for Atari - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Microsoft OS/2 1.00 for Tandy - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // Microsoft OS/2 1.10 for AST - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // Microsoft OS/2 1.10 for Nokia - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // Microsoft OS/2 1.21 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // Microsoft OS/2 1.30.1 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // OS/2 1.20 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // OS/2 1.30 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_HD, - // OS/2 2.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // OS/2 2.10 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // OS/2 2.11 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // OS/2 Warp 3 - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // OS/2 Warp 4 - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // eComStation - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows 95 - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - // Windows 95 OSR 2 - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - /// Windows 95 OSR 2.1 - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - // Windows 95 OSR 2.5 - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - // Windows 98 - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - // Windows 98 Second Edition - MediaType.DOS_525_DS_DD_8,MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9, - MediaType.DOS_35_ED,MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_8,MediaType.DOS_525_SS_DD_9, - // Windows Me - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows NT 3.10 - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows NT 3.50 - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows NT 3.51 - MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows NT 4.00 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED, - MediaType.DOS_35_HD,MediaType.DOS_525_SS_DD_9, - // Windows 2000 - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // Windows Vista - MediaType.DOS_525_DS_DD_9,MediaType.DOS_525_HD,MediaType.DOS_35_DS_DD_9,MediaType.DOS_35_ED,MediaType.DOS_35_HD, - // BeOS R4.5 - MediaType.DOS_35_HD, + "1.02/linux.vdi.lz", "1.02/macosx.vdi.lz", "1.50/linux.vdi.lz", "1.50/macosx.vdi.lz", + "2.00/linux.vdi.lz", "2.00/macosx.vdi.lz", "2.01/linux.vdi.lz", "2.01/macosx.vdi.lz", + "2.50/linux.vdi.lz", "2.50/macosx.vdi.lz", "2.60/macosx.vdi.lz", }; readonly ulong[] sectors = { - // Concurrent DOS 6.00 - 2400, 1440, 2880, - // DR-DOS 3.40 - 720, 640, 2400, 1440, 2880, 360, 320, - // DR-DOS 3.41 - 720,640,2400,1440,2880,360,320, - // DR-DOS 5.00 - 720,640,2400,1440,2880,360,320, - // DR-DOS 6.00 - 720,640,2400,1440,5760,2880,360,320, - // DR-DOS 7.02 - 720,640,2400,1440,5760,2880,360,320, - // DR-DOS 7.03 - 720,640,2400,1440,5760,2880, - // DR-DOS 8.00 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 3.30A - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 3.31 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 4.01 - 720,640,2400,1440,2880,360,320, - // MS-DOS 5.00 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 6.00 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 6.20 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 6.20 RC1 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 6.21 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 6.22 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 7.10 - 720,640,2400,1440,5760,2880,360,320, - // MS-DOS 3.20 for Amstrad - 720,640,2400,1440,360,320, - // MS-DOS 2.11 for AT&T - 720, - // MS-DOS 3.30 for DeLL - 720,640,2400,1440,2880,360,320, - // MS-DOS 3.10 for Epson - 720,640,2400, - // MS-DOS 3.20 for Epson - 720,640,2400,1440,360,320, - // MS-DOS 3.20 for HP - 720,640,2400,1440,2880,360,320, - // MS-DOS 3.21 for Hyosung - 720,640,2400,1440,2880,360,320, - // MS-DOS 3.21 for Kaypro - 720,640,2400,1440,2880,360,320, - // MS-DOS 3.10 for Olivetti - 720,2400,360, - // MS-DOS 3.30 for Toshiba - 720,640,2400,1440,2880,360,320, - // MS-DOS 4.01 for Toshiba - 720,640,2400,1440,2880,360,320, - // Novell DOS 7.00 - 720,640,2400,1440,5760,2880,360,320, - // OpenDOS 7.01 - 720,640,2400,1440,5760,2880,360,320, - // PC-DOS 2.00 - 720, - // PC-DOS 2.10 - 720, - // PC-DOS 2000 - 720,640,2400,1440,5760,2880,360,320, - // PC-DOS 3.00 - 2400, - // PC-DOS 3.10 - 2400, - // PC-DOS 3.30 - 2400,2880, - // PC-DOS 4.00 - 2400,2880, - // PC-DOS 5.00 - 720,640,2400,1440,5760,2880,360,320, - // PC-DOS 5.02 - 720,640,2400,1440,5760,2880,360,320, - // PC-DOS 6.10 - 720,640,2400,1440,5760,2880,360,320, - // PC-DOS 6.30 - 720,640,2400,1440,5760,2880,360,320, - // mkfs.vfat - 2400,1440,5760,2880, - // mkfs.vfat for Atari - 2400,1440,5760,2880, - // Microsoft OS/2 1.00 for Tandy - 720,2400,1440,2880, - // Microsoft OS/2 1.10 for AST - 720,2400,1440,2880, - // Microsoft OS/2 1.10 for Nokia - 720,2400,1440,2880, - // Microsoft OS/2 1.21 - 720,2400,1440,2880, - // Microsoft OS/2 1.30.1 - 720,2400,1440,5760,2880, - // OS/2 1.20 - 720,2400,1440,2880, - // OS/2 1.30 - 720,2400,1440,2880, - // OS/2 2.00 - 720,2400,1440,5760,2880, - // OS/2 2.10 - 720,2400,1440,5760,2880, - // OS/2 2.11 - 720,2400,1440,5760,2880, - // OS/2 Warp 3 - 2400,1440,5760,2880, - // OS/2 Warp 4 - 2400,1440,5760,2880, - // eComStation - 2400,1440,5760,2880, - // Windows 95 - 640,720,2400,1440,5760,2880,320,360, - // Windows 95 OSR 2 - 640,720,2400,1440,5760,2880,320,360, - /// Windows 95 OSR 2.1 - 640,720,2400,1440,5760,2880,320,360, - // Windows 95 OSR 2.5 - 640,720,2400,1440,5760,2880,320,360, - // Windows 98 - 640,720,2400,1440,5760,2880,320,360, - // Windows 98 Second Edition - 640,720,2400,1440,5760,2880,320,360, - // Windows Me - 720,2400,1440,5760,2880, - // Windows NT 3.10 - 2400,1440,5760,2880, - // Windows NT 3.50 - 2400,1440,5760,2880, - // Windows NT 3.51 - 2400,1440,5760,2880, - // Windows NT 4.00 - 720,2400,1440,5760,2880,360, - // Windows 2000 - 720,2400,1440,5760,2880, - // Windows Vista - 720,2400,1440,5760,2880, - // BeOS R4.5 - 2880, + 1024000, 204800, 1024000, 409600, + 1024000, 614400, 1024000, 819200, + 1024000, 1024000, 1228800, }; readonly uint[] sectorsize = { - // Concurrent DOS 6.00 - 512, 512, 512, - // DR-DOS 3.40 - 512, 512, 512, 512, 512, 512, 512, - // DR-DOS 3.41 - 512,512,512,512,512,512,512, - // DR-DOS 5.00 - 512,512,512,512,512,512,512, - // DR-DOS 6.00 - 512,512,512,512,512,512,512,512, - // DR-DOS 7.02 - 512,512,512,512,512,512,512,512, - // DR-DOS 7.03 - 512,512,512,512,512,512, - // DR-DOS 8.00 - 512,512,512,512,512,512,512,512, - // MS-DOS 3.30A - 512,512,512,512,512,512,512,512, - // MS-DOS 3.31 - 512,512,512,512,512,512,512,512, - // MS-DOS 4.01 - 512,512,512,512,512,512,512, - // MS-DOS 5.00 - 512,512,512,512,512,512,512,512, - // MS-DOS 6.00 - 512,512,512,512,512,512,512,512, - // MS-DOS 6.20 - 512,512,512,512,512,512,512,512, - // MS-DOS 6.20 RC1 - 512,512,512,512,512,512,512,512, - // MS-DOS 6.21 - 512,512,512,512,512,512,512,512, - // MS-DOS 6.22 - 512,512,512,512,512,512,512,512, - // MS-DOS 7.10 - 512,512,512,512,512,512,512,512, - // MS-DOS 3.20 for Amstrad - 512,512,512,512,512,512, - // MS-DOS 2.11 for AT&T - 512, - // MS-DOS 3.30 for DeLL - 512,512,512,512,512,512,512, - // MS-DOS 3.10 for Epson - 512,512,512, - // MS-DOS 3.20 for Epson - 512,512,512,512,512,512, - // MS-DOS 3.20 for HP - 512,512,512,512,512,512,512, - // MS-DOS 3.21 for Hyosung - 512,512,512,512,512,512,512, - // MS-DOS 3.21 for Kaypro - 512,512,512,512,512,512,512, - // MS-DOS 3.10 for Olivetti - 512,512,512, - // MS-DOS 3.30 for Toshiba - 512,512,512,512,512,512,512, - // MS-DOS 4.01 for Toshiba - 512,512,512,512,512,512,512, - // Novell DOS 7.00 - 512,512,512,512,512,512,512,512, - // OpenDOS 7.01 - 512,512,512,512,512,512,512,512, - // PC-DOS 2.00 - 512, - // PC-DOS 2.10 - 512, - // PC-DOS 2000 - 512,512,512,512,512,512,512,512, - // PC-DOS 3.00 - 512, - // PC-DOS 3.10 - 512, - // PC-DOS 3.30 - 512,512, - // PC-DOS 4.00 - 512,512, - // PC-DOS 5.00 - 512,512,512,512,512,512,512,512, - // PC-DOS 5.02 - 512,512,512,512,512,512,512,512, - // PC-DOS 6.10 - 512,512,512,512,512,512,512,512, - // PC-DOS 6.30 - 512,512,512,512,512,512,512,512, - // mkfs.vfat - 512,512,512,512, - // mkfs.vfat for Atari - 512,512,512,512, - // Microsoft OS/2 1.00 for Tandy - 512,512,512,512, - // Microsoft OS/2 1.10 for AST - 512,512,512,512, - // Microsoft OS/2 1.10 for Nokia - 512,512,512,512, - // Microsoft OS/2 1.21 - 512,512,512,512, - // Microsoft OS/2 1.30.1 - 512,512,512,512,512, - // OS/2 1.20 - 512,512,512,512, - // OS/2 1.30 - 512,512,512,512, - // OS/2 2.00 - 512,512,512,512,512, - // OS/2 2.10 - 512,512,512,512,512, - // OS/2 2.11 - 512,512,512,512,512, - // OS/2 Warp 3 - 512,512,512,512, - // OS/2 Warp 4 - 512,512,512,512, - // eComStation - 512,512,512,512, - // Windows 95 - 512,512,512,512,512,512,512,512, - // Windows 95 OSR 2 - 512,512,512,512,512,512,512,512, - /// Windows 95 OSR 2.1 - 512,512,512,512,512,512,512,512, - // Windows 95 OSR 2.5 - 512,512,512,512,512,512,512,512, - // Windows 98 - 512,512,512,512,512,512,512,512, - // Windows 98 Second Edition - 512,512,512,512,512,512,512,512, - // Windows Me - 512,512,512,512,512, - // Windows NT 3.10 - 512,512,512,512, - // Windows NT 3.50 - 512,512,512,512, - // Windows NT 3.51 - 512,512,512,512, - // Windows NT 4.00 - 512,512,512,512,512,512, - // Windows 2000 - 512,512,512,512,512, - // Windows Vista - 512,512,512,512,512, - // BeOS R4.5 - 512, + 512, 512, 512, 512, + 512, 512, 512, 512, + 512, 512, 512, }; readonly long[] clusters = { - // Concurrent DOS 6.00 - 2400, 720, 2880, - // DR-DOS 3.40 - 360,320,2400,720,2880,360,320, - // DR-DOS 3.41 - 360,320,2400,720,2880,360,320, - // DR-DOS 5.00 - 360,320,2400,720,2880,360,320, - // DR-DOS 6.00 - 360,320,2400,720,2880,2880,360,320, - // DR-DOS 7.02 - 360,320,2400,720,2880,2880,360,320, - // DR-DOS 7.03 - 360,320,2400,720,2880,2880, - // DR-DOS 8.00 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 3.30A - 360,320,2400,720,5760,2880,360,320, - // MS-DOS 3.31 - 360,320,2400,720,5760,2880,360,320, - // MS-DOS 4.01 - 360,320,2400,720,2880,360,320, - // MS-DOS 5.00 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 6.00 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 6.20 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 6.20 RC1 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 6.21 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 6.22 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 7.10 - 360,320,2400,720,2880,2880,360,320, - // MS-DOS 3.20 for Amstrad - 360,320,2400,720,360,320, - // MS-DOS 2.11 for AT&T - 360, - // MS-DOS 3.30 for DeLL - 360,320,2400,720,2880,360,320, - // MS-DOS 3.10 for Epson - 360,320,2400, - // MS-DOS 3.20 for Epson - 360,320,2400,720,360,320, - // MS-DOS 3.20 for HP - 360,320,2400,720,2880,360,320, - // MS-DOS 3.21 for Hyosung - 360,320,2400,720,2880,360,320, - // MS-DOS 3.21 for Kaypro - 360,320,2400,720,2880,360,320, - // MS-DOS 3.10 for Olivetti - 360,2400,360, - // MS-DOS 3.30 for Toshiba - 360,320,2400,720,2880,360,320, - // MS-DOS 4.01 for Toshiba - 360,320,2400,720,2880,360,320, - // Novell DOS 7.00 - 360,320,2400,720,2880,2880,360,320, - // OpenDOS 7.01 - 360,320,2400,720,2880,2880,360,320, - // PC-DOS 2.00 - 360, - // PC-DOS 2.10 - 360, - // PC-DOS 2000 - 360,320,2400,720,2880,2880,360,320, - // PC-DOS 3.00 - 2400, - // PC-DOS 3.10 - 2400, - // PC-DOS 3.30 - 2400,2880, - // PC-DOS 4.00 - 2400,2880, - // PC-DOS 5.00 - 360,320,2400,720,2880,2880,360,320, - // PC-DOS 5.02 - 360,320,2400,720,2880,2880,360,320, - // PC-DOS 6.10 - 360,320,2400,720,2880,2880,360,320, - // PC-DOS 6.30 - 360,320,2400,720,2880,2880,360,320, - // mkfs.vfat - 2400,720,2880,2880, - // mkfs.vfat for Atari - 1200,720,2880,1440, - // Microsoft OS/2 1.00 for Tandy - 360,2400,720,2880, - // Microsoft OS/2 1.10 for AST - 360,2400,720,2880, - // Microsoft OS/2 1.10 for Nokia - 360,2400,720,2880, - // Microsoft OS/2 1.21 - 360,2400,720,2880, - // Microsoft OS/2 1.30.1 - 360,2400,720,2880,2880, - // OS/2 1.20 - 360,2400,720,2880, - // OS/2 1.30 - 360,2400,720,2880, - // OS/2 2.00 - 360,2400,720,2880,2880, - // OS/2 2.10 - 360,2400,720,2880,2880, - // OS/2 2.11 - 360,2400,720,2880,2880, - // OS/2 Warp 3 - 2400,720,2880,2880, - // OS/2 Warp 4 - 2400,720,2880,2880, - // eComStation - 2400,720,2880,2880, - // Windows 95 - 320,360,2400,720,2880,2880,320,360, - // Windows 95 OSR 2 - 320,360,2400,720,2880,2880,320,360, - /// Windows 95 OSR 2.1 - 320,360,2400,720,2880,2880,320,360, - // Windows 95 OSR 2.5 - 320,360,2400,720,2880,2880,320,360, - // Windows 98 - 320,360,2400,720,2880,2880,320,360, - // Windows 98 Second Edition - 320,360,2400,720,2880,2880,320,360, - // Windows Me - 360,2400,720,2880,2880, - // Windows NT 3.10 - 2400,720,2880,2880, - // Windows NT 3.50 - 2400,720,2880,2880, - // Windows NT 3.51 - 2400,720,2880,2880, - // Windows NT 4.00 - 360,2400,720,2880,2880,360, - // Windows 2000 - 360,2400,720,2880,2880, - // Windows Vista - 360,2400,720,2880,2880, - // BeOS R4.5 - 2880, + 1024000, 204800, 1024000, 409600, + 1024000, 614400, 1024000, 819200, + 1024000, 1024000, 1228800, }; readonly int[] clustersize = { - // Concurrent DOS 6.00 - 512, 1024, 512, - // DR-DOS 3.40 - 1024,1024,512,1024,512,512,512, - // DR-DOS 3.41 - 1024,1024,512,1024,512,512,512, - // DR-DOS 5.00 - 1024,1024,512,1024,512,512,512, - // DR-DOS 6.00 - 1024,1024,512,1024,1024,512,512,512, - // DR-DOS 7.02 - 1024,1024,512,1024,1024,512,512,512, - // DR-DOS 7.03 - 1024,1024,512,1024,1024,512, - // DR-DOS 8.00 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 3.30A - 1024,1024,512,1024,512,512,512,512, - // MS-DOS 3.31 - 1024,1024,512,1024,512,512,512,512, - // MS-DOS 4.01 - 1024,1024,512,1024,512,512,512, - // MS-DOS 5.00 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 6.00 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 6.20 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 6.20 RC1 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 6.21 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 6.22 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 7.10 - 1024,1024,512,1024,1024,512,512,512, - // MS-DOS 3.20 for Amstrad - 1024,1024,512,1024,512,512, - // MS-DOS 2.11 for AT&T - 1024, - // MS-DOS 3.30 for DeLL - 1024,1024,512,1024,512,512,512, - // MS-DOS 3.10 for Epson - 1024,1024,512, - // MS-DOS 3.20 for Epson - 1024,1024,512,1024,512,512, - // MS-DOS 3.20 for HP - 1024,1024,512,1024,512,512,512, - // MS-DOS 3.21 for Hyosung - 1024,1024,512,1024,512,512,512, - // MS-DOS 3.21 for Kaypro - 1024,1024,512,1024,512,512,512, - // MS-DOS 3.10 for Olivetti - 1024,512,512, - // MS-DOS 3.30 for Toshiba - 1024,1024,512,1024,512,512,512, - // MS-DOS 4.01 for Toshiba - 1024,1024,512,1024,512,512,512, - // Novell DOS 7.00 - 1024,1024,512,1024,1024,512,512,512, - // OpenDOS 7.01 - 1024,1024,512,1024,1024,512,512,512, - // PC-DOS 2.00 - 1024, - // PC-DOS 2.10 - 1024, - // PC-DOS 2000 - 1024,1024,512,1024,1024,512,512,512, - // PC-DOS 3.00 - 512, - // PC-DOS 3.10 - 512, - // PC-DOS 3.30 - 512,512, - // PC-DOS 4.00 - 512,512, - // PC-DOS 5.00 - 1024,1024,512,1024,1024,512,512,512, - // PC-DOS 5.02 - 1024,1024,512,1024,1024,512,512,512, - // PC-DOS 6.10 - 1024,1024,512,1024,1024,512,512,512, - // PC-DOS 6.30 - 1024,1024,512,1024,1024,512,512,512, - // mkfs.vfat - 512,1024,1024,512, - // mkfs.vfat for Atari - 1024,1024,1024,1024, - // Microsoft OS/2 1.00 for Tandy - 1024,512,1024,512, - // Microsoft OS/2 1.10 for AST - 1024,512,1024,512, - // Microsoft OS/2 1.10 for Nokia - 1024,512,1024,512, - // Microsoft OS/2 1.21 - 1024,512,1024,512, - // Microsoft OS/2 1.30.1 - 1024,512,1024,1024,512, - // OS/2 1.20 - 1024,512,1024,512, - // OS/2 1.30 - 1024,512,1024,512, - // OS/2 2.00 - 1024,512,1024,1024,512, - // OS/2 2.10 - 1024,512,1024,1024,512, - // OS/2 2.11 - 1024,512,1024,1024,512, - // OS/2 Warp 3 - 512,1024,1024,512, - // OS/2 Warp 4 - 512,1024,1024,512, - // eComStation - 512,1024,1024,512, - // Windows 95 - 1024,1024,512,1024,1024,512,512,512, - // Windows 95 OSR 2 - 1024,1024,512,1024,1024,512,512,512, - /// Windows 95 OSR 2.1 - 1024,1024,512,1024,1024,512,512,512, - // Windows 95 OSR 2.5 - 1024,1024,512,1024,1024,512,512,512, - // Windows 98 - 1024,1024,512,1024,1024,512,512,512, - // Windows 98 Second Edition - 1024,1024,512,1024,1024,512,512,512, - // Windows Me - 1024,512,1024,1024,512, - // Windows NT 3.10 - 512,1024,1024,512, - // Windows NT 3.50 - 512,1024,1024,512, - // Windows NT 3.51 - 512,1024,1024,512, - // Windows NT 4.00 - 1024,512,1024,512,512,512, - // Windows 2000 - 1024,512,1024,1024,512, - // Windows Vista - 1024,512,1024,1024,512, - // BeOS R4.5 - 512, + 512, 512, 512, 512, + 512, 512, 512, 512, + 512, 512, 512, + }; + + readonly string[] udfversion = { + "UDF v1.02", "UDF v1.02", "UDF v1.50", "UDF v1.50", + "UDF v2.00", "UDF v2.00", "UDF v2.01", "UDF v2.01", + "UDF v2.50", "UDF v2.50", "UDF v2.50", }; readonly string[] volumename = { - // Concurrent DOS 6.00 - null, null, null, - // DR-DOS 3.40 - null, null, null, null, null, null, null, - // DR-DOS 3.41 - null, null, null, null, null, null, null, - // DR-DOS 5.00 - null, null, null, null, null, null, null, - // DR-DOS 6.00 - null, null, null, null, null, null, null, null, - // DR-DOS 7.02 - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // DR-DOS 7.03 - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // DR-DOS 8.00 - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // MS-DOS 3.30A - null, null, null, null, null, null, null,null, - // MS-DOS 3.31 - null, null, null, null, null, null, null,null, - // MS-DOS 4.01 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 5.00 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 6.00 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 6.20 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 6.20 RC1 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 6.21 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 6.22 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 7.10 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // MS-DOS 3.20 for Amstrad - null,null,null,null,null,null, - // MS-DOS 2.11 for AT&T - null, - // MS-DOS 3.30 for DeLL - null,null,null,null,null,null,null, - // MS-DOS 3.10 for Epson - null,null,null, - // MS-DOS 3.20 for Epson - null,null,null,null,null,null, - // MS-DOS 3.20 for HP - null,null,null,null,null,null,null, - // MS-DOS 3.21 for Hyosung - null,null,null,null,null,null,null, - // MS-DOS 3.21 for Kaypro - null,null,null,null,null,null,null, - // MS-DOS 3.10 for Olivetti - null,null,null, - // MS-DOS 3.30 for Toshiba - null,null,null,null,null,null,null, - // MS-DOS 4.01 for Toshiba - "VOLUMELABEL","NO NAME ","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","NO NAME ", - // Novell DOS 7.00 - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // OpenDOS 7.01 - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // PC-DOS 2.00 - null, - // PC-DOS 2.10 - null, - // PC-DOS 2000 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // PC-DOS 3.00 - null, - // PC-DOS 3.10 - null, - // PC-DOS 3.30 - null,null, - // PC-DOS 4.00 - "VOLUMELABEL","VOLUMELABEL", - // PC-DOS 5.00 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // PC-DOS 5.02 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // PC-DOS 6.10 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // PC-DOS 6.30 - "VOLUMELABEL",null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL",null, - // mkfs.vfat - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // mkfs.vfat for Atari - null,null,null,null, - // Microsoft OS/2 1.00 for Tandy - null,null,null,null, - // Microsoft OS/2 1.10 for AST - null,null,null,null, - // Microsoft OS/2 1.10 for Nokia - null,null,null,null, - // Microsoft OS/2 1.21 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Microsoft OS/2 1.30.1 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 1.20 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 1.30 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 2.00 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 2.10 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 2.11 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 Warp 3 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // OS/2 Warp 4 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // eComStation - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Windows 95 - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - // Windows 95 OSR 2 - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - /// Windows 95 OSR 2.1 - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - // Windows 95 OSR 2.5 - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - // Windows 98 - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - // Windows 98 Second Edition - null,"VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", - // Windows Me - "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - // Windows NT 3.10 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Windows NT 3.50 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Windows NT 3.51 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Windows NT 4.00 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ", - "NO NAME ","NO NAME ", - // Windows 2000 - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // Windows Vista - "NO NAME ","NO NAME ","NO NAME ","NO NAME ","NO NAME ", - // BeOS R4.5 - "NO NAME ", + "Volume label", "Volume label", "Volume label", "Volume label", + "Volume label", "Volume label", "Volume label", "Volume label", + "Volume label", "Volume label", "Volume label", }; readonly string[] volumeserial = { - // Concurrent DOS 6.00 - null, null, null, - // DR-DOS 3.40 - null, null, null, null, null, null, null, - // DR-DOS 3.41 - null, null, null, null, null, null, null, - // DR-DOS 5.00 - null, null, null, null, null, null, null, - // DR-DOS 6.00 - null, null, null, null, null, null, null, null, - // DR-DOS 7.02 - "1BF63C69","1BF70E75","1BF7185F","1BF80C4F","1BF90F1D","1BF82777","1BF72430","1BF72F1E", - // DR-DOS 7.03 - "0C1A2013","0CE22B5B","0CEA1D3E","0CEE102F","0CEE3760","0CEF2739", - // DR-DOS 8.00 - "1BFD1977","1BFD2D3F","1BFD3531","1BFC3231","1BFA1D58","1BFC117D","1BFE0971","1BFE1423", - // MS-DOS 3.30A - null, null, null, null, null, null, null,null, - // MS-DOS 3.31 - null, null, null, null, null, null, null,null, - // MS-DOS 4.01 - "122C190A",null,"2480190A","2D471909","0F5A1908","2F3D190A",null, - // MS-DOS 5.00 - "0B6018F8",null,"1E3518F8","285A18FB","231D18FE","415118FC","316118F8",null, - // MS-DOS 6.00 - "067B18F6",null,"193418F6","1F3A18F5","165318F3","172418F4","234918F6",null, - // MS-DOS 6.20 - "265418ED",null,"0B7018EE","127418F0","137F18F2","364C18F0","185C18EE",null, - // MS-DOS 6.20 RC1 - "064B18EB",null,"192518EB","244C18EA","3C3118E7","344118E9","267E18EB",null, - // MS-DOS 6.21 - "2A41181B",null,"0641181C","3B26181C","082518E2","237118E1","123F181C",null, - // MS-DOS 6.22 - "317C1818",null,"0D3A1819","3C251817","387A1815","185E1817","18231819",null, - // MS-DOS 7.10 - "1156180A",null,"2951180A","3057180B","2B4A1811","344B180C","352D180A",null, - // MS-DOS 3.20 for Amstrad - null,null,null,null,null,null, - // MS-DOS 2.11 for AT&T - null, - // MS-DOS 3.30 for DeLL - null,null,null,null,null,null,null, - // MS-DOS 3.10 for Epson - null,null,null, - // MS-DOS 3.20 for Epson - null,null,null,null,null,null, - // MS-DOS 3.20 for HP - null,null,null,null,null,null,null, - // MS-DOS 3.21 for Hyosung - null,null,null,null,null,null,null, - // MS-DOS 3.21 for Kaypro - null,null,null,null,null,null,null, - // MS-DOS 3.10 for Olivetti - null,null,null, - // MS-DOS 3.30 for Toshiba - null,null,null,null,null,null,null, - // MS-DOS 4.01 for Toshiba - "0B2519E7","163419E7","1E3119E7","133919E9","177419EA","317E19E7","3B7319E7", - // Novell DOS 7.00 - "1BE7254C","1BE73024","1BE7397C","1BE63635","1BE51661","1BE61143","1BE80A5D","1BE8144C", - // OpenDOS 7.01 - "1BE93E2B","1BEA234D","1BEA325D","1BEB294F","1BEC2C2E","1BEC0C5D","1BEA3E60","1BEB0E26", - // PC-DOS 2.00 - null, - // PC-DOS 2.10 - null, - // PC-DOS 2000 - "2634100E",null,"3565100E","3B6B1012","3B2D1013","1D491013","4136100E",null, - // PC-DOS 3.00 - null, - // PC-DOS 3.10 - null, - // PC-DOS 3.30 - null,null, - // PC-DOS 4.00 - "3C240FE3","2E3E0FE1", - // PC-DOS 5.00 - "33260FF9",null,"11550FFA","234F0FFB","2F600FFC","0D550FFC","1D630FFA",null, - // PC-DOS 5.02 - "06231000",null,"1A3E1000","1F3B0FFF","3D750FFD","3F4F0FFE","26471000",null, - // PC-DOS 6.10 - "25551004",null,"3E5F1004","142D1006","17541007","355A1006","0D5E1005",null, - // PC-DOS 6.30 - "2B22100C",null,"3B47100C","0C55100C","1B80100A","0B59100B","0A3A100D",null, - // mkfs.vfat - "20C279B1","20FD9501","2132D70A","2118F1AA", - // mkfs.vfat for Atari - null,null,null,null, - // Microsoft OS/2 1.00 for Tandy - "9C170C15","9BFB0C15","9C13FC15","9BF99C15", - // Microsoft OS/2 1.10 for AST - "66A42C15","67696C15","66DEBC15","66DC4C15", - // Microsoft OS/2 1.10 for Nokia - "676B4C15","67768C15","9C12DC15","66A74C15", - // Microsoft OS/2 1.21 - "9C074C15","66BCFC15","66C1AC15","66C7FC15", - // Microsoft OS/2 1.30.1 - "66C47C15","66CBEC15","9C167C15","9C147C15","9C0FEC15", - // OS/2 1.20 - "5BF5E015","5BE61015","5C26F015","5C376015", - // OS/2 1.30 - "5C418015","5BE20015","5C7F1015","5B83C015", - // OS/2 2.00 - "5C3BD015","5B807015","5BE69015","5C187015","5C390015", - // OS/2 2.10 - "1BFCB414","E6C6C414","E6CCF414","E6AF6414","1C005414", - // OS/2 2.11 - "E6AEB414","1C00D414","1C03B414","E6C90414","E6B6E414", - // OS/2 Warp 3 - "E6AF7414","E6D63414","E6A65414","E6AE6414", - // OS/2 Warp 4 - "E6CD9414","1BFAD414","E6DFF414","E6D4C414", - // eComStation - "E6CA5814","E6CBC814","E6B81814","1C013814", - // Windows 95 - null,"3B360D0D","24240D0D","3C260D11", - "30050D10","275A0D11",null,"3B100D0F", - // Windows 95 OSR 2 - null,"1C5B0D19","11510D19","0F1F0D15", - "40200D17","3D610D14",null,"280B0D19", - /// Windows 95 OSR 2.1 - null,"1F3B0D1C","14470D1C","1C510DE4", - "2E250DE2","10640DE4",null,"2B3E0D1C", - // Windows 95 OSR 2.5 - null,"18190DFB","0A240DFB","1E320DE7", - "33230DE8","125B0DE7",null,"21410DFB", - // Windows 98 - null,"40090E0F","28140E0F","0E620E0A", - "14390E0D","0E081246",null,"30600E10", - // Windows 98 Second Edition - null,"1B550EEC","1B100EEB","08410EE6", - "0E0F0EE8","325D0EE4",null,"13380EEC", - // Windows Me - "2F200F02","103A0F01","2F1C0EFC","21570EFF","07040EFB", - // Windows NT 3.10 - "60EA50BC","6C857D51","4009440C","30761EDC", - // Windows NT 3.50 - "0C478404","7CBEB35B","7C1E8DCB","ECB276AF", - // Windows NT 3.51 - "482D8681","8889C95E","54DE6C39","F47D2516", - // Windows NT 4.00 - "D8CAAC1F","E0BB6D70","C08C3C60","9C44B411", - "4C7DD099","4CD82982", - // Windows 2000 - "4019989C","78F30AF8","E4217DDE","80B3B996","28043527", - // Windows Vista - "3C9F0BD2","3A8E465C","B2EFB822","3C30C632","16DAB07A", - // BeOS R4.5 - "00000000", + "595c5cfa38ce8b66LinuxUDF", "6D02A231 (Mac OS X newfs_udf) UDF Volume Set", "595c5d00c5b3405aLinuxUDF", "4DD0458B (Mac OS X newfs_udf) UDF Volume Set", + "595c5d07f4fc8e8dLinuxUDF", "5D91CB4F (Mac OS X newfs_udf) UDF Volume Set", "595c5d0bee60c3bbLinuxUDF", "48847EB3 (Mac OS X newfs_udf) UDF Volume Set", + "595c5d0e4f338552LinuxUDF", "709E84A1 (Mac OS X newfs_udf) UDF Volume Set", "78CE3237 (Mac OS X newfs_udf) UDF Volume Set", }; readonly string[] oemid = { - // Concurrent DOS 6.00 - "DIGITAL ", "DIGITAL ", "DIGITAL ", - // DR-DOS 3.40 - "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", - // DR-DOS 3.41 - "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", "DIGITAL ", - // DR-DOS 5.00 - "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", - // DR-DOS 6.00 - "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", "IBM 3.3", - // DR-DOS 7.02 - "DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7", - // DR-DOS 7.03 - "DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7", - // DR-DOS 8.00 - "DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7","DRDOS 7", - // MS-DOS 3.30A - "MSDOS3.3",null,"MSDOS3.3","MSDOS3.3","MSDOS3.3","MSDOS3.3","MSDOS3.3",null, - // MS-DOS 3.31 - "IBM 3.3",null,"IBM 3.3","IBM 3.3","IBM 3.3","IBM 3.3","IBM 3.3",null, - // MS-DOS 4.01 - "MSDOS4.0",null,"MSDOS4.0","MSDOS4.0","MSDOS4.0","MSDOS4.0",null, - // MS-DOS 5.00 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 6.00 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 6.20 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 6.20 RC1 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 6.21 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 6.22 - "MSDOS5.0",null,"MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0",null, - // MS-DOS 7.10 - "MSWIN4.1",null,"MSWIN4.1","MSWIN4.1","MSWIN4.1","MSWIN4.1","MSWIN4.1",null, - // MS-DOS 3.20 for Amstrad - "MSDOS3.2",null,"MSDOS3.2","MSDOS3.2","MSDOS3.2",null, - // MS-DOS 2.11 for AT&T - "PSA 1.04", - // MS-DOS 3.30 for DeLL - "IBM 3.3",null,"IBM 3.3","IBM 3.3","IBM 3.3","IBM 3.3",null, - // MS-DOS 3.10 for Epson - "EPS 3.10","EPS 3.10","EPS 3.10", - // MS-DOS 3.20 for Epson - "IBM 3.2","IBM 3.2","IBM 3.2","IBM 3.2","IBM 3.2","IBM 3.2", - // MS-DOS 3.20 for HP - "MSDOS3.2",null,"MSDOS3.2","MSDOS3.2","MSDOS3.2","MSDOS3.2",null, - // MS-DOS 3.21 for Hyosung - "MSDOS3.2",null,"MSDOS3.2","MSDOS3.2","MSDOS3.2","MSDOS3.2",null, - // MS-DOS 3.21 for Kaypro - "MSDOS3.2",null,"MSDOS3.2","MSDOS3.2","MSDOS3.2","MSDOS3.2",null, - // MS-DOS 3.10 for Olivetti - "IBM 3.1","IBM 3.1","IBM 3.1", - // MS-DOS 3.30 for Toshiba - "IBM 3.3",null,"IBM 3.3","IBM 3.3","IBM 3.3","IBM 3.3",null, - // MS-DOS 4.01 for Toshiba - "T V4.00 ","T V4.00 ","T V4.00 ","T V4.00 ","T V4.00 ","T V4.00 ","T V4.00 ", - // Novell DOS 7.00 - "NWDOS7.0","NWDOS7.0","NWDOS7.0","NWDOS7.0","NWDOS7.0","NWDOS7.0","NWDOS7.0","NWDOS7.0", - // OpenDOS 7.01 - "OPENDOS7","OPENDOS7","OPENDOS7","OPENDOS7","OPENDOS7","OPENDOS7","OPENDOS7","OPENDOS7", - // PC-DOS 2.00 - "IBM 2.0", - // PC-DOS 2.10 - "IBM 2.0", - // PC-DOS 2000 - "IBM 7.0",null,"IBM 7.0","IBM 7.0","IBM 7.0","IBM 7.0","IBM 7.0",null, - // PC-DOS 3.00 - "IBM 3.0", - // PC-DOS 3.10 - "IBM 3.1", - // PC-DOS 3.30 - "IBM 3.3","IBM 3.3", - // PC-DOS 4.00 - "IBM 4.0","IBM 4.0", - // PC-DOS 5.00 - "IBM 5.0",null,"IBM 5.0","IBM 5.0","IBM 5.0","IBM 5.0","IBM 5.0",null, - // PC-DOS 5.02 - "IBM 5.0",null,"IBM 5.0","IBM 5.0","IBM 5.0","IBM 5.0","IBM 5.0",null, - // PC-DOS 6.10 - "IBM 6.0",null,"IBM 6.0","IBM 6.0","IBM 6.0","IBM 6.0","IBM 6.0",null, - // PC-DOS 6.30 - "IBM 6.0",null,"IBM 6.0","IBM 6.0","IBM 6.0","IBM 6.0","IBM 6.0",null, - // mkfs.vfat - "mkfs.fat","mkfs.fat","mkfs.fat","mkfs.fat", - // mkfs.vfat for Atari - null,null,null,null, - // Microsoft OS/2 1.00 for Tandy - "TAN 10.0","TAN 10.0","TAN 10.0","TAN 10.0", - // Microsoft OS/2 1.10 for AST - "IBM 10.1","IBM 10.1","IBM 10.1","IBM 10.1", - // Microsoft OS/2 1.10 for Nokia - "IBM 10.1","IBM 10.1","IBM 10.1","IBM 10.1", - // Microsoft OS/2 1.21 - "IBM 10.2","IBM 10.2","IBM 10.2","IBM 10.2", - // Microsoft OS/2 1.30.1 - "IBM 10.2","IBM 10.2","IBM 10.2","IBM 10.2","IBM 10.2", - // OS/2 1.20 - "IBM 10.2","IBM 10.2","IBM 10.2","IBM 10.2", - // OS/2 1.30 - "IBM 10.2","IBM 10.2","IBM 10.2","IBM 10.2", - // OS/2 2.00 - "IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0", - // OS/2 2.10 - "IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0", - // OS/2 2.11 - "IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0", - // OS/2 Warp 3 - "IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0", - // OS/2 Warp 4 - "IBM 20.0","IBM 20.0","IBM 20.0","IBM 20.0", - // eComStation - "IBM 4.50","IBM 4.50","IBM 4.50","IBM 4.50", - // Windows 95 - null,"MSWIN4.0","MSWIN4.0","MSWIN4.0", - "MSWIN4.0","MSWIN4.0",null,"MSWIN4.0", - // Windows 95 OSR 2 - null,"MSWIN4.1","MSWIN4.1","MSWIN4.1", - "MSWIN4.1","MSWIN4.1",null,"MSWIN4.1", - /// Windows 95 OSR 2.1 - null,"MSWIN4.1","MSWIN4.1","MSWIN4.1", - "MSWIN4.1","MSWIN4.1",null,"MSWIN4.1", - // Windows 95 OSR 2.5 - null,"MSWIN4.1","MSWIN4.1","MSWIN4.1", - "MSWIN4.1","MSWIN4.1",null,"MSWIN4.1", - // Windows 98 - null,"MSWIN4.1","MSWIN4.1","MSWIN4.1", - "MSWIN4.1","MSWIN4.1",null,"MSWIN4.1", - // Windows 98 Second Edition - null,"MSWIN4.1","MSWIN4.1","MSWIN4.1", - "MSWIN4.1","MSWIN4.1",null,"MSWIN4.1", - // Windows Me - "MSWIN4.1","MSWIN4.1","MSWIN4.1","MSWIN4.1","MSWIN4.1", - // Windows NT 3.10 - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - // Windows NT 3.50 - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - // Windows NT 3.51 - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - // Windows NT 4.00 - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - "MSDOS5.0","MSDOS5.0", - // Windows 2000 - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - // Windows Vista - "MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0","MSDOS5.0", - // BeOS R4.5 - "BeOS ", + "*Linux UDFFS", "*Apple Mac OS X UDF FS", "*Linux UDFFS", "*Apple Mac OS X UDF FS", + "*Linux UDFFS", "*Apple Mac OS X UDF FS", "*Linux UDFFS", "*Apple Mac OS X UDF FS", + "*Linux UDFFS", "*Apple Mac OS X UDF FS", "*Apple Mac OS X UDF FS", }; [Test] @@ -1462,22 +106,21 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat12", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "udf", testfiles[i]); Filter filter = new LZip(); filter.Open(location); - ImagePlugin image = new ZZZRawImage(); + ImagePlugin image = new VDI(); Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); - Assert.AreEqual(mediatypes[i], image.ImageInfo.mediaType, testfiles[i]); Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); - Filesystem fs = new FAT(); + Filesystem fs = new DiscImageChef.Filesystems.UDF(); Assert.AreEqual(true, fs.Identify(image, 0, image.ImageInfo.sectors - 1), testfiles[i]); fs.GetInformation(image, 0, image.ImageInfo.sectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("FAT12", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(udfversion[i], fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); - Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSetIdentifier, testfiles[i]); Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); } } diff --git a/DiscImageChef.Tests/Filesystems/UFS_MBR.cs b/DiscImageChef.Tests/Filesystems/UFS_MBR.cs index e7659623a..3ff496a2c 100644 --- a/DiscImageChef.Tests/Filesystems/UFS_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/UFS_MBR.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : HFS_MBR.cs +// Filename : UFS_MBR.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,34 +48,34 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class HFS_MBR + public class UFS_MBR { readonly string[] testfiles = { - "linux.vdi.lz", + "ufs1/linux.vdi.lz", "ufs2/linux.vdi.lz", }; readonly ulong[] sectors = { - 262144, + 262144, 262144, }; readonly uint[] sectorsize = { - 512, + 512, 512, }; readonly long[] clusters = { - 65018, + 65024, 65018, }; readonly int[] clustersize = { - 2048, + 2048, 2048 }; readonly string[] volumename = { - "Volume label", + "Volume label", "Volume label", }; readonly string[] volumeserial = { - "0000000000000000", + "59588B778E9ACDEF", "UNKNOWN", }; [Test] @@ -83,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsplus_mbr", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "ufs_mbr", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -92,11 +92,11 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.AppleHFS(); + Filesystem fs = new DiscImageChef.Filesystems.FFSPlugin(); int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "0xAF") + if(partitions[j].PartitionType == "0x83") { part = j; break; @@ -107,7 +107,7 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("HFS", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("UFS", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); } diff --git a/DiscImageChef.Tests/Filesystems/UNIXBFS.cs b/DiscImageChef.Tests/Filesystems/UNIXBFS.cs index 44e02391d..fa7f873b6 100644 --- a/DiscImageChef.Tests/Filesystems/UNIXBFS.cs +++ b/DiscImageChef.Tests/Filesystems/UNIXBFS.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : btrfs.cs +// Filename : unixbfs.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,7 +48,7 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class btrfs + public class unixbfs { readonly string[] testfiles = { "linux.vdi.lz", @@ -63,19 +63,15 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 32512, + 260096, }; readonly int[] clustersize = { - 4096, + 512, }; readonly string[] volumename = { - "VolumeLabel", - }; - - readonly string[] volumeserial = { - "a4fc5201-85cc-6840-8a68-998cab9ae897", + "Label", }; [Test] @@ -83,7 +79,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "btrfs", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "unixbfs", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -92,7 +88,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.BTRFS(); + Filesystem fs = new DiscImageChef.Filesystems.BFS(); int part = -1; for(int j = 0; j < partitions.Count; j++) { @@ -107,9 +103,8 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("B-tree file system", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("BFS", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); - Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/btrfs.cs b/DiscImageChef.Tests/Filesystems/btrfs.cs index bd423782d..44e02391d 100644 --- a/DiscImageChef.Tests/Filesystems/btrfs.cs +++ b/DiscImageChef.Tests/Filesystems/btrfs.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : BeFS_MBR.cs +// Filename : btrfs.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,38 +48,34 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class BeFS_MBR + public class btrfs { readonly string[] testfiles = { - "beos_r3.1.vdi.lz", "beos_r4.5.vdi.lz", + "linux.vdi.lz", }; readonly ulong[] sectors = { - 1572864, 1572864, + 262144, }; readonly uint[] sectorsize = { - 512, 512, + 512, }; readonly long[] clusters = { - 786400, 785232, + 32512, }; readonly int[] clustersize = { - 1024, 1024, + 4096, }; readonly string[] volumename = { - "Volume label","Volume label", + "VolumeLabel", }; readonly string[] volumeserial = { - null,null, - }; - - readonly string[] oemid = { - null,null, + "a4fc5201-85cc-6840-8a68-998cab9ae897", }; [Test] @@ -87,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "befs_mbr", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "btrfs", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -96,11 +92,11 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.BeFS(); + Filesystem fs = new DiscImageChef.Filesystems.BTRFS(); int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "0xEB") + if(partitions[j].PartitionType == "0x83") { part = j; break; @@ -111,10 +107,9 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("BeFS", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("B-tree file system", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); - Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/exFAT_APM.cs b/DiscImageChef.Tests/Filesystems/exFAT_APM.cs index f33cadbc6..556764110 100644 --- a/DiscImageChef.Tests/Filesystems/exFAT_APM.cs +++ b/DiscImageChef.Tests/Filesystems/exFAT_APM.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : FAT16_APM.cs +// Filename : exFAT_APM.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,14 +48,14 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class FAT16_APM + public class exFAT_APM { readonly string[] testfiles = { "macosx.vdi.lz", }; readonly ulong[] sectors = { - 1024000, + 262144, }; readonly uint[] sectorsize = { @@ -63,23 +63,19 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 63995, + 32710, }; readonly int[] clustersize = { - 8192, + 4096, }; readonly string[] volumename = { - "VOLUMELABEL", + null, }; readonly string[] volumeserial = { - "063D1F09", - }; - - readonly string[] oemid = { - "BSD 4.4", + "595AC82C", }; [Test] @@ -87,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat16_apm", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "exfat_apm", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -96,11 +92,11 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new AppleMap(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.FAT(); + Filesystem fs = new DiscImageChef.Filesystems.exFAT(); int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "DOS_FAT_16") + if(partitions[j].PartitionType == "Windows_NTFS") { part = j; break; @@ -111,10 +107,9 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("FAT16", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("exFAT", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); - Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/exFAT_GPT.cs b/DiscImageChef.Tests/Filesystems/exFAT_GPT.cs index 0f75de483..4ad685753 100644 --- a/DiscImageChef.Tests/Filesystems/exFAT_GPT.cs +++ b/DiscImageChef.Tests/Filesystems/exFAT_GPT.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : FAT16_GPT.cs +// Filename : exFAT_GPT.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,14 +48,14 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class FAT16_GPT + public class exFAT_GPT { readonly string[] testfiles = { "macosx.vdi.lz", }; readonly ulong[] sectors = { - 1024000, + 262144, }; readonly uint[] sectorsize = { @@ -63,23 +63,19 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 63995, + 32208, }; readonly int[] clustersize = { - 8192, + 4096, }; readonly string[] volumename = { - "VOLUMELABEL", + null, }; readonly string[] volumeserial = { - "2E8A1F1B", - }; - - readonly string[] oemid = { - "BSD 4.4", + "595ACC39", }; [Test] @@ -87,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "fat16_gpt", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "exfat_gpt", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -96,7 +92,7 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new GuidPartitionTable(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.FAT(); + Filesystem fs = new DiscImageChef.Filesystems.exFAT(); int part = -1; for(int j = 0; j < partitions.Count; j++) { @@ -111,10 +107,9 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("FAT16", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("exFAT", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); - Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/exFAT_MBR.cs b/DiscImageChef.Tests/Filesystems/exFAT_MBR.cs index 394ffa3b5..58bd1244b 100644 --- a/DiscImageChef.Tests/Filesystems/exFAT_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/exFAT_MBR.cs @@ -2,7 +2,7 @@ // The Disc Image Chef // ---------------------------------------------------------------------------- // -// Filename : HFSPlus_MBR.cs +// Filename : exFAT_MBR.cs // Version : 1.0 // Author(s) : Natalia Portillo // @@ -48,38 +48,34 @@ using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { [TestFixture] - public class HFSPlus_MBR + public class exFAT_MBR { readonly string[] testfiles = { - "macosx.vdi.lz", "macosx_journal.vdi.lz", + "linux.vdi.lz", "macosx.vdi.lz", "win10.vdi.lz", "winvista.vdi.lz", }; readonly ulong[] sectors = { - 303104, 352256, + 262144, 262144, 262144, 262144, }; readonly uint[] sectorsize = { - 512, 512, + 512, 512, 512, 512, }; readonly long[] clusters = { - 37878, 44021, + 32464, 32712, 32448, 32208, }; readonly int[] clustersize = { - 4096, 4096, + 4096, 4096, 4096, 4096, }; readonly string[] volumename = { - "Volume label","Volume label", + null, null, null, null, }; readonly string[] volumeserial = { - "UNKNOWN","UNKNOWN", - }; - - readonly string[] oemid = { - "10.0","HFSJ", + "603565AC", "595AC21E", "20126663", "0AC5CA52" }; [Test] @@ -87,7 +83,7 @@ namespace DiscImageChef.Tests.Filesystems { for(int i = 0; i < testfiles.Length; i++) { - string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "hfsplus_mbr", testfiles[i]); + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "exfat_mbr", testfiles[i]); Filter filter = new LZip(); filter.Open(location); ImagePlugin image = new VDI(); @@ -96,11 +92,11 @@ namespace DiscImageChef.Tests.Filesystems Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); PartPlugin parts = new MBR(); Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); - Filesystem fs = new DiscImageChef.Filesystems.AppleHFSPlus(); + Filesystem fs = new DiscImageChef.Filesystems.exFAT(); int part = -1; for(int j = 0; j < partitions.Count; j++) { - if(partitions[j].PartitionType == "0xAF") + if(partitions[j].PartitionType == "0x07") { part = j; break; @@ -111,10 +107,9 @@ namespace DiscImageChef.Tests.Filesystems fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); - Assert.AreEqual("HFS+", fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual("exFAT", fs.XmlFSType.Type, testfiles[i]); Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); - Assert.AreEqual(oemid[i], fs.XmlFSType.SystemIdentifier, testfiles[i]); } } } diff --git a/DiscImageChef.Tests/Filesystems/ext2.cs b/DiscImageChef.Tests/Filesystems/ext2.cs index a726b185f..c041ce7e9 100644 --- a/DiscImageChef.Tests/Filesystems/ext2.cs +++ b/DiscImageChef.Tests/Filesystems/ext2.cs @@ -35,13 +35,86 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; +using System.Collections.Generic; +using System.IO; +using DiscImageChef.CommonTypes; +using DiscImageChef.DiscImages; +using DiscImageChef.Filesystems; +using DiscImageChef.Filters; +using DiscImageChef.ImagePlugins; +using DiscImageChef.PartPlugins; +using NUnit.Framework; + namespace DiscImageChef.Tests.Filesystems { + [TestFixture] public class ext2 { - public ext2() + readonly string[] testfiles = { + "linux_ext2.vdi.lz", "linux_ext3.vdi.lz","linux_ext4.vdi.lz", + }; + + readonly ulong[] sectors = { + 262144, 262144, 262144, + }; + + readonly uint[] sectorsize = { + 512, 512, 512, + }; + + readonly long[] clusters = { + 130048, 130048, 130048, + }; + + readonly int[] clustersize = { + 1024, 1024, 1024, + }; + + readonly string[] volumename = { + "VolumeLabel", "VolumeLabel", "VolumeLabel", + }; + + readonly string[] volumeserial = { + "cf92398e-987d-4ae4-b753-0591a35913eb", "1615411b-1554-424b-95e6-1a247056a960", "05f3f8b2-0f77-47ad-abe4-f0484aa319e9", + }; + + readonly string[] extversion = { + "ext2", "ext3", "ext4", + }; + + [Test] + public void Test() { + for(int i = 0; i < testfiles.Length; i++) + { + string location = Path.Combine(Consts.TestFilesRoot, "filesystems", "ext2", testfiles[i]); + Filter filter = new LZip(); + filter.Open(location); + ImagePlugin image = new VDI(); + Assert.AreEqual(true, image.OpenImage(filter), testfiles[i]); + Assert.AreEqual(sectors[i], image.ImageInfo.sectors, testfiles[i]); + Assert.AreEqual(sectorsize[i], image.ImageInfo.sectorSize, testfiles[i]); + PartPlugin parts = new MBR(); + Assert.AreEqual(true, parts.GetInformation(image, out List partitions), testfiles[i]); + Filesystem fs = new DiscImageChef.Filesystems.ext2FS(); + int part = -1; + for(int j = 0; j < partitions.Count; j++) + { + if(partitions[j].PartitionType == "0x83") + { + part = j; + break; + } + } + Assert.AreNotEqual(-1, part, "Partition not found"); + Assert.AreEqual(true, fs.Identify(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1), testfiles[i]); + fs.GetInformation(image, partitions[part].PartitionStartSector, partitions[part].PartitionStartSector + partitions[part].PartitionSectors - 1, out string information); + Assert.AreEqual(clusters[i], fs.XmlFSType.Clusters, testfiles[i]); + Assert.AreEqual(clustersize[i], fs.XmlFSType.ClusterSize, testfiles[i]); + Assert.AreEqual(extversion[i], fs.XmlFSType.Type, testfiles[i]); + Assert.AreEqual(volumename[i], fs.XmlFSType.VolumeName, testfiles[i]); + Assert.AreEqual(volumeserial[i], fs.XmlFSType.VolumeSerial, testfiles[i]); + } } } }