diff --git a/DiscImageChef.Tests/Filesystems/FAT12.cs b/DiscImageChef.Tests/Filesystems/FAT12.cs index e9fdecb29..0b6c4638e 100644 --- a/DiscImageChef.Tests/Filesystems/FAT12.cs +++ b/DiscImageChef.Tests/Filesystems/FAT12.cs @@ -200,6 +200,41 @@ namespace DiscImageChef.Tests.Filesystems "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 = { @@ -349,6 +384,41 @@ namespace DiscImageChef.Tests.Filesystems 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, }; readonly ulong[] sectors = { @@ -466,6 +536,34 @@ namespace DiscImageChef.Tests.Filesystems 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, }; readonly uint[] sectorsize = { @@ -583,6 +681,34 @@ namespace DiscImageChef.Tests.Filesystems 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, }; readonly long[] clusters = { @@ -700,6 +826,34 @@ namespace DiscImageChef.Tests.Filesystems 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, }; readonly int[] clustersize = { @@ -817,6 +971,34 @@ namespace DiscImageChef.Tests.Filesystems 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, }; readonly string[] volumename = { @@ -934,6 +1116,41 @@ namespace DiscImageChef.Tests.Filesystems "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 ", }; readonly string[] volumeserial = { @@ -1051,6 +1268,41 @@ namespace DiscImageChef.Tests.Filesystems "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", }; readonly string[] oemid = { @@ -1168,6 +1420,41 @@ namespace DiscImageChef.Tests.Filesystems "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 ", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/FAT12_MBR.cs b/DiscImageChef.Tests/Filesystems/FAT12_MBR.cs index de7180863..58ce0d5ef 100644 --- a/DiscImageChef.Tests/Filesystems/FAT12_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/FAT12_MBR.cs @@ -35,16 +35,15 @@ // 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 NUnit.Framework; -using DiscImageChef.DiscImages; using DiscImageChef.PartPlugins; -using DiscImageChef.CommonTypes; -using System.Collections.Generic; +using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { @@ -62,7 +61,11 @@ namespace DiscImageChef.Tests.Filesystems "pcdos610.vdi.lz", "pcdos630.vdi.lz", "toshibamsdos330.vdi.lz", "toshibamsdos401.vdi.lz", "msos2_1.21.vdi.lz", "msos2_1.30.1.vdi.lz", "multiuserdos_7.22r4.vdi.lz", "os2_1.20.vdi.lz", "os2_1.30.vdi.lz", "os2_6.307.vdi.lz", "os2_6.514.vdi.lz", "os2_6.617.vdi.lz", - "os2_8.162.vdi.lz", "os2_9.023.vdi.lz", "ecs.vdi.lz", + "os2_8.162.vdi.lz", "os2_9.023.vdi.lz", "ecs.vdi.lz", "macosx.vdi.lz", + "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", }; readonly ulong[] sectors = { @@ -76,6 +79,10 @@ namespace DiscImageChef.Tests.Filesystems 32768, 32768, 8192, 8192, 16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384, + 16384, 16384, 16384, 16384, + 16384, 16384, 16384, 16384, + 16384, 16384, 16384, 16384, + 16384, 16384, 16384, 16384, 16384, 16384, 16384, }; @@ -90,6 +97,10 @@ namespace DiscImageChef.Tests.Filesystems 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, + 512, 512, 512, 512, + 512, 512, 512, 512, + 512, 512, 512, 512, + 512, 512, 512, 512, 512, 512, 512, }; @@ -104,7 +115,11 @@ namespace DiscImageChef.Tests.Filesystems 4024, 4024, 1000, 1000, 2008, 2008, 2008, 2008, 2008, 2008, 2008, 2008, - 2008, 2008, 1890, + 2008, 2008, 1890, 4079, + 3552, 4088, 2008, 2008, + 2008, 2008, 2044, 2044, + 2044, 4016, 2044, 2044, + 4016, 3072, 2040, }; readonly int[] clustersize = { @@ -118,7 +133,11 @@ namespace DiscImageChef.Tests.Filesystems 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, 4096, - 4096, 4096, 4096, + 4096, 4096, 4096, 2048, + 2048, 2048, 4096, 4096, + 4096, 4096, 4096, 4096, + 4096, 2048, 4096, 4096, + 2048, 2048, 4096, }; readonly string[] volumename = { @@ -132,6 +151,10 @@ namespace DiscImageChef.Tests.Filesystems "VOLUMELABEL","VOLUMELABEL",null,"VOLUMELABEL", "NO NAME ","NO NAME ",null,"NO NAME ", "NO NAME ","NO NAME ","NO NAME ","NO NAME ", + "NO NAME ","NO NAME ","NO NAME ","VOLUMELABEL", + "NO NAME ","NO NAME ","VOLUMELABEL","VOLUMELABEL", + "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", + "VOLUMELABEL","NO NAME ","NO NAME ","NO NAME ", "NO NAME ","NO NAME ","NO NAME ", }; @@ -146,7 +169,11 @@ namespace DiscImageChef.Tests.Filesystems "076C1004","2C481009",null,"3C2319E8", "66CC3C15","66A54C15",null,"5C578015", "5B845015","5C4BF015","E6B5F414","E6B15414", - "E6A41414","E6A39414","E6B0B814", + "E6A41414","E6A39414","E6B0B814","26A21EF4", + "74F4921D","C4B64D11","29200D0C","234F0DE4", + "074C0DFC","33640D18","0E121460","094C0EED", + "38310F02","50489A1B","2CE52101","94313E7E", + "BC184FE6","BAD08A1E","00000000" }; readonly string[] oemid = { @@ -160,7 +187,11 @@ namespace DiscImageChef.Tests.Filesystems "IBM 6.0", "IBM 6.0", "T V3.30 ", "T V4.00 ", "IBM 10.2", "IBM 10.2", "IBM 3.2", "IBM 10.2", "IBM 10.2", "IBM 20.0", "IBM 20.0", "IBM 20.0", - "IBM 20.0", "IBM 20.0", "IBM 4.50", + "IBM 20.0", "IBM 20.0", "IBM 4.50", "BSD 4.4", + "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 ", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/FAT16_MBR.cs b/DiscImageChef.Tests/Filesystems/FAT16_MBR.cs index 291ec6415..882bff43f 100644 --- a/DiscImageChef.Tests/Filesystems/FAT16_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/FAT16_MBR.cs @@ -35,16 +35,15 @@ // 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 NUnit.Framework; -using DiscImageChef.DiscImages; using DiscImageChef.PartPlugins; -using DiscImageChef.CommonTypes; -using System.Collections.Generic; +using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { @@ -60,7 +59,11 @@ namespace DiscImageChef.Tests.Filesystems "pcdos500.vdi.lz", "pcdos502.vdi.lz", "pcdos610.vdi.lz", "pcdos630.vdi.lz", "msos2_1.21.vdi.lz", "msos2_1.30.1.vdi.lz", "multiuserdos_7.22r4.vdi.lz", "os2_1.20.vdi.lz", "os2_1.30.vdi.lz", "os2_6.307.vdi.lz", "os2_6.514.vdi.lz", "os2_6.617.vdi.lz", - "os2_8.162.vdi.lz", "os2_9.023.vdi.lz", "ecs.vdi.lz", + "os2_8.162.vdi.lz", "os2_9.023.vdi.lz", "ecs.vdi.lz", "macosx.vdi.lz", + "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" }; readonly ulong[] sectors = { @@ -72,6 +75,10 @@ namespace DiscImageChef.Tests.Filesystems 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, + 1024000, 1024000, 1024000, 1024000, + 1024000, 1024000, 1024000, 1024000, + 1024000, 1024000, 1024000, 1024000, + 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, 1024000, }; @@ -84,6 +91,10 @@ namespace DiscImageChef.Tests.Filesystems 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, 512, + 512, 512, 512, 512, + 512, 512, 512, 512, + 512, 512, 512, 512, + 512, 512, 512, 512, 512, 512, 512, }; @@ -96,10 +107,22 @@ namespace DiscImageChef.Tests.Filesystems 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, 63941, - 63941, 63941, 63882, + 63941, 63941, 63882, 63992, + 63864, 63252, 63941, 63941, + 63941, 63941, 63998, 63998, + 63998, 63941, 63998, 63998, + 63941, 63616, 63996, }; readonly int[] clustersize = { + 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, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, @@ -120,6 +143,10 @@ namespace DiscImageChef.Tests.Filesystems "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", "NO NAME ","NO NAME ",null,"NO NAME ", "NO NAME ","NO NAME ","NO NAME ","NO NAME ", + "NO NAME ","NO NAME ","NO NAME ","VOLUMELABEL", + "NO NAME ","NO NAME ","VOLUMELABEL","VOLUMELABEL", + "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", + "VOLUMELABEL","NO NAME ","NO NAME ","NO NAME ", "NO NAME ","NO NAME ","NO NAME ", }; @@ -132,7 +159,11 @@ namespace DiscImageChef.Tests.Filesystems "1F630FF9","18340FFE","3F3F1003","273D1009", "9C162C15","9C1E2C15",null,"5BE66015", "5BE43015","5BEAC015","E6B18414","E6C63414", - "1C069414","1C059414","1BE5B814", + "1C069414","1C059414","1BE5B814","3EF71EF4", + "DAF97911","305637BD","275B0DE4","09650DFC", + "38270D18","2E620D0C","0B4F0EED","0E122464", + "3B5F0F02","C84CB6F2","D0E9AD4E","C039A2EC", + "501F9FA6","9AAA4216","00000000", }; readonly string[] oemid = { @@ -144,7 +175,11 @@ namespace DiscImageChef.Tests.Filesystems "IBM 5.0", "IBM 5.0", "IBM 6.0", "IBM 6.0", "IBM 10.2", "IBM 10.2", "IBM 3.2", "IBM 10.2", "IBM 10.2", "IBM 20.0", "IBM 20.0", "IBM 20.0", - "IBM 20.0", "IBM 20.0", "IBM 4.50", + "IBM 20.0", "IBM 20.0", "IBM 4.50", "BSD 4.4", + "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 ", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/FAT32_MBR.cs b/DiscImageChef.Tests/Filesystems/FAT32_MBR.cs index 2ee3d8681..3083e7cc4 100644 --- a/DiscImageChef.Tests/Filesystems/FAT32_MBR.cs +++ b/DiscImageChef.Tests/Filesystems/FAT32_MBR.cs @@ -35,16 +35,15 @@ // 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 NUnit.Framework; -using DiscImageChef.DiscImages; using DiscImageChef.PartPlugins; -using DiscImageChef.CommonTypes; -using System.Collections.Generic; +using NUnit.Framework; namespace DiscImageChef.Tests.Filesystems { @@ -52,35 +51,59 @@ namespace DiscImageChef.Tests.Filesystems public class FAT32_MBR { readonly string[] testfiles = { - "drdos_7.03.vdi.lz", "drdos_8.00.vdi.lz", "msdos_7.10.vdi.lz", + "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" }; readonly ulong[] sectors = { - 8388608, 8388608, 8388608, + 8388608, 8388608, 8388608, 4194304, + 4194304, 8388608, 4194304, 4194304, + 4194304, 4194304, 4194304, 4194304, + 4194304, 4194304, }; 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, + 1048233, 1048233, 1048233, 524287, + 524016, 1048233, 524152, 524152, + 524152, 524112, 524112, 524112, + 523520, 1048560, }; readonly int[] clustersize = { - 4096, 4096, 4096, + 4096, 4096, 4096, 4096, + 4096, 4096, 4096, 4096, + 4096, 4096, 4096, 4096, + 4096, 2048, }; 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", + "5955996C","1BFB1A43","3B331809","42D51EF1", + "48073346","EC62E6DE","2A310DE4","0C140DFC", + "3E310D18","0D3D0EED","0E131162","3F500F02", + "82EB4C04","00000000", }; readonly string[] oemid = { - "DRDOS7.X", "IBM 7.1", "MSWIN4.1", + "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 ", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/HPFS.cs b/DiscImageChef.Tests/Filesystems/HPFS.cs index 0ee2c4981..f35528868 100644 --- a/DiscImageChef.Tests/Filesystems/HPFS.cs +++ b/DiscImageChef.Tests/Filesystems/HPFS.cs @@ -53,49 +53,49 @@ namespace DiscImageChef.Tests.Filesystems readonly string[] testfiles = { "ecs.vdi.lz", "msos2_1.21.vdi.lz", "msos2_1.30.1.vdi.lz", "os2_1.20.vdi.lz", "os2_1.30.vdi.lz", "os2_6.307.vdi.lz", "os2_6.514.vdi.lz", "os2_6.617.vdi.lz", - "os2_8.162.vdi.lz", "os2_9.023.vdi.lz", + "os2_8.162.vdi.lz", "os2_9.023.vdi.lz", "winnt_3.10.vdi.lz", "winnt_3.50.vdi.lz", }; readonly ulong[] sectors = { 262144, 1024000, 1024000, 1024000, 1024000, 1024000, 262144, 262144, - 262144, 262144, + 262144, 262144, 262144, 262144 }; readonly uint[] sectorsize = { 512, 512, 512, 512, 512, 512, 512, 512, - 512, 512, + 512, 512, 512, 512 }; readonly long[] clusters = { 65268, 63941, 63941, 63941, 63941, 63941, 65504, 65504, - 65504, 65504, + 65504, 65504, 65504, 65504, }; readonly int[] clustersize = { 2048, 8192, 8192, 8192, 8192, 8192, 2048, 2048, - 2048, 2048, + 2048, 2048, 2048, 2048, }; readonly string[] volumename = { "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", - "VOLUMELABEL","VOLUMELABEL", + "VOLUMELABEL","VOLUMELABEL","VOLUMELABEL","VOLUMELABEL", }; readonly string[] volumeserial = { "2BBBD814","AC0DDC15","ABEB2C15","6C4EE015", "6C406015","6C49B015","2BCEB414","2C157414", - "2BF55414","2BE31414", + "2BF55414","2BE31414","E851CB14","UNKNOWN0", }; readonly string[] oemid = { "IBM 4.50", "OS2 10.1", "OS2 10.0", "OS2 10.0", "OS2 10.0", "OS2 20.0", "OS2 20.0", "OS2 20.1", - "OS2 20.0", "OS2 20.0", + "OS2 20.0", "OS2 20.0", "MSDOS5.0", "MSDOS5.0", }; [Test]