* DiscImageChef.Partitions/Human68k.cs:

* DiscImageChef.Partitions/DiscImageChef.Partitions.csproj: Added Human68k partition table. * DiscImageChef.Partitions/RioKarma.cs: Corrected typo. * DiscImageChef.DiscImages/ZZZRawImage.cs: Detect X68000 SASI hard disks that use 256 bytes/sector. Correct size of ECMA-154 magnetoptical. * DiscImageChef.Partitions/PC98.cs: Correct handling of partition name, do not directly marshal as it may crash. Prevent false positives checking for sanity and partition type, so this limits it to FreeBSD right now. * DiscImageChef.Partitions/Acorn.cs: Do not try to read past device. * DiscImageChef.Helpers/BigEndianMarshal.cs: * DiscImageChef.Helpers/BigEndianStructure.cs: * DiscImageChef.Helpers/DiscImageChef.Helpers.csproj: Reworked big endian marshal. Does not traverse nested structures. * DiscImageChef.Partitions/SGI.cs: Corrected big endian marshaling, manually traversing nested structures. * DiscImageChef.Decoders/LisaTag.cs: Removed temporal variable. * DiscImageChef.Partitions/Sun.cs: Sun insists all devices must be 512 bytes/sector. Really. Even CDs. But this allows bigger ones.
2025-12-16 19:24:27 +00:00 · 2016-08-22 00:49:48 +01:00
parent 8a50d402c5
commit 1e2d0fa70c
16 changed files with 344 additions and 130 deletions
--- a/DiscImageChef.Partitions/Acorn.cs
+++ b/DiscImageChef.Partitions/Acorn.cs
@@ -86,6 +86,9 @@ namespace DiscImageChef.PartPlugins
            int secCyl = bootBlock.discRecords.spt * heads;
            int mapSector = bootBlock.startCylinder * secCyl;

+            if(mapSector >= (int)imagePlugin.GetSectors())
+                return false;
+
            byte[] map = imagePlugin.ReadSector((ulong)mapSector);

            ulong counter = 0;
--- a/DiscImageChef.Partitions/ChangeLog
+++ b/DiscImageChef.Partitions/ChangeLog
@@ -1,3 +1,24 @@
+2016-08-22  Natalia Portillo  <claunia@claunia.com>
+
+	* Human68k.cs:
+	* DiscImageChef.Partitions.csproj: Added Human68k partition
+	table.
+
+	* RioKarma.cs: Corrected typo.
+
+	* PC98.cs: Correct handling of partition name, do not directly
+	marshal as it may crash.
+	Prevent false positives checking for sanity and partition
+	type, so this limits it to FreeBSD right now.
+
+	* Acorn.cs: Do not try to read past device.
+
+	* SGI.cs: Corrected big endian marshaling, manually traversing
+	nested structures.
+
+	* Sun.cs: Sun insists all devices must be 512 bytes/sector.
+	Really. Even CDs. But this allows bigger ones.
+
 2016-08-21  Natalia Portillo  <claunia@claunia.com>

 	* Acorn.cs: Added support for Acorn FileCore partition, closes
--- a/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj
+++ b/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj
@@ -50,6 +50,7 @@
    <Compile Include="Acorn.cs" />
    <Compile Include="DragonFlyBSD.cs" />
    <Compile Include="UNIX.cs" />
+    <Compile Include="Human68k.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <ItemGroup>
--- a/DiscImageChef.Partitions/Human68k.cs
+++ b/DiscImageChef.Partitions/Human68k.cs
@@ -0,0 +1,138 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : Human68k.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+using DiscImageChef.CommonTypes;
+using DiscImageChef.Console;
+using DiscImageChef.ImagePlugins;
+
+namespace DiscImageChef.PartPlugins
+{
+    class Human68K : PartPlugin
+    {
+        const uint X68kMagic = 0x5836384B;
+
+        public Human68K()
+        {
+            Name = "Human 68k partitions";
+            PluginUUID = new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
+        }
+
+        public override bool GetInformation(ImagePlugin imagePlugin, out List<Partition> partitions)
+        {
+            partitions = new List<Partition>();
+
+            byte[] sector;
+            ulong sectsPerUnit = 0;
+
+            DicConsole.DebugWriteLine("Human68k plugin", "sectorSize = {0}", imagePlugin.GetSectorSize());
+
+            switch(imagePlugin.GetSectorSize())
+            {
+                case 256:
+                    sector = imagePlugin.ReadSector(4);
+                    sectsPerUnit = 1;
+                    break;
+                case 512:
+                    sector = imagePlugin.ReadSector(4);
+                    sectsPerUnit = 2;
+                    break;
+                case 1024:
+                    sector = imagePlugin.ReadSector(2);
+                    sectsPerUnit = 1;
+                    break;
+                default:
+                    return false;
+            }
+
+            X68kTable table = BigEndianMarshal.ByteArrayToStructureBigEndian<X68kTable>(sector);
+            for(int i = 0; i < table.entries.Length; i++)
+                table.entries[i] = BigEndianMarshal.SwapStructureMembersEndian(table.entries[i]);
+
+            DicConsole.DebugWriteLine("Human68k plugin", "table.signature = {0:X4}", table.magic);
+            DicConsole.DebugWriteLine("Human68k plugin", "table.size = {0:X4}", table.size);
+            DicConsole.DebugWriteLine("Human68k plugin", "table.size2 = {0:X4}", table.size2);
+            DicConsole.DebugWriteLine("Human68k plugin", "table.unknown = {0:X4}", table.unknown);
+
+            if(table.magic != X68kMagic)
+                return false;
+
+            ulong counter = 0;
+
+            foreach(X68kEntry entry in table.entries)
+            {
+                DicConsole.DebugWriteLine("Human68k plugin", "entry.name = {0}", StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)));
+                DicConsole.DebugWriteLine("Human68k plugin", "entry.stateStart = {0}", entry.stateStart);
+                DicConsole.DebugWriteLine("Human68k plugin", "entry.length = {0}", entry.length);
+                DicConsole.DebugWriteLine("Human68k plugin", "sectsPerUnit = {0} {1}", sectsPerUnit, imagePlugin.GetSectorSize());
+
+                Partition part = new Partition();
+                part.PartitionStartSector = (entry.stateStart & 0xFFFFFF) * sectsPerUnit;
+                part.PartitionStart = part.PartitionStartSector * (ulong)sector.Length;
+                part.PartitionSectors = entry.length * sectsPerUnit;
+                part.PartitionLength = part.PartitionSectors * (ulong)sector.Length;
+                part.PartitionType = StringHandlers.CToString(entry.name, Encoding.GetEncoding(932));
+                part.PartitionSequence = counter;
+                if(entry.length > 0)
+                {
+                    partitions.Add(part);
+                    counter++;
+                }
+            }
+
+            return true;
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        struct X68kTable
+        {
+            public uint magic;
+            public uint size;
+            public uint size2;
+            public uint unknown;
+            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+            public X68kEntry[] entries;
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        struct X68kEntry
+        {
+            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+            public byte[] name;
+            public uint stateStart;
+            public uint length;
+        }
+    }
+}
--- a/DiscImageChef.Partitions/PC98.cs
+++ b/DiscImageChef.Partitions/PC98.cs
@@ -33,6 +33,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using System.Text;
 using DiscImageChef.CommonTypes;
 using DiscImageChef.ImagePlugins;

@@ -81,15 +82,21 @@ namespace DiscImageChef.PartPlugins
                    part.PartitionSectors = CHStoLBA(entry.dp_ecyl, entry.dp_ehd, entry.dp_esect) - part.PartitionStartSector;
                    part.PartitionLength = part.PartitionSectors * imagePlugin.GetSectorSize();
                    part.PartitionType = string.Format("{0}", (entry.dp_sid << 8) | entry.dp_mid);
-                    part.PartitionName = entry.dp_name;
+                    part.PartitionName = StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932));
                    part.PartitionSequence = counter;

-                    partitions.Add(part);
-                    counter++;
+                    if((entry.dp_sid & 0x7F) == 0x44 &&
+                       (entry.dp_mid & 0x7F) == 0x14 &&
+                        part.PartitionStartSector < imagePlugin.ImageInfo.sectors &&
+                            part.PartitionSectors + part.PartitionStartSector <= imagePlugin.ImageInfo.sectors)
+                    {
+                        partitions.Add(part);
+                        counter++;
+                    }
                }
            }

-            return true;
+            return partitions.Count > 0;
        }

        static uint CHStoLBA(ushort cyl, byte head, byte sector)
@@ -123,7 +130,7 @@ namespace DiscImageChef.PartPlugins
            public byte dp_ehd;
            public ushort dp_ecyl;
            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public string dp_name;
+            public byte[] dp_name;
        }
    }
 }
--- a/DiscImageChef.Partitions/RioKarma.cs
+++ b/DiscImageChef.Partitions/RioKarma.cs
@@ -102,7 +102,7 @@ namespace DiscImageChef.PartPlugins
        [StructLayout(LayoutKind.Sequential, Pack = 1)]
        struct RioKarmaEntry
        {
-            public uint reserverd;
+            public uint reserved;
            public byte type;
            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
            public byte[] reserved2;
--- a/DiscImageChef.Partitions/SGI.cs
+++ b/DiscImageChef.Partitions/SGI.cs
@@ -34,7 +34,6 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using DiscImageChef.CommonTypes;
-using DiscImageChef.Helpers;
 using DiscImageChef.ImagePlugins;

 namespace DiscImageChef.PartPlugins
@@ -57,7 +56,11 @@ namespace DiscImageChef.PartPlugins
            if(sector.Length < 512)
                return false;

-            SGILabel disklabel = BigEndianStructure.ByteArrayToStructureBigEndian<SGILabel>(sector);
+            SGILabel disklabel = BigEndianMarshal.ByteArrayToStructureBigEndian<SGILabel>(sector);
+            for(int i = 0; i < disklabel.volume.Length; i++)
+                disklabel.volume[i] = BigEndianMarshal.SwapStructureMembersEndian(disklabel.volume[i]);
+            for(int i = 0; i < disklabel.partitions.Length; i++)
+                disklabel.partitions[i] = BigEndianMarshal.SwapStructureMembersEndian(disklabel.partitions[i]);

            if(disklabel.magic != SGI_MAGIC)
                return false;
--- a/DiscImageChef.Partitions/Sun.cs
+++ b/DiscImageChef.Partitions/Sun.cs
@@ -86,6 +86,9 @@ namespace DiscImageChef.PartPlugins
        {
            partitions = new List<CommonTypes.Partition>();

+            if(imagePlugin.GetSectorSize() < 512)
+                return false;
+
            byte[] sunSector = imagePlugin.ReadSector(0);
            byte[] tmpString;
            SunDiskLabel sdl = new SunDiskLabel();