mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Add recursiveness to BigEndianMarshal thanks to @darkstar suggestions.
This commit is contained in:
@@ -114,7 +114,8 @@ namespace DiscImageChef.Filesystems
|
||||
|
||||
if(rbfSb.dd_sync != RBF_SYNC && rbf9000Sb.rid_sync != RBF_SYNC && rbf9000Sb.rid_sync != RBF_CNYS) return;
|
||||
|
||||
if(rbf9000Sb.rid_sync == RBF_CNYS) rbf9000Sb = BigEndianMarshal.SwapStructureMembersEndian(rbf9000Sb);
|
||||
if(rbf9000Sb.rid_sync == RBF_CNYS)
|
||||
rbf9000Sb = (RBF_NewIdSector)BigEndianMarshal.SwapStructureMembersEndian(rbf9000Sb);
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
@@ -229,7 +230,8 @@ namespace DiscImageChef.Filesystems
|
||||
struct RBF_IdSector
|
||||
{
|
||||
/// <summary>Sectors on disk</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] dd_tot;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
|
||||
public byte[] dd_tot;
|
||||
/// <summary>Tracks</summary>
|
||||
public byte dd_tks;
|
||||
/// <summary>Bytes in allocation map</summary>
|
||||
@@ -237,7 +239,8 @@ namespace DiscImageChef.Filesystems
|
||||
/// <summary>Sectors per cluster</summary>
|
||||
public ushort dd_bit;
|
||||
/// <summary>LSN of root directory</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] dd_dir;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
|
||||
public byte[] dd_dir;
|
||||
/// <summary>Owner ID</summary>
|
||||
public ushort dd_own;
|
||||
/// <summary>Attributes</summary>
|
||||
@@ -251,15 +254,19 @@ namespace DiscImageChef.Filesystems
|
||||
/// <summary>Reserved</summary>
|
||||
public ushort dd_res;
|
||||
/// <summary>LSN of boot file</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] dd_bt;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
|
||||
public byte[] dd_bt;
|
||||
/// <summary>Size of boot file</summary>
|
||||
public ushort dd_bsz;
|
||||
/// <summary>Creation date</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)] public byte[] dd_dat;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
|
||||
public byte[] dd_dat;
|
||||
/// <summary>Volume name</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)] public byte[] dd_nam;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
|
||||
public byte[] dd_nam;
|
||||
/// <summary>Path options</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)] public byte[] dd_opt;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
|
||||
public byte[] dd_opt;
|
||||
/// <summary>Reserved</summary>
|
||||
public byte reserved;
|
||||
/// <summary>Magic number</summary>
|
||||
@@ -318,11 +325,13 @@ namespace DiscImageChef.Filesystems
|
||||
/// <summary>Last write time for this structure</summary>
|
||||
public uint rid_mtime;
|
||||
/// <summary>Volume name</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)] public byte[] rid_name;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
|
||||
public byte[] rid_name;
|
||||
/// <summary>Endian flag</summary>
|
||||
public byte rid_endflag;
|
||||
/// <summary>Padding</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public byte[] rid_unused2;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
|
||||
public byte[] rid_unused2;
|
||||
/// <summary>Parity</summary>
|
||||
public uint rid_parity;
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace DiscImageChef
|
||||
GCHandle ptr = GCHandle.Alloc(bytes, GCHandleType.Pinned);
|
||||
T str = (T)Marshal.PtrToStructure(ptr.AddrOfPinnedObject(), typeof(T));
|
||||
ptr.Free();
|
||||
return SwapStructureMembersEndian(str);
|
||||
return (T)SwapStructureMembersEndian(str);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -60,8 +60,7 @@ namespace DiscImageChef
|
||||
/// </summary>
|
||||
/// <returns>The structure with its members endian swapped.</returns>
|
||||
/// <param name="str">The structure.</param>
|
||||
/// <typeparam name="T">Structure type.</typeparam>
|
||||
public static T SwapStructureMembersEndian<T>(T str) where T : struct
|
||||
public static object SwapStructureMembersEndian(object str)
|
||||
{
|
||||
Type t = str.GetType();
|
||||
FieldInfo[] fieldInfo = t.GetFields();
|
||||
@@ -71,56 +70,72 @@ namespace DiscImageChef
|
||||
short int16 = (short)fi.GetValue(str);
|
||||
byte[] int16_b = BitConverter.GetBytes(int16);
|
||||
byte[] int16_r = int16_b.Reverse().ToArray();
|
||||
fi.SetValueDirect(__makeref(str), BitConverter.ToInt16(int16_r, 0));
|
||||
fi.SetValue(str, BitConverter.ToInt16(int16_r, 0));
|
||||
}
|
||||
else if(fi.FieldType == typeof(int))
|
||||
{
|
||||
int int32 = (int)fi.GetValue(str);
|
||||
byte[] int32_b = BitConverter.GetBytes(int32);
|
||||
byte[] int32_r = int32_b.Reverse().ToArray();
|
||||
fi.SetValueDirect(__makeref(str), BitConverter.ToInt32(int32_r, 0));
|
||||
fi.SetValue(str, BitConverter.ToInt32(int32_r, 0));
|
||||
}
|
||||
else if(fi.FieldType == typeof(long))
|
||||
{
|
||||
long int64 = (long)fi.GetValue(str);
|
||||
byte[] int64_b = BitConverter.GetBytes(int64);
|
||||
byte[] int64_r = int64_b.Reverse().ToArray();
|
||||
fi.SetValueDirect(__makeref(str), BitConverter.ToInt64(int64_r, 0));
|
||||
fi.SetValue(str, BitConverter.ToInt64(int64_r, 0));
|
||||
}
|
||||
else if(fi.FieldType == typeof(ushort))
|
||||
{
|
||||
ushort uint16 = (ushort)fi.GetValue(str);
|
||||
byte[] uint16_b = BitConverter.GetBytes(uint16);
|
||||
byte[] uint16_r = uint16_b.Reverse().ToArray();
|
||||
fi.SetValueDirect(__makeref(str), BitConverter.ToUInt16(uint16_r, 0));
|
||||
fi.SetValue(str, BitConverter.ToUInt16(uint16_r, 0));
|
||||
}
|
||||
else if(fi.FieldType == typeof(uint))
|
||||
{
|
||||
uint uint32 = (uint)fi.GetValue(str);
|
||||
byte[] uint32_b = BitConverter.GetBytes(uint32);
|
||||
byte[] uint32_r = uint32_b.Reverse().ToArray();
|
||||
fi.SetValueDirect(__makeref(str), BitConverter.ToUInt32(uint32_r, 0));
|
||||
fi.SetValue(str, BitConverter.ToUInt32(uint32_r, 0));
|
||||
}
|
||||
else if(fi.FieldType == typeof(ulong))
|
||||
{
|
||||
ulong uint64 = (ulong)fi.GetValue(str);
|
||||
byte[] uint64_b = BitConverter.GetBytes(uint64);
|
||||
byte[] uint64_r = uint64_b.Reverse().ToArray();
|
||||
fi.SetValueDirect(__makeref(str), BitConverter.ToUInt64(uint64_r, 0));
|
||||
fi.SetValue(str, BitConverter.ToUInt64(uint64_r, 0));
|
||||
}
|
||||
else if(fi.FieldType == typeof(float))
|
||||
{
|
||||
float flt = (float)fi.GetValue(str);
|
||||
byte[] flt_b = BitConverter.GetBytes(flt);
|
||||
byte[] flt_r = flt_b.Reverse().ToArray();
|
||||
fi.SetValueDirect(__makeref(str), BitConverter.ToSingle(flt_r, 0));
|
||||
fi.SetValue(str, BitConverter.ToSingle(flt_r, 0));
|
||||
}
|
||||
else if(fi.FieldType == typeof(double))
|
||||
{
|
||||
double dbl = (double)fi.GetValue(str);
|
||||
byte[] dbl_b = BitConverter.GetBytes(dbl);
|
||||
byte[] dbl_r = dbl_b.Reverse().ToArray();
|
||||
fi.SetValueDirect(__makeref(str), BitConverter.ToDouble(dbl_r, 0));
|
||||
fi.SetValue(str, BitConverter.ToDouble(dbl_r, 0));
|
||||
}
|
||||
else if(fi.FieldType == typeof(byte) || fi.FieldType == typeof(sbyte))
|
||||
{
|
||||
// Do nothing, can't byteswap them!
|
||||
}
|
||||
else if(fi.FieldType == typeof(Guid))
|
||||
{
|
||||
// TODO: Swap GUID
|
||||
}
|
||||
// TODO: Swap arrays and enums
|
||||
else if(fi.FieldType.IsValueType && !fi.FieldType.IsEnum && !fi.FieldType.IsArray)
|
||||
{
|
||||
object obj = fi.GetValue(str);
|
||||
Type ty = obj.GetType();
|
||||
object strc = SwapStructureMembersEndian(obj);
|
||||
fi.SetValue(str, strc);
|
||||
}
|
||||
|
||||
return str;
|
||||
|
||||
@@ -92,8 +92,10 @@ namespace DiscImageChef.Partitions
|
||||
|
||||
DicConsole.DebugWriteLine("BSD plugin", "dl.d_type = {0}", dl.d_type);
|
||||
DicConsole.DebugWriteLine("BSD plugin", "dl.d_subtype = {0}", dl.d_subtype);
|
||||
DicConsole.DebugWriteLine("BSD plugin", "dl.d_typename = {0}", StringHandlers.CToString(dl.d_typename));
|
||||
DicConsole.DebugWriteLine("BSD plugin", "dl.d_packname = {0}", StringHandlers.CToString(dl.d_packname));
|
||||
DicConsole.DebugWriteLine("BSD plugin", "dl.d_typename = {0}",
|
||||
StringHandlers.CToString(dl.d_typename));
|
||||
DicConsole.DebugWriteLine("BSD plugin", "dl.d_packname = {0}",
|
||||
StringHandlers.CToString(dl.d_packname));
|
||||
DicConsole.DebugWriteLine("BSD plugin", "dl.d_secsize = {0}", dl.d_secsize);
|
||||
DicConsole.DebugWriteLine("BSD plugin", "dl.d_nsectors = {0}", dl.d_nsectors);
|
||||
DicConsole.DebugWriteLine("BSD plugin", "dl.d_ntracks = {0}", dl.d_ntracks);
|
||||
@@ -147,6 +149,7 @@ namespace DiscImageChef.Partitions
|
||||
Scheme = Name
|
||||
};
|
||||
if(dl.d_partitions[i].p_fstype == fsType.Unused) continue;
|
||||
|
||||
// Crude and dirty way to know if the disklabel is relative to its parent partition...
|
||||
if(dl.d_partitions[i].p_offset < sectorOffset && !addSectorOffset) addSectorOffset = true;
|
||||
|
||||
@@ -155,6 +158,7 @@ namespace DiscImageChef.Partitions
|
||||
part.Start += sectorOffset;
|
||||
part.Offset += sectorOffset * imagePlugin.Info.SectorSize;
|
||||
}
|
||||
|
||||
DicConsole.DebugWriteLine("BSD plugin", "part.start = {0}", part.Start);
|
||||
DicConsole.DebugWriteLine("BSD plugin", "Adding it...");
|
||||
partitions.Add(part);
|
||||
@@ -211,11 +215,12 @@ namespace DiscImageChef.Partitions
|
||||
|
||||
static DiskLabel SwapDiskLabel(DiskLabel disklabel)
|
||||
{
|
||||
DiskLabel dl = BigEndianMarshal.SwapStructureMembersEndian(disklabel);
|
||||
DiskLabel dl =
|
||||
(DiskLabel)BigEndianMarshal.SwapStructureMembersEndian(disklabel);
|
||||
for(int i = 0; i < dl.d_drivedata.Length; i++) dl.d_drivedata[i] = Swapping.Swap(dl.d_drivedata[i]);
|
||||
for(int i = 0; i < dl.d_spare.Length; i++) dl.d_spare[i] = Swapping.Swap(dl.d_spare[i]);
|
||||
for(int i = 0; i < dl.d_partitions.Length; i++)
|
||||
dl.d_partitions[i] = BigEndianMarshal.SwapStructureMembersEndian(dl.d_partitions[i]);
|
||||
dl.d_partitions[i] = (BSDPartition)BigEndianMarshal.SwapStructureMembersEndian(dl.d_partitions[i]);
|
||||
|
||||
return dl;
|
||||
}
|
||||
@@ -382,9 +387,11 @@ namespace DiscImageChef.Partitions
|
||||
/// <summary>Disk subtype</summary>
|
||||
public ushort d_subtype;
|
||||
/// <summary>Type name</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] public byte[] d_typename;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
|
||||
public byte[] d_typename;
|
||||
/// <summary>Pack identifier</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] public byte[] d_packname;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
|
||||
public byte[] d_packname;
|
||||
/// <summary>Bytes per sector</summary>
|
||||
public uint d_secsize;
|
||||
/// <summary>Sectors per track</summary>
|
||||
@@ -420,9 +427,11 @@ namespace DiscImageChef.Partitions
|
||||
/// </summary>
|
||||
public dFlags d_flags;
|
||||
/// <summary>Drive-specific information</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)] public uint[] d_drivedata;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
|
||||
public uint[] d_drivedata;
|
||||
/// <summary>Reserved</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)] public uint[] d_spare;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
|
||||
public uint[] d_spare;
|
||||
/// <summary><see cref="DISKMAGIC" /> again</summary>
|
||||
public uint d_magic2;
|
||||
/// <summary>XOR of data</summary>
|
||||
@@ -434,7 +443,8 @@ namespace DiscImageChef.Partitions
|
||||
/// <summary>Maximum size of superblock in bytes</summary>
|
||||
public uint d_sbsize;
|
||||
/// <summary>Partitions</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)] public BSDPartition[] d_partitions;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
|
||||
public BSDPartition[] d_partitions;
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
||||
|
||||
@@ -82,7 +82,7 @@ namespace DiscImageChef.Partitions
|
||||
if(table.magic != X68K_MAGIC) return false;
|
||||
|
||||
for(int i = 0; i < table.entries.Length; i++)
|
||||
table.entries[i] = BigEndianMarshal.SwapStructureMembersEndian(table.entries[i]);
|
||||
table.entries[i] = (X68kEntry)BigEndianMarshal.SwapStructureMembersEndian(table.entries[i]);
|
||||
|
||||
DicConsole.DebugWriteLine("Human68k plugin", "table.size = {0:X4}", table.size);
|
||||
DicConsole.DebugWriteLine("Human68k plugin", "table.size2 = {0:X4}", table.size2);
|
||||
@@ -125,13 +125,15 @@ namespace DiscImageChef.Partitions
|
||||
public uint size;
|
||||
public uint size2;
|
||||
public uint unknown;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)] public X68kEntry[] entries;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
|
||||
public X68kEntry[] entries;
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
||||
struct X68kEntry
|
||||
{
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)] public byte[] name;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
|
||||
public byte[] name;
|
||||
public uint stateStart;
|
||||
public uint length;
|
||||
}
|
||||
|
||||
@@ -60,11 +60,9 @@ namespace DiscImageChef.Partitions
|
||||
|
||||
SGILabel dvh = BigEndianMarshal.ByteArrayToStructureBigEndian<SGILabel>(sector);
|
||||
for(int i = 0; i < dvh.volume.Length; i++)
|
||||
dvh.volume[i] = BigEndianMarshal.SwapStructureMembersEndian(dvh.volume[i]);
|
||||
dvh.volume[i] = (SGIVolume)BigEndianMarshal.SwapStructureMembersEndian(dvh.volume[i]);
|
||||
for(int i = 0; i < dvh.partitions.Length; i++)
|
||||
dvh.partitions[i] = BigEndianMarshal.SwapStructureMembersEndian(dvh.partitions[i]);
|
||||
|
||||
dvh.device_params = BigEndianMarshal.SwapStructureMembersEndian(dvh.device_params);
|
||||
dvh.partitions[i] = (SGIPartition)BigEndianMarshal.SwapStructureMembersEndian(dvh.partitions[i]);
|
||||
|
||||
DicConsole.DebugWriteLine("SGIVH plugin", "dvh.magic = 0x{0:X8} (should be 0x{1:X8})", dvh.magic,
|
||||
SGI_MAGIC);
|
||||
@@ -118,10 +116,14 @@ namespace DiscImageChef.Partitions
|
||||
|
||||
Partition part = new Partition
|
||||
{
|
||||
Start = dvh.partitions[i].first_block * dvh.device_params.dp_secbytes / imagePlugin.Info.SectorSize,
|
||||
Offset = dvh.partitions[i].first_block * dvh.device_params.dp_secbytes,
|
||||
Length = dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes / imagePlugin.Info.SectorSize,
|
||||
Size = dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes,
|
||||
Start = dvh.partitions[i].first_block * dvh.device_params.dp_secbytes /
|
||||
imagePlugin.Info.SectorSize,
|
||||
Offset = dvh.partitions[i].first_block *
|
||||
dvh.device_params.dp_secbytes,
|
||||
Length = dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes /
|
||||
imagePlugin.Info.SectorSize,
|
||||
Size = dvh.partitions[i].num_blocks *
|
||||
dvh.device_params.dp_secbytes,
|
||||
Type = TypeToString(dvh.partitions[i].type),
|
||||
Sequence = counter,
|
||||
Scheme = Name
|
||||
@@ -171,13 +173,16 @@ namespace DiscImageChef.Partitions
|
||||
/// <summary></summary>
|
||||
public short swap_part_num;
|
||||
/// <summary></summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] public byte[] boot_file;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
|
||||
public byte[] boot_file;
|
||||
/// <summary></summary>
|
||||
public SGIDeviceParameters device_params;
|
||||
/// <summary></summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)] public SGIVolume[] volume;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
|
||||
public SGIVolume[] volume;
|
||||
/// <summary></summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] public SGIPartition[] partitions;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
|
||||
public SGIPartition[] partitions;
|
||||
/// <summary></summary>
|
||||
public uint csum;
|
||||
/// <summary></summary>
|
||||
@@ -188,7 +193,8 @@ namespace DiscImageChef.Partitions
|
||||
struct SGIVolume
|
||||
{
|
||||
/// <summary></summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)] public byte[] name;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
|
||||
public byte[] name;
|
||||
/// <summary></summary>
|
||||
public uint block_num;
|
||||
/// <summary></summary>
|
||||
|
||||
@@ -96,7 +96,8 @@ namespace DiscImageChef.Partitions
|
||||
DicConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
|
||||
|
||||
if(dkl.dkl_magic == DKL_MAGIC || dkl.dkl_magic == DKL_CIGAM)
|
||||
if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE || dkl16.dkl_vtoc.v_sanity == VTOC_ENAS) useDkl16 = true;
|
||||
if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE || dkl16.dkl_vtoc.v_sanity == VTOC_ENAS)
|
||||
useDkl16 = true;
|
||||
else if(dkl8.dkl_vtoc.v_sanity == VTOC_SANE || dkl8.dkl_vtoc.v_sanity == VTOC_ENAS) useDkl8 = true;
|
||||
else useDkl = true;
|
||||
|
||||
@@ -111,7 +112,8 @@ namespace DiscImageChef.Partitions
|
||||
handle.Free();
|
||||
|
||||
if(dkl.dkl_magic == DKL_MAGIC || dkl.dkl_magic == DKL_CIGAM)
|
||||
if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE || dkl16.dkl_vtoc.v_sanity == VTOC_ENAS) useDkl16 = true;
|
||||
if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE || dkl16.dkl_vtoc.v_sanity == VTOC_ENAS)
|
||||
useDkl16 = true;
|
||||
else if(dkl8.dkl_vtoc.v_sanity == VTOC_SANE || dkl8.dkl_vtoc.v_sanity == VTOC_ENAS) useDkl8 = true;
|
||||
else useDkl = true;
|
||||
}
|
||||
@@ -158,8 +160,7 @@ namespace DiscImageChef.Partitions
|
||||
Partition part = new Partition
|
||||
{
|
||||
Size = (ulong)dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
|
||||
Length =
|
||||
(ulong)(dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
|
||||
Length = (ulong)(dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
|
||||
Sequence = (ulong)i,
|
||||
Offset =
|
||||
((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) * DK_LABEL_SIZE,
|
||||
@@ -317,9 +318,9 @@ namespace DiscImageChef.Partitions
|
||||
static dk_label SwapDiskLabel(dk_label label)
|
||||
{
|
||||
DicConsole.DebugWriteLine("Sun plugin", "Swapping dk_label");
|
||||
dk_label lebal = BigEndianMarshal.SwapStructureMembersEndian(label);
|
||||
dk_label lebal = (dk_label)BigEndianMarshal.SwapStructureMembersEndian(label);
|
||||
for(int i = 0; i < label.dkl_map.Length; i++)
|
||||
lebal.dkl_map[i] = BigEndianMarshal.SwapStructureMembersEndian(label.dkl_map[i]);
|
||||
lebal.dkl_map[i] = (dk_map)BigEndianMarshal.SwapStructureMembersEndian(label.dkl_map[i]);
|
||||
|
||||
return lebal;
|
||||
}
|
||||
@@ -327,10 +328,9 @@ namespace DiscImageChef.Partitions
|
||||
static dk_label8 SwapDiskLabel(dk_label8 label)
|
||||
{
|
||||
DicConsole.DebugWriteLine("Sun plugin", "Swapping dk_label8");
|
||||
dk_label8 lebal = BigEndianMarshal.SwapStructureMembersEndian(label);
|
||||
lebal.dkl_vtoc = BigEndianMarshal.SwapStructureMembersEndian(label.dkl_vtoc);
|
||||
dk_label8 lebal = (dk_label8)BigEndianMarshal.SwapStructureMembersEndian(label);
|
||||
for(int i = 0; i < label.dkl_map.Length; i++)
|
||||
lebal.dkl_map[i] = BigEndianMarshal.SwapStructureMembersEndian(label.dkl_map[i]);
|
||||
lebal.dkl_map[i] = (dk_map)BigEndianMarshal.SwapStructureMembersEndian(label.dkl_map[i]);
|
||||
for(int i = 0; i < label.dkl_vtoc.v_bootinfo.Length; i++)
|
||||
lebal.dkl_vtoc.v_bootinfo[i] = Swapping.Swap(label.dkl_vtoc.v_bootinfo[i]);
|
||||
for(int i = 0; i < label.dkl_vtoc.v_part.Length; i++)
|
||||
@@ -338,6 +338,7 @@ namespace DiscImageChef.Partitions
|
||||
lebal.dkl_vtoc.v_part[i].p_flag = (SunFlags)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_flag);
|
||||
lebal.dkl_vtoc.v_part[i].p_tag = (SunTag)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_tag);
|
||||
}
|
||||
|
||||
for(int i = 0; i < label.dkl_vtoc.v_timestamp.Length; i++)
|
||||
lebal.dkl_vtoc.v_timestamp[i] = Swapping.Swap(label.dkl_vtoc.v_timestamp[i]);
|
||||
for(int i = 0; i < label.dkl_vtoc.v_reserved.Length; i++)
|
||||
@@ -349,8 +350,7 @@ namespace DiscImageChef.Partitions
|
||||
static dk_label16 SwapDiskLabel(dk_label16 label)
|
||||
{
|
||||
DicConsole.DebugWriteLine("Sun plugin", "Swapping dk_label16");
|
||||
dk_label16 lebal = BigEndianMarshal.SwapStructureMembersEndian(label);
|
||||
lebal.dkl_vtoc = BigEndianMarshal.SwapStructureMembersEndian(label.dkl_vtoc);
|
||||
dk_label16 lebal = (dk_label16)BigEndianMarshal.SwapStructureMembersEndian(label);
|
||||
for(int i = 0; i < label.dkl_vtoc.v_bootinfo.Length; i++)
|
||||
lebal.dkl_vtoc.v_bootinfo[i] = Swapping.Swap(label.dkl_vtoc.v_bootinfo[i]);
|
||||
for(int i = 0; i < label.dkl_vtoc.v_part.Length; i++)
|
||||
@@ -360,6 +360,7 @@ namespace DiscImageChef.Partitions
|
||||
lebal.dkl_vtoc.v_part[i].p_size = Swapping.Swap(label.dkl_vtoc.v_part[i].p_size);
|
||||
lebal.dkl_vtoc.v_part[i].p_start = Swapping.Swap(label.dkl_vtoc.v_part[i].p_start);
|
||||
}
|
||||
|
||||
for(int i = 0; i < label.dkl_vtoc.v_timestamp.Length; i++)
|
||||
lebal.dkl_vtoc.v_timestamp[i] = Swapping.Swap(label.dkl_vtoc.v_timestamp[i]);
|
||||
for(int i = 0; i < label.dkl_vtoc.v_reserved.Length; i++)
|
||||
@@ -458,9 +459,11 @@ namespace DiscImageChef.Partitions
|
||||
struct dk_label
|
||||
{
|
||||
/// <summary>Informative string</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)] public byte[] dkl_asciilabel;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
|
||||
public byte[] dkl_asciilabel;
|
||||
/// <summary>Padding</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD)] public byte[] dkl_pad;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD)]
|
||||
public byte[] dkl_pad;
|
||||
/// <summary>rotations per minute</summary>
|
||||
public ushort dkl_rpm;
|
||||
/// <summary># physical cylinders</summary>
|
||||
@@ -486,7 +489,8 @@ namespace DiscImageChef.Partitions
|
||||
/// <summary>physical partition #</summary>
|
||||
public ushort dkl_ppart;
|
||||
/// <summary>Logical partitions</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)] public dk_map[] dkl_map;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
|
||||
public dk_map[] dkl_map;
|
||||
/// <summary>identifies this label format</summary>
|
||||
public ushort dkl_magic;
|
||||
/// <summary>xor checksum of sector</summary>
|
||||
@@ -523,53 +527,65 @@ namespace DiscImageChef.Partitions
|
||||
/// <summary> layout version</summary>
|
||||
public uint v_version;
|
||||
/// <summary> volume name</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_VVOL)] public byte[] v_volume;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_VVOL)]
|
||||
public byte[] v_volume;
|
||||
/// <summary> number of partitions </summary>
|
||||
public ushort v_nparts;
|
||||
/// <summary> partition hdrs, sec 2</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)] public dk_map2[] v_part;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
|
||||
public dk_map2[] v_part;
|
||||
/// <summary>Alignment</summary>
|
||||
public ushort padding;
|
||||
/// <summary> info needed by mboot</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public uint[] v_bootinfo;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
|
||||
public uint[] v_bootinfo;
|
||||
/// <summary> to verify vtoc sanity</summary>
|
||||
public uint v_sanity;
|
||||
/// <summary> free space</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)] public uint[] v_reserved;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
|
||||
public uint[] v_reserved;
|
||||
/// <summary> partition timestamp</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)] public int[] v_timestamp;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
|
||||
public int[] v_timestamp;
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
||||
struct dk_vtoc16
|
||||
{
|
||||
/// <summary>info needed by mboot</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)] public uint[] v_bootinfo;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
|
||||
public uint[] v_bootinfo;
|
||||
/// <summary>to verify vtoc sanity</summary>
|
||||
public uint v_sanity;
|
||||
/// <summary>layout version</summary>
|
||||
public uint v_version;
|
||||
/// <summary>volume name</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_VVOL)] public byte[] v_volume;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_VVOL)]
|
||||
public byte[] v_volume;
|
||||
/// <summary>sector size in bytes</summary>
|
||||
public ushort v_sectorsz;
|
||||
/// <summary>number of partitions</summary>
|
||||
public ushort v_nparts;
|
||||
/// <summary>free space</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)] public uint[] v_reserved;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
|
||||
public uint[] v_reserved;
|
||||
/// <summary>partition headers</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP16)] public dkl_partition[] v_part;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP16)]
|
||||
public dkl_partition[] v_part;
|
||||
/// <summary>partition timestamp</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP16)] public int[] v_timestamp;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP16)]
|
||||
public int[] v_timestamp;
|
||||
/// <summary>for compatibility</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)] public byte[] v_asciilabel;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
|
||||
public byte[] v_asciilabel;
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
||||
struct dk_label8
|
||||
{
|
||||
/// <summary>for compatibility</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)] public byte[] dkl_asciilabel;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
|
||||
public byte[] dkl_asciilabel;
|
||||
/// <summary>vtoc inclusions from AT&T SVr4</summary>
|
||||
public dk_vtoc8 dkl_vtoc;
|
||||
/// <summary># sectors to skip, writes</summary>
|
||||
@@ -577,7 +593,8 @@ namespace DiscImageChef.Partitions
|
||||
/// <summary># sectors to skip, reads</summary>
|
||||
public ushort dkl_read_reinstruct;
|
||||
/// <summary>unused part of 512 bytes</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD8)] public byte[] dkl_pad;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD8)]
|
||||
public byte[] dkl_pad;
|
||||
/// <summary>rotations per minute</summary>
|
||||
public ushort dkl_rpm;
|
||||
/// <summary># physical cylinders</summary>
|
||||
@@ -603,7 +620,8 @@ namespace DiscImageChef.Partitions
|
||||
/// <summary>obsolete</summary>
|
||||
public ushort dkl_obs4;
|
||||
/// <summary>logical partition headers</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)] public dk_map[] dkl_map;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
|
||||
public dk_map[] dkl_map;
|
||||
/// <summary>identifies this label format</summary>
|
||||
public ushort dkl_magic;
|
||||
/// <summary>xor checksum of sector</summary>
|
||||
@@ -640,9 +658,11 @@ namespace DiscImageChef.Partitions
|
||||
/// <summary># sectors to skip, reads </summary>
|
||||
public ushort dkl_read_reinstruct;
|
||||
/// <summary>for compatible expansion</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)] public ushort[] dkl_extra;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
|
||||
public ushort[] dkl_extra;
|
||||
/// <summary>unused part of 512 bytes</summary>
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD16)] public byte[] dkl_pad;
|
||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD16)]
|
||||
public byte[] dkl_pad;
|
||||
/// <summary>identifies this label format</summary>
|
||||
public ushort dkl_magic;
|
||||
/// <summary>xor checksum of sector</summary>
|
||||
|
||||
Reference in New Issue
Block a user