REFACTOR: Fixed MOST name inconsistencies.

This commit is contained in:
2017-12-20 17:15:26 +00:00
parent 542520f5cd
commit a4650c61aa
428 changed files with 16205 additions and 16320 deletions

View File

@@ -35,11 +35,11 @@ using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Text;
using DiscImageChef.CommonTypes;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class Acorn : PartPlugin
public class Acorn : PartitionPlugin
{
const ulong ADFS_SB_POS = 0xC00;
const uint LINUX_MAGIC = 0xDEAFA1DE;
@@ -53,7 +53,7 @@ namespace DiscImageChef.PartPlugins
public Acorn()
{
Name = "Acorn FileCore partitions";
PluginUUID = new Guid("A7C8FEBE-8D00-4933-B9F3-42184C8BA808");
PluginUuid = new Guid("A7C8FEBE-8D00-4933-B9F3-42184C8BA808");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)
@@ -98,7 +98,7 @@ namespace DiscImageChef.PartPlugins
Size = (ulong)bootBlock.discRecord.disc_size_high * 0x100000000 + bootBlock.discRecord.disc_size,
Length =
((ulong)bootBlock.discRecord.disc_size_high * 0x100000000 + bootBlock.discRecord.disc_size) /
imagePlugin.ImageInfo.sectorSize,
imagePlugin.ImageInfo.SectorSize,
Type = "ADFS",
Name = StringHandlers.CToString(bootBlock.discRecord.disc_name, Encoding.GetEncoding("iso-8859-1"))
};

View File

@@ -36,11 +36,11 @@ using System.Runtime.InteropServices;
using System.Text;
using DiscImageChef.Console;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
// Information about structures learnt from Inside Macintosh
// Constants from image testing
public class AppleMap : PartPlugin
public class AppleMap : PartitionPlugin
{
/// <summary>"ER", driver descriptor magic</summary>
const ushort DDM_MAGIC = 0x4552;
@@ -54,10 +54,10 @@ namespace DiscImageChef.PartPlugins
public AppleMap()
{
Name = "Apple Partition Map";
PluginUUID = new Guid("36405F8D-4F1A-07F5-209C-223D735D6D22");
PluginUuid = new Guid("36405F8D-4F1A-07F5-209C-223D735D6D22");
}
public override bool GetInformation(ImagePlugins.ImagePlugin imagePlugin,
public override bool GetInformation(DiscImages.ImagePlugin imagePlugin,
out List<CommonTypes.Partition> partitions, ulong sectorOffset)
{
uint sector_size;
@@ -318,19 +318,19 @@ namespace DiscImageChef.PartPlugins
}
_partition.Description = sb.ToString();
if(_partition.Start < imagePlugin.ImageInfo.sectors &&
_partition.End < imagePlugin.ImageInfo.sectors)
if(_partition.Start < imagePlugin.ImageInfo.Sectors &&
_partition.End < imagePlugin.ImageInfo.Sectors)
{
partitions.Add(_partition);
sequence++;
}
// Some CD and DVDs end with an Apple_Free that expands beyond the disc size...
else if(_partition.Start < imagePlugin.ImageInfo.sectors)
else if(_partition.Start < imagePlugin.ImageInfo.Sectors)
{
DicConsole.DebugWriteLine("AppleMap Plugin",
"Cutting last partition end ({0}) to media size ({1})",
_partition.End, imagePlugin.ImageInfo.sectors - 1);
_partition.Length = imagePlugin.ImageInfo.sectors - _partition.Start;
_partition.End, imagePlugin.ImageInfo.Sectors - 1);
_partition.Length = imagePlugin.ImageInfo.Sectors - _partition.Start;
partitions.Add(_partition);
sequence++;
}
@@ -338,7 +338,7 @@ namespace DiscImageChef.PartPlugins
{
DicConsole.DebugWriteLine("AppleMap Plugin",
"Not adding partition becaus start ({0}) is outside media size ({1})",
_partition.Start, imagePlugin.ImageInfo.sectors - 1);
_partition.Start, imagePlugin.ImageInfo.Sectors - 1);
}
}
}

View File

@@ -35,11 +35,11 @@ using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class Apricot : PartPlugin
public class Apricot : PartitionPlugin
{
readonly string[] operatingSystemCodes = {"Invalid", "MS-DOS", "UCSD Pascal", "CP/M", "Concurrent CP/M"};
readonly string[] bootTypeCodes =
@@ -59,7 +59,7 @@ namespace DiscImageChef.PartPlugins
public Apricot()
{
Name = "ACT Apricot partitions";
PluginUUID = new Guid("8CBF5864-7B5A-47A0-8CEB-199C74FA22DE");
PluginUuid = new Guid("8CBF5864-7B5A-47A0-8CEB-199C74FA22DE");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)

View File

@@ -35,9 +35,9 @@ using System.Collections.Generic;
using System.Text;
using DiscImageChef.Console;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class AtariPartitions : PartPlugin
public class AtariPartitions : PartitionPlugin
{
const uint TypeGEMDOS = 0x0047454D;
const uint TypeBigGEMDOS = 0x0042474D;
@@ -55,10 +55,10 @@ namespace DiscImageChef.PartPlugins
public AtariPartitions()
{
Name = "Atari partitions";
PluginUUID = new Guid("d1dd0f24-ec39-4c4d-9072-be31919a3b5e");
PluginUuid = new Guid("d1dd0f24-ec39-4c4d-9072-be31919a3b5e");
}
public override bool GetInformation(ImagePlugins.ImagePlugin imagePlugin,
public override bool GetInformation(DiscImages.ImagePlugin imagePlugin,
out List<CommonTypes.Partition> partitions, ulong sectorOffset)
{
partitions = new List<CommonTypes.Partition>();
@@ -99,7 +99,7 @@ namespace DiscImageChef.PartPlugins
table.badLength = BigEndianBitConverter.ToUInt32(sector, 506);
table.checksum = BigEndianBitConverter.ToUInt16(sector, 510);
Checksums.SHA1Context sha1Ctx = new Checksums.SHA1Context();
Checksums.Sha1Context sha1Ctx = new Checksums.Sha1Context();
sha1Ctx.Init();
sha1Ctx.Update(table.boot);
DicConsole.DebugWriteLine("Atari partition plugin", "Boot code SHA1: {0}", sha1Ctx.End());

View File

@@ -36,11 +36,11 @@ using System.Linq;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class BSD : PartPlugin
public class BSD : PartitionPlugin
{
const uint DISKMAGIC = 0x82564557;
const uint DISKCIGAM = 0x57455682;
@@ -54,7 +54,7 @@ namespace DiscImageChef.PartPlugins
public BSD()
{
Name = "BSD disklabel";
PluginUUID = new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
PluginUuid = new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)

View File

@@ -34,11 +34,11 @@ using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class DEC : PartPlugin
public class DEC : PartitionPlugin
{
const int PT_MAGIC = 0x032957;
const int PT_VALID = 1;
@@ -46,7 +46,7 @@ namespace DiscImageChef.PartPlugins
public DEC()
{
Name = "DEC disklabel";
PluginUUID = new Guid("58CEC3B7-3B93-4D47-86EE-D6DADE9D444F");
PluginUuid = new Guid("58CEC3B7-3B93-4D47-86EE-D6DADE9D444F");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -39,7 +39,7 @@
<Compile Include="Atari.cs" />
<Compile Include="MBR.cs" />
<Compile Include="NeXT.cs" />
<Compile Include="PartPlugin.cs" />
<Compile Include="PartitionPlugin.cs" />
<Compile Include="RDB.cs" />
<Compile Include="Sun.cs" />
<Compile Include="GPT.cs" />

View File

@@ -34,18 +34,18 @@ using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class DragonFlyBSD : PartPlugin
public class DragonFlyBSD : PartitionPlugin
{
const uint DISK_MAGIC64 = 0xC4464C59;
public DragonFlyBSD()
{
Name = "DragonFly BSD 64-bit disklabel";
PluginUUID = new Guid("D49E41A6-D952-4760-9D94-03DAE2450C5F");
PluginUuid = new Guid("D49E41A6-D952-4760-9D94-03DAE2450C5F");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)

View File

@@ -35,9 +35,9 @@ using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.Console;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class GuidPartitionTable : PartPlugin
public class GuidPartitionTable : PartitionPlugin
{
const ulong GptMagic = 0x5452415020494645;
const uint GptRevision1 = 0x00010000;
@@ -45,10 +45,10 @@ namespace DiscImageChef.PartPlugins
public GuidPartitionTable()
{
Name = "GUID Partition Table";
PluginUUID = new Guid("CBC9D281-C1D0-44E8-9038-4D66FD2678AB");
PluginUuid = new Guid("CBC9D281-C1D0-44E8-9038-4D66FD2678AB");
}
public override bool GetInformation(ImagePlugins.ImagePlugin imagePlugin,
public override bool GetInformation(DiscImages.ImagePlugin imagePlugin,
out List<CommonTypes.Partition> partitions, ulong sectorOffset)
{
partitions = new List<CommonTypes.Partition>();
@@ -65,7 +65,7 @@ namespace DiscImageChef.PartPlugins
if(signature != GptMagic)
{
if(imagePlugin.ImageInfo.xmlMediaType == ImagePlugins.XmlMediaType.OpticalDisc)
if(imagePlugin.ImageInfo.XmlMediaType == DiscImages.XmlMediaType.OpticalDisc)
{
hdrBytes = imagePlugin.ReadSector(sectorOffset);
signature = BitConverter.ToUInt64(hdrBytes, 512);

View File

@@ -36,18 +36,18 @@ using System.Runtime.InteropServices;
using System.Text;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class Human68K : PartPlugin
public class Human68K : PartitionPlugin
{
const uint X68kMagic = 0x5836384B;
public Human68K()
{
Name = "Human 68k partitions";
PluginUUID = new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
PluginUuid = new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)

View File

@@ -35,22 +35,22 @@ using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
// TODO: Support AAP extensions
public class MBR : PartPlugin
public class MBR : PartitionPlugin
{
const ulong GptMagic = 0x5452415020494645;
public MBR()
{
Name = "Master Boot Record";
PluginUUID = new Guid("5E8A34E8-4F1A-59E6-4BF7-7EA647063A76");
PluginUuid = new Guid("5E8A34E8-4F1A-59E6-4BF7-7EA647063A76");
}
public override bool GetInformation(ImagePlugins.ImagePlugin imagePlugin,
public override bool GetInformation(DiscImages.ImagePlugin imagePlugin,
out List<CommonTypes.Partition> partitions, ulong sectorOffset)
{
ulong counter = 0;
@@ -63,7 +63,7 @@ namespace DiscImageChef.PartPlugins
// Divider of sector size in MBR between real sector size
ulong divider = 1;
if(imagePlugin.ImageInfo.xmlMediaType == ImagePlugins.XmlMediaType.OpticalDisc)
if(imagePlugin.ImageInfo.XmlMediaType == DiscImages.XmlMediaType.OpticalDisc)
{
sectorSize = 512;
divider = 4;
@@ -90,7 +90,7 @@ namespace DiscImageChef.PartPlugins
typeof(DiskManagerMasterBootRecord));
handle.Free();
DicConsole.DebugWriteLine("MBR plugin", "xmlmedia = {0}", imagePlugin.ImageInfo.xmlMediaType);
DicConsole.DebugWriteLine("MBR plugin", "xmlmedia = {0}", imagePlugin.ImageInfo.XmlMediaType);
DicConsole.DebugWriteLine("MBR plugin", "mbr.magic = {0:X4}", mbr.magic);
if(mbr.magic != MBR_Magic) return false; // Not MBR
@@ -103,7 +103,7 @@ namespace DiscImageChef.PartPlugins
if(signature == GptMagic) return false;
if(signature != GptMagic && imagePlugin.ImageInfo.xmlMediaType == XmlMediaType.OpticalDisc)
if(signature != GptMagic && imagePlugin.ImageInfo.XmlMediaType == XmlMediaType.OpticalDisc)
{
hdrBytes = imagePlugin.ReadSector(sectorOffset);
signature = BitConverter.ToUInt64(hdrBytes, 512);
@@ -150,10 +150,10 @@ namespace DiscImageChef.PartPlugins
if(entry.lba_start == 0 && entry.lba_sectors == 0 && valid)
{
lba_start = Helpers.CHS.ToLBA(start_cylinder, entry.start_head, start_sector,
imagePlugin.ImageInfo.heads, imagePlugin.ImageInfo.sectorsPerTrack);
imagePlugin.ImageInfo.Heads, imagePlugin.ImageInfo.SectorsPerTrack);
lba_sectors = Helpers.CHS.ToLBA(end_cylinder, entry.end_head, entry.end_sector,
imagePlugin.ImageInfo.heads,
imagePlugin.ImageInfo.sectorsPerTrack) - lba_start;
imagePlugin.ImageInfo.Heads,
imagePlugin.ImageInfo.SectorsPerTrack) - lba_start;
}
// For optical media
@@ -198,7 +198,7 @@ namespace DiscImageChef.PartPlugins
if(valid && !minix)
{
CommonTypes.Partition part = new CommonTypes.Partition();
if((lba_start > 0 || imagePlugin.ImageInfo.xmlMediaType == XmlMediaType.OpticalDisc) &&
if((lba_start > 0 || imagePlugin.ImageInfo.XmlMediaType == XmlMediaType.OpticalDisc) &&
lba_sectors > 0)
{
part.Start = lba_start + sectorOffset;
@@ -278,12 +278,12 @@ namespace DiscImageChef.PartPlugins
if(ebr_entry.lba_start == 0 && ebr_entry.lba_sectors == 0 && ext_valid)
{
ext_start = Helpers.CHS.ToLBA(start_cylinder, ebr_entry.start_head, start_sector,
imagePlugin.ImageInfo.heads,
imagePlugin.ImageInfo.sectorsPerTrack);
imagePlugin.ImageInfo.Heads,
imagePlugin.ImageInfo.SectorsPerTrack);
ext_sectors =
Helpers.CHS.ToLBA(end_cylinder, ebr_entry.end_head, ebr_entry.end_sector,
imagePlugin.ImageInfo.heads,
imagePlugin.ImageInfo.sectorsPerTrack) - ext_start;
imagePlugin.ImageInfo.Heads,
imagePlugin.ImageInfo.SectorsPerTrack) - ext_start;
}
ext_minix |= (ebr_entry.type == 0x81 || ebr_entry.type == 0x80);
@@ -402,10 +402,10 @@ namespace DiscImageChef.PartPlugins
if(mnx_entry.lba_start == 0 && mnx_entry.lba_sectors == 0 && mnx_valid)
{
mnx_start = Helpers.CHS.ToLBA(start_cylinder, mnx_entry.start_head, start_sector,
imagePlugin.ImageInfo.heads, imagePlugin.ImageInfo.sectorsPerTrack);
imagePlugin.ImageInfo.Heads, imagePlugin.ImageInfo.SectorsPerTrack);
mnx_sectors = Helpers.CHS.ToLBA(end_cylinder, mnx_entry.end_head, mnx_entry.end_sector,
imagePlugin.ImageInfo.heads,
imagePlugin.ImageInfo.sectorsPerTrack) - mnx_start;
imagePlugin.ImageInfo.Heads,
imagePlugin.ImageInfo.SectorsPerTrack) - mnx_start;
}
// For optical media

View File

@@ -37,9 +37,9 @@ using System.Text;
using DiscImageChef.Console;
// Information learnt from XNU source and testing against real disks
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class NeXTDisklabel : PartPlugin
public class NeXTDisklabel : PartitionPlugin
{
const uint NEXT_MAGIC1 = 0x4E655854;
// "NeXT"
@@ -55,10 +55,10 @@ namespace DiscImageChef.PartPlugins
public NeXTDisklabel()
{
Name = "NeXT Disklabel";
PluginUUID = new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
PluginUuid = new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
}
public override bool GetInformation(ImagePlugins.ImagePlugin imagePlugin,
public override bool GetInformation(DiscImages.ImagePlugin imagePlugin,
out List<CommonTypes.Partition> partitions, ulong sectorOffset)
{
bool magic_found = false;
@@ -92,8 +92,8 @@ namespace DiscImageChef.PartPlugins
if(!magic_found) return false;
uint sectors_to_read = 7680 / imagePlugin.ImageInfo.sectorSize;
if(7680 % imagePlugin.ImageInfo.sectorSize > 0) sectors_to_read++;
uint sectors_to_read = 7680 / imagePlugin.ImageInfo.SectorSize;
if(7680 % imagePlugin.ImageInfo.SectorSize > 0) sectors_to_read++;
label_sector = imagePlugin.ReadSectors(label_position, sectors_to_read);
@@ -185,10 +185,10 @@ namespace DiscImageChef.PartPlugins
Scheme = Name
};
if(part.Start + part.Length > imagePlugin.ImageInfo.sectors)
if(part.Start + part.Length > imagePlugin.ImageInfo.Sectors)
{
DicConsole.DebugWriteLine("NeXT Plugin", "Partition bigger than device, reducing...");
part.Length = imagePlugin.ImageInfo.sectors - part.Start;
part.Length = imagePlugin.ImageInfo.Sectors - part.Start;
part.Size = part.Length * sector_size;
DicConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_size = {1}", i,
part.Length);

View File

@@ -36,18 +36,18 @@ using System.Runtime.InteropServices;
using System.Text;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class PC98 : PartPlugin
public class PC98 : PartitionPlugin
{
const ushort IntelMagic = 0xAA55;
public PC98()
{
Name = "NEC PC-9800 partition table";
PluginUUID = new Guid("27333401-C7C2-447D-961C-22AD0641A09A\n");
PluginUuid = new Guid("27333401-C7C2-447D-961C-22AD0641A09A\n");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)
@@ -87,16 +87,16 @@ namespace DiscImageChef.PartPlugins
StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)));
if(entry.dp_scyl != entry.dp_ecyl && entry.dp_ecyl > 0 &&
entry.dp_scyl <= imagePlugin.ImageInfo.cylinders &&
entry.dp_ecyl <= imagePlugin.ImageInfo.cylinders && entry.dp_shd <= imagePlugin.ImageInfo.heads &&
entry.dp_ehd <= imagePlugin.ImageInfo.heads &&
entry.dp_ssect <= imagePlugin.ImageInfo.sectorsPerTrack &&
entry.dp_esect <= imagePlugin.ImageInfo.sectorsPerTrack)
entry.dp_scyl <= imagePlugin.ImageInfo.Cylinders &&
entry.dp_ecyl <= imagePlugin.ImageInfo.Cylinders && entry.dp_shd <= imagePlugin.ImageInfo.Heads &&
entry.dp_ehd <= imagePlugin.ImageInfo.Heads &&
entry.dp_ssect <= imagePlugin.ImageInfo.SectorsPerTrack &&
entry.dp_esect <= imagePlugin.ImageInfo.SectorsPerTrack)
{
Partition part = new Partition
{
Start = Helpers.CHS.ToLBA(entry.dp_scyl, entry.dp_shd, (uint)(entry.dp_ssect + 1),
imagePlugin.ImageInfo.heads, imagePlugin.ImageInfo.sectorsPerTrack),
imagePlugin.ImageInfo.Heads, imagePlugin.ImageInfo.SectorsPerTrack),
Type = DecodePC98Sid(entry.dp_sid),
Name = StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)).Trim(),
Sequence = counter,
@@ -104,8 +104,8 @@ namespace DiscImageChef.PartPlugins
};
part.Offset = part.Start * imagePlugin.GetSectorSize();
part.Length = Helpers.CHS.ToLBA(entry.dp_ecyl, entry.dp_ehd, (uint)(entry.dp_esect + 1),
imagePlugin.ImageInfo.heads,
imagePlugin.ImageInfo.sectorsPerTrack) - part.Start;
imagePlugin.ImageInfo.Heads,
imagePlugin.ImageInfo.SectorsPerTrack) - part.Start;
part.Size = part.Length * imagePlugin.GetSectorSize();
DicConsole.DebugWriteLine("PC98 plugin", "part.Start = {0}", part.Start);
@@ -117,7 +117,7 @@ namespace DiscImageChef.PartPlugins
DicConsole.DebugWriteLine("PC98 plugin", "part.Size = {0}", part.Size);
if(((entry.dp_mid & 0x20) == 0x20 || (entry.dp_mid & 0x44) == 0x44) &&
part.Start < imagePlugin.ImageInfo.sectors && part.End <= imagePlugin.ImageInfo.sectors)
part.Start < imagePlugin.ImageInfo.Sectors && part.End <= imagePlugin.ImageInfo.Sectors)
{
partitions.Add(part);
counter++;

View File

@@ -2,7 +2,7 @@
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : PartPlugin.cs
// Filename : PartitionPlugin.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// Component : Partitioning scheme plugins.
@@ -34,19 +34,19 @@
using System;
using System.Collections.Generic;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
/// <summary>
/// Abstract class to implement partitioning schemes interpreting plugins.
/// </summary>
public abstract class PartPlugin
public abstract class PartitionPlugin
{
/// <summary>Plugin name.</summary>
public string Name;
/// <summary>Plugin UUID.</summary>
public Guid PluginUUID;
public Guid PluginUuid;
protected PartPlugin() { }
protected PartitionPlugin() { }
/// <summary>
/// Interprets a partitioning scheme.
@@ -55,7 +55,7 @@ namespace DiscImageChef.PartPlugins
/// <param name="imagePlugin">Disk image.</param>
/// <param name="partitions">Returns list of partitions.</param>
/// <param name="sectorOffset">At which sector to start searching for the partition scheme.</param>
public abstract bool GetInformation(ImagePlugins.ImagePlugin imagePlugin,
public abstract bool GetInformation(DiscImages.ImagePlugin imagePlugin,
out List<CommonTypes.Partition> partitions, ulong sectorOffset);
}
}

View File

@@ -34,22 +34,22 @@ using System;
using System.Collections.Generic;
using DiscImageChef.CommonTypes;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
// This is the most stupid or the most intelligent partition scheme ever done, pick or take
// At sector 1 from offset, text resides (yes, TEXT) in following format:
// "part type start end\n"
// One line per partition, start and end relative to offset
// e.g.: "part nvram 10110 10112\npart fossil 10112 3661056\n"
public class Plan9 : PartPlugin
public class Plan9 : PartitionPlugin
{
public Plan9()
{
Name = "Plan9 partition table";
PluginUUID = new Guid("F0BF4FFC-056E-4E7C-8B65-4EAEE250ADD9");
PluginUuid = new Guid("F0BF4FFC-056E-4E7C-8B65-4EAEE250ADD9");
}
public override bool GetInformation(ImagePlugins.ImagePlugin imagePlugin, out List<Partition> partitions,
public override bool GetInformation(DiscImages.ImagePlugin imagePlugin, out List<Partition> partitions,
ulong sectorOffset)
{
partitions = new List<Partition>();

File diff suppressed because it is too large Load Diff

View File

@@ -34,11 +34,11 @@ using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class RioKarma : PartPlugin
public class RioKarma : PartitionPlugin
{
const ushort KarmaMagic = 0xAB56;
const byte EntryMagic = 0x4D;
@@ -46,7 +46,7 @@ namespace DiscImageChef.PartPlugins
public RioKarma()
{
Name = "Rio Karma partitioning";
PluginUUID = new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
PluginUuid = new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)

View File

@@ -35,18 +35,18 @@ using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class SGI : PartPlugin
public class SGI : PartitionPlugin
{
const int SGI_MAGIC = 0x0BE5A941;
public SGI()
{
Name = "SGI Disk Volume Header";
PluginUUID = new Guid("AEF5AB45-4880-4CE8-8735-F0A402E2E5F2");
PluginUuid = new Guid("AEF5AB45-4880-4CE8-8735-F0A402E2E5F2");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)

View File

@@ -35,9 +35,9 @@ using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.Console;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class SunDisklabel : PartPlugin
public class SunDisklabel : PartitionPlugin
{
/// <summary>Sun disklabel magic number</summary>
const ushort DKL_MAGIC = 0xDABE;
@@ -103,10 +103,10 @@ namespace DiscImageChef.PartPlugins
public SunDisklabel()
{
Name = "Sun Disklabel";
PluginUUID = new Guid("50F35CC4-8375-4445-8DCB-1BA550C931A3");
PluginUuid = new Guid("50F35CC4-8375-4445-8DCB-1BA550C931A3");
}
public override bool GetInformation(ImagePlugins.ImagePlugin imagePlugin,
public override bool GetInformation(DiscImages.ImagePlugin imagePlugin,
out List<CommonTypes.Partition> partitions, ulong sectorOffset)
{
partitions = new List<CommonTypes.Partition>();

View File

@@ -34,19 +34,19 @@ using System;
using System.Collections.Generic;
using System.Linq;
using DiscImageChef.CommonTypes;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
// These partitions are hardwired in kernel sources for some UNIX versions predating System V.
// They depend on exact device, indeed the kernel chooses what to use depending on the disk driver, so that's what we do.
// Currently only DEC devices used in Ultrix are added, probably it's missing a lot of entries.
public class UNIX : PartPlugin
public class UNIX : PartitionPlugin
{
public UNIX()
{
Name = "UNIX hardwired";
PluginUUID = new Guid("9ED7E30B-53BF-4619-87A0-5D2002155617");
PluginUuid = new Guid("9ED7E30B-53BF-4619-87A0-5D2002155617");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)
@@ -56,7 +56,7 @@ namespace DiscImageChef.PartPlugins
if(sectorOffset != 0) return false;
switch(imagePlugin.ImageInfo.mediaType)
switch(imagePlugin.ImageInfo.MediaType)
{
case MediaType.RA60:
parts = RA60;

View File

@@ -35,11 +35,11 @@ using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class VTOC : PartPlugin
public class VTOC : PartitionPlugin
{
const uint PD_MAGIC = 0xCA5E600D;
const uint VTOC_SANE = 0x600DDEEE;
@@ -51,7 +51,7 @@ namespace DiscImageChef.PartPlugins
public VTOC()
{
Name = "UNIX VTOC";
PluginUUID = new Guid("6D35A66F-8D77-426F-A562-D88F6A1F1702");
PluginUuid = new Guid("6D35A66F-8D77-426F-A562-D88F6A1F1702");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)

View File

@@ -35,12 +35,12 @@ using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
// TODO: Find better documentation, this is working for XENIX 2 but not for SCO OpenServer...
public class XENIX : PartPlugin
public class XENIX : PartitionPlugin
{
const ushort PAMAGIC = 0x1234;
const int MAXPARTS = 16;
@@ -51,7 +51,7 @@ namespace DiscImageChef.PartPlugins
public XENIX()
{
Name = "XENIX";
PluginUUID = new Guid("53BE01DE-E68B-469F-A17F-EC2E4BD61CD9");
PluginUuid = new Guid("53BE01DE-E68B-469F-A17F-EC2E4BD61CD9");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)

View File

@@ -34,11 +34,11 @@ using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.ImagePlugins;
using DiscImageChef.DiscImages;
namespace DiscImageChef.PartPlugins
namespace DiscImageChef.Partitions
{
public class Xbox : PartPlugin
public class Xbox : PartitionPlugin
{
const uint XboxCigam = 0x46415458;
const uint XboxMagic = 0x58544146;
@@ -74,7 +74,7 @@ namespace DiscImageChef.PartPlugins
public Xbox()
{
Name = "Xbox partitioning";
PluginUUID = new Guid("E3F6FB91-D358-4F22-A550-81E92D50EB78");
PluginUuid = new Guid("E3F6FB91-D358-4F22-A550-81E92D50EB78");
}
public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions, ulong sectorOffset)
@@ -91,16 +91,16 @@ namespace DiscImageChef.PartPlugins
BigEndianMarshal.ByteArrayToStructureBigEndian<Xbox360DevKitPartitionTable>(sector);
if(table.magic == Xbox360DevKitMagic &&
table.contentOff + table.contentLen <= imagePlugin.ImageInfo.sectors &&
table.dashboardOff + table.dashboardLen <= imagePlugin.ImageInfo.sectors)
table.contentOff + table.contentLen <= imagePlugin.ImageInfo.Sectors &&
table.dashboardOff + table.dashboardLen <= imagePlugin.ImageInfo.Sectors)
{
Partition contentPart = new Partition
{
Description = "Content volume",
Size = (ulong)table.contentLen * imagePlugin.ImageInfo.sectorSize,
Size = (ulong)table.contentLen * imagePlugin.ImageInfo.SectorSize,
Length = table.contentLen,
Sequence = 1,
Offset = (ulong)table.contentOff * imagePlugin.ImageInfo.sectorSize,
Offset = (ulong)table.contentOff * imagePlugin.ImageInfo.SectorSize,
Start = table.contentOff,
Scheme = Name
};
@@ -108,10 +108,10 @@ namespace DiscImageChef.PartPlugins
Partition dashboardPart = new Partition
{
Description = "Dashboard volume",
Size = (ulong)table.dashboardLen * imagePlugin.ImageInfo.sectorSize,
Size = (ulong)table.dashboardLen * imagePlugin.ImageInfo.SectorSize,
Length = table.dashboardLen,
Sequence = 2,
Offset = (ulong)table.dashboardOff * imagePlugin.ImageInfo.sectorSize,
Offset = (ulong)table.dashboardOff * imagePlugin.ImageInfo.SectorSize,
Start = table.dashboardOff,
Scheme = Name
};
@@ -124,9 +124,9 @@ namespace DiscImageChef.PartPlugins
uint temp = 0;
if(imagePlugin.ImageInfo.sectors > (ulong)(MemoryUnitDataOff / imagePlugin.ImageInfo.sectorSize))
if(imagePlugin.ImageInfo.Sectors > (ulong)(MemoryUnitDataOff / imagePlugin.ImageInfo.SectorSize))
{
sector = imagePlugin.ReadSector((ulong)(MemoryUnitDataOff / imagePlugin.ImageInfo.sectorSize));
sector = imagePlugin.ReadSector((ulong)(MemoryUnitDataOff / imagePlugin.ImageInfo.SectorSize));
temp = BitConverter.ToUInt32(sector, 0);
if(temp == XboxCigam)
@@ -135,7 +135,7 @@ namespace DiscImageChef.PartPlugins
{
Description = "System cache",
Size = MemoryUnitDataOff,
Length = (ulong)(MemoryUnitDataOff / imagePlugin.ImageInfo.sectorSize),
Length = (ulong)(MemoryUnitDataOff / imagePlugin.ImageInfo.SectorSize),
Sequence = 1,
Offset = 0,
Start = 0,
@@ -146,8 +146,8 @@ namespace DiscImageChef.PartPlugins
{
Description = "Data volume",
Size =
(ulong)imagePlugin.ImageInfo.sectors * imagePlugin.ImageInfo.sectorSize - MemoryUnitDataOff,
Length = imagePlugin.ImageInfo.sectors - sysCachePart.Length,
(ulong)imagePlugin.ImageInfo.Sectors * imagePlugin.ImageInfo.SectorSize - MemoryUnitDataOff,
Length = imagePlugin.ImageInfo.Sectors - sysCachePart.Length,
Sequence = 2,
Offset = MemoryUnitDataOff,
Start = sysCachePart.Length,
@@ -161,9 +161,9 @@ namespace DiscImageChef.PartPlugins
}
}
if(imagePlugin.ImageInfo.sectors > (ulong)(Xbox360DataOff / imagePlugin.ImageInfo.sectorSize))
if(imagePlugin.ImageInfo.Sectors > (ulong)(Xbox360DataOff / imagePlugin.ImageInfo.SectorSize))
{
sector = imagePlugin.ReadSector((ulong)(Xbox360DataOff / imagePlugin.ImageInfo.sectorSize));
sector = imagePlugin.ReadSector((ulong)(Xbox360DataOff / imagePlugin.ImageInfo.SectorSize));
temp = BitConverter.ToUInt32(sector, 0);
if(temp == XboxCigam)
@@ -172,10 +172,10 @@ namespace DiscImageChef.PartPlugins
{
Description = "Security sectors",
Size = Xbox360SecuritySectorLen,
Length = (ulong)(Xbox360SecuritySectorLen / imagePlugin.ImageInfo.sectorSize),
Length = (ulong)(Xbox360SecuritySectorLen / imagePlugin.ImageInfo.SectorSize),
Sequence = 1,
Offset = Xbox360SecuritySectorOff,
Start = (ulong)(Xbox360SecuritySectorOff / imagePlugin.ImageInfo.sectorSize),
Start = (ulong)(Xbox360SecuritySectorOff / imagePlugin.ImageInfo.SectorSize),
Scheme = Name
};
@@ -183,10 +183,10 @@ namespace DiscImageChef.PartPlugins
{
Description = "System cache",
Size = Xbox360SystemCacheLen,
Length = (ulong)(Xbox360SystemCacheLen / imagePlugin.ImageInfo.sectorSize),
Length = (ulong)(Xbox360SystemCacheLen / imagePlugin.ImageInfo.SectorSize),
Sequence = 2,
Offset = Xbox360SystemCacheOff,
Start = (ulong)(Xbox360SystemCacheOff / imagePlugin.ImageInfo.sectorSize),
Start = (ulong)(Xbox360SystemCacheOff / imagePlugin.ImageInfo.SectorSize),
Scheme = Name
};
@@ -194,10 +194,10 @@ namespace DiscImageChef.PartPlugins
{
Description = "Game cache",
Size = Xbox360GameCacheLen,
Length = (ulong)(Xbox360GameCacheLen / imagePlugin.ImageInfo.sectorSize),
Length = (ulong)(Xbox360GameCacheLen / imagePlugin.ImageInfo.SectorSize),
Sequence = 3,
Offset = Xbox360GameCacheOff,
Start = (ulong)(Xbox360GameCacheOff / imagePlugin.ImageInfo.sectorSize),
Start = (ulong)(Xbox360GameCacheOff / imagePlugin.ImageInfo.SectorSize),
Scheme = Name
};
@@ -205,10 +205,10 @@ namespace DiscImageChef.PartPlugins
{
Description = "System volume",
Size = Xbox368SysExtLen,
Length = (ulong)(Xbox368SysExtLen / imagePlugin.ImageInfo.sectorSize),
Length = (ulong)(Xbox368SysExtLen / imagePlugin.ImageInfo.SectorSize),
Sequence = 4,
Offset = Xbox368SysExtOff,
Start = (ulong)(Xbox368SysExtOff / imagePlugin.ImageInfo.sectorSize),
Start = (ulong)(Xbox368SysExtOff / imagePlugin.ImageInfo.SectorSize),
Scheme = Name
};
@@ -216,10 +216,10 @@ namespace DiscImageChef.PartPlugins
{
Description = "System volume 2",
Size = Xbox360SysExt2Len,
Length = (ulong)(Xbox360SysExt2Len / imagePlugin.ImageInfo.sectorSize),
Length = (ulong)(Xbox360SysExt2Len / imagePlugin.ImageInfo.SectorSize),
Sequence = 5,
Offset = Xbox360SysExt2Off,
Start = (ulong)(Xbox360SysExt2Off / imagePlugin.ImageInfo.sectorSize),
Start = (ulong)(Xbox360SysExt2Off / imagePlugin.ImageInfo.SectorSize),
Scheme = Name
};
@@ -227,10 +227,10 @@ namespace DiscImageChef.PartPlugins
{
Description = "Xbox backwards compatibility",
Size = Xbox360CompatLen,
Length = (ulong)(Xbox360CompatLen / imagePlugin.ImageInfo.sectorSize),
Length = (ulong)(Xbox360CompatLen / imagePlugin.ImageInfo.SectorSize),
Sequence = 6,
Offset = Xbox360CompatOff,
Start = (ulong)(Xbox360CompatOff / imagePlugin.ImageInfo.sectorSize),
Start = (ulong)(Xbox360CompatOff / imagePlugin.ImageInfo.SectorSize),
Scheme = Name
};
@@ -239,11 +239,11 @@ namespace DiscImageChef.PartPlugins
Description = "Data volume",
Sequence = 7,
Offset = Xbox360DataOff,
Start = (ulong)(Xbox360DataOff / imagePlugin.ImageInfo.sectorSize),
Start = (ulong)(Xbox360DataOff / imagePlugin.ImageInfo.SectorSize),
Scheme = Name
};
dataPart.Length = imagePlugin.ImageInfo.sectors - dataPart.Start;
dataPart.Size = dataPart.Length * imagePlugin.ImageInfo.sectorSize;
dataPart.Length = imagePlugin.ImageInfo.Sectors - dataPart.Start;
dataPart.Size = dataPart.Length * imagePlugin.ImageInfo.SectorSize;
partitions.Add(securityPart);
partitions.Add(sysCachePart);