Code refactor.

This commit is contained in:
2019-04-24 00:34:44 +01:00
parent 1b2f685b01
commit 3a28c96506
9 changed files with 235 additions and 265 deletions

View File

@@ -23,16 +23,17 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System;
using System.IO;
using System.Text;
using System.Linq;
using System.Text;
namespace Claunia.RsrcFork.CLI
{
class MainClass
{
public static void Main (string [] args)
public static void Main(string[] args)
{
Console.WriteLine("Claunia.RsrcFork.CLI");
Console.WriteLine("© 2016 Natalia Portillo");
@@ -68,20 +69,17 @@ namespace Claunia.RsrcFork.CLI
typeBytes = typeBytes.Reverse().ToArray();
string typeName = Types.GetName(type);
if(typeName != null)
Console.WriteLine("\"{0}\" (0x{1:X8}) - {2}", Encoding.ASCII.GetString(typeBytes), type, typeName);
else
Console.WriteLine("\"{0}\" (0x{1:X8})", Encoding.ASCII.GetString(typeBytes), type);
Console.WriteLine("\"{0}\" (0x{1:X8}) - {2}", Encoding.ASCII.GetString(typeBytes), type,
typeName);
else Console.WriteLine("\"{0}\" (0x{1:X8})", Encoding.ASCII.GetString(typeBytes), type);
Resource rez = rsrc.GetResource(type);
Console.WriteLine("{0,6}{1,8}\t{2}", "ID", "Length", "Name");
Console.WriteLine("{0,6}{1,8}\t{2}", "ID", "Length", "Name");
Console.WriteLine("{0,6}{1,8}--{2}", "------", "--------", "----------------");
foreach(short id in rez.GetIds())
{
if(rez.GetName(id) != null)
Console.WriteLine("{0,6}{1,8}\t\"{2}\"", id, rez.GetLength(id), rez.GetName(id));
else
Console.WriteLine("{0,6}{1,8}", id, rez.GetLength(id));
}
else Console.WriteLine("{0,6}{1,8}", id, rez.GetLength(id));
Console.WriteLine();
}
@@ -130,14 +128,15 @@ namespace Claunia.RsrcFork.CLI
Resource rez = rsrc.GetResource(type);
foreach(short id in rez.GetIds())
{
outStream = new FileStream(Path.Combine(args[2], Encoding.ASCII.GetString(typeBytes), string.Format("{0}", id)), FileMode.Create, FileAccess.ReadWrite);
outStream =
new
FileStream(Path.Combine(args[2], Encoding.ASCII.GetString(typeBytes), string.Format("{0}", id)),
FileMode.Create, FileAccess.ReadWrite);
byte[] rez_b = rez.GetResource(id);
outStream.Write(rez_b, 0, rez_b.Length);
outStream.Close();
}
}
return;
}
}
@@ -149,4 +148,4 @@ namespace Claunia.RsrcFork.CLI
Console.WriteLine("\tClaunia.RsrcFork.CLI.EXE -x -o output.dir resourcefork.bin - Extracts all resources to output.dir");
}
}
}
}

View File

@@ -23,30 +23,29 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System.Reflection;
using System.Runtime.CompilerServices;
// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
[assembly: AssemblyTitle ("Claunia.RsrcFork.CLI")]
[assembly: AssemblyDescription ("")]
[assembly: AssemblyConfiguration ("")]
[assembly: AssemblyCompany ("Claunia.com")]
[assembly: AssemblyProduct ("")]
[assembly: AssemblyCopyright ("© Claunia.com")]
[assembly: AssemblyTrademark ("")]
[assembly: AssemblyCulture ("")]
[assembly: AssemblyTitle("Claunia.RsrcFork.CLI")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Claunia.com")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("© Claunia.com")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion ("1.0.*")]
[assembly: AssemblyVersion("1.0.*")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]
//[assembly: AssemblyKeyFile("")]

View File

@@ -33,15 +33,19 @@ namespace Claunia.RsrcFork.Test
[TestFixture]
public class Test
{
readonly byte[] DC42_Vers = { 0x06, 0x40, 0x80, 0x00, 0x00, 0x00, 0x09, 0x44, 0x69, 0x73, 0x6B, 0x20, 0x43, 0x6F, 0x70, 0x79, 0x1C, 0x34, 0x2E, 0x32, 0x2C,
0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x73, 0x75, 0x6D, 0x3D, 0x24, 0x41, 0x35, 0x31, 0x34, 0x37, 0x46, 0x37, 0x45 };
readonly byte[] DC42_Str = { 0x09, 0x44, 0x69, 0x73, 0x6B, 0x20, 0x43, 0x6F, 0x70, 0x79 };
readonly byte[] DC42_Vers =
{
0x06, 0x40, 0x80, 0x00, 0x00, 0x00, 0x09, 0x44, 0x69, 0x73, 0x6B, 0x20, 0x43, 0x6F, 0x70, 0x79, 0x1C,
0x34, 0x2E, 0x32, 0x2C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x73, 0x75,
0x6D, 0x3D, 0x24, 0x41, 0x35, 0x31, 0x34, 0x37, 0x46, 0x37, 0x45
};
readonly byte[] DC42_Str = {0x09, 0x44, 0x69, 0x73, 0x6B, 0x20, 0x43, 0x6F, 0x70, 0x79};
[Test]
public void TestDC42()
{
FileStream dc42Stream = new FileStream("Samples/DiskCopy42.rsrc", FileMode.Open, FileAccess.Read);
ResourceFork rsrc = new ResourceFork(dc42Stream);
FileStream dc42Stream = new FileStream("Samples/DiskCopy42.rsrc", FileMode.Open, FileAccess.Read);
ResourceFork rsrc = new ResourceFork(dc42Stream);
uint[] types = rsrc.GetTypes();
Assert.AreEqual(0x53545220, types[0]);
@@ -52,7 +56,7 @@ namespace Claunia.RsrcFork.Test
short[] str_Ids = str_.GetIds();
Assert.AreEqual(-16396, str_Ids[0]);
Assert.AreEqual(10, str_.GetLength(-16396));
Assert.AreEqual(10, str_.GetLength(-16396));
byte[] str1 = str_.GetResource(-16396);
Assert.AreEqual(DC42_Str, str1);
@@ -63,7 +67,7 @@ namespace Claunia.RsrcFork.Test
Resource vers = rsrc.GetResource(0x76657273);
Assert.IsNotNull(vers);
short[] versIds = vers.GetIds();
Assert.AreEqual(1, versIds[0]);
Assert.AreEqual(1, versIds[0]);
Assert.AreEqual(45, vers.GetLength(1));
byte[] vers1 = vers.GetResource(1);
@@ -73,20 +77,20 @@ namespace Claunia.RsrcFork.Test
Assert.IsNull(versStr);
Version versDec = new Version(vers1);
Assert.AreEqual(6, versDec.MajorVersion);
Assert.AreEqual(40, versDec.MinorVersion);
Assert.AreEqual(6, versDec.MajorVersion);
Assert.AreEqual(40, versDec.MinorVersion);
Assert.AreEqual(Version.DevelopmentStage.Final, versDec.DevStage);
Assert.AreEqual(0, versDec.PreReleaseVersion);
Assert.AreEqual(0, versDec.RegionCode);
Assert.AreEqual("Disk Copy", versDec.VersionString);
Assert.AreEqual(0, versDec.PreReleaseVersion);
Assert.AreEqual(0, versDec.RegionCode);
Assert.AreEqual("Disk Copy", versDec.VersionString);
Assert.AreEqual("4.2, data checksum=$A5147F7E", versDec.VersionMessage);
}
[Test]
public void TestDC6()
{
FileStream dc6Stream = new FileStream("Samples/DiskCopy6.rsrc", FileMode.Open, FileAccess.Read);
ResourceFork rsrc = new ResourceFork(dc6Stream);
FileStream dc6Stream = new FileStream("Samples/DiskCopy6.rsrc", FileMode.Open, FileAccess.Read);
ResourceFork rsrc = new ResourceFork(dc6Stream);
uint[] types = rsrc.GetTypes();
Assert.AreEqual(0x53545220, types[0]);
@@ -99,7 +103,7 @@ namespace Claunia.RsrcFork.Test
short[] str_Ids = str_.GetIds();
Assert.AreEqual(-16396, str_Ids[0]);
Assert.AreEqual(10, str_.GetLength(-16396));
Assert.AreEqual(10, str_.GetLength(-16396));
byte[] str1 = str_.GetResource(-16396);
Assert.AreEqual(DC42_Str, str1);
@@ -110,7 +114,7 @@ namespace Claunia.RsrcFork.Test
Resource vers = rsrc.GetResource(0x76657273);
Assert.IsNotNull(vers);
short[] versIds = vers.GetIds();
Assert.AreEqual(1, versIds[0]);
Assert.AreEqual(1, versIds[0]);
Assert.AreEqual(66, vers.GetLength(1));
string versStr = vers.GetName(1);
@@ -132,25 +136,25 @@ namespace Claunia.RsrcFork.Test
string bceSStr = bceS.GetName(128);
Assert.IsNull(bceSStr);
byte[] vers1 = vers.GetResource(1);
byte[] vers1 = vers.GetResource(1);
Version versDec = new Version(vers1);
Assert.AreEqual(6, versDec.MajorVersion);
Assert.AreEqual(40, versDec.MinorVersion);
Assert.AreEqual(Version.DevelopmentStage.Final, versDec.DevStage);
Assert.AreEqual(0, versDec.PreReleaseVersion);
Assert.AreEqual(0, versDec.RegionCode);
Assert.AreEqual("6.4 Disk Copy", versDec.VersionString);
Assert.AreEqual(6, versDec.MajorVersion);
Assert.AreEqual(40, versDec.MinorVersion);
Assert.AreEqual(Version.DevelopmentStage.Final, versDec.DevStage);
Assert.AreEqual(0, versDec.PreReleaseVersion);
Assert.AreEqual(0, versDec.RegionCode);
Assert.AreEqual("6.4 Disk Copy", versDec.VersionString);
Assert.AreEqual("Mac? OS HFS 1680K disk image\rCRC28: $07213FB7", versDec.VersionMessage);
}
[Test]
public void TestSMI()
{
FileStream smiStream = new FileStream("Samples/SelfMountingImage.rsrc", FileMode.Open, FileAccess.Read);
ResourceFork rsrc = new ResourceFork(smiStream);
FileStream smiStream = new FileStream("Samples/SelfMountingImage.rsrc", FileMode.Open, FileAccess.Read);
ResourceFork rsrc = new ResourceFork(smiStream);
uint[] types = rsrc.GetTypes();
Assert.AreEqual(29, types.Length);
Assert.AreEqual(29, types.Length);
Assert.AreEqual(0x424E444C, types[0]);
Assert.AreEqual(0x434F4445, types[1]);
Assert.AreEqual(0x44415441, types[2]);
@@ -166,8 +170,8 @@ namespace Claunia.RsrcFork.Test
Resource code = rsrc.GetResource(0x434F4445);
Assert.IsNotNull(code);
short[] codeIds = code.GetIds();
Assert.AreEqual(0, codeIds[0]);
Assert.AreEqual(1, codeIds[1]);
Assert.AreEqual(0, codeIds[0]);
Assert.AreEqual(1, codeIds[1]);
Assert.AreEqual(35130, code.GetLength(1));
string codeStr = code.GetName(1);
Assert.AreEqual("First Segment", codeStr); //"First Segment"
@@ -176,38 +180,38 @@ namespace Claunia.RsrcFork.Test
Assert.IsNotNull(bndl);
short[] bndlIds = bndl.GetIds();
Assert.AreEqual(128, bndlIds[0]);
Assert.AreEqual(28, bndl.GetLength(128));
Assert.AreEqual(28, bndl.GetLength(128));
string bndlStr = bndl.GetName(128);
Assert.IsNull(bndlStr);
Resource vers = rsrc.GetResource(0x76657273);
Assert.IsNotNull(vers);
byte[] vers1 = vers.GetResource(1);
byte[] vers1 = vers.GetResource(1);
Version versDec = new Version(vers1);
Assert.AreEqual(1, versDec.MajorVersion);
Assert.AreEqual(10, versDec.MinorVersion);
Assert.AreEqual(Version.DevelopmentStage.Beta, versDec.DevStage);
Assert.AreEqual(6, versDec.PreReleaseVersion);
Assert.AreEqual(0, versDec.RegionCode);
Assert.AreEqual("1.1b6", versDec.VersionString);
Assert.AreEqual(1, versDec.MajorVersion);
Assert.AreEqual(10, versDec.MinorVersion);
Assert.AreEqual(Version.DevelopmentStage.Beta, versDec.DevStage);
Assert.AreEqual(6, versDec.PreReleaseVersion);
Assert.AreEqual(0, versDec.RegionCode);
Assert.AreEqual("1.1b6", versDec.VersionString);
Assert.AreEqual("1.1b6, Copyright 1997-2001 Apple Computer, Inc.", versDec.VersionMessage);
}
[Test]
public void TestUDIF()
{
FileStream udifStream = new FileStream("Samples/UDIF.rsrc", FileMode.Open, FileAccess.Read);
ResourceFork rsrc = new ResourceFork(udifStream);
FileStream udifStream = new FileStream("Samples/UDIF.rsrc", FileMode.Open, FileAccess.Read);
ResourceFork rsrc = new ResourceFork(udifStream);
uint[] types = rsrc.GetTypes();
Assert.AreEqual(2, types.Length);
Assert.AreEqual(2, types.Length);
Assert.AreEqual(0x626C6B78, types[0]);
Assert.AreEqual(0x706C7374, types[1]);
Resource blkx = rsrc.GetResource(0x626C6B78);
Assert.IsNotNull(blkx);
short[] blkxIds = blkx.GetIds();
Assert.AreEqual(0, blkxIds[0]);
Assert.AreEqual(0, blkxIds[0]);
Assert.AreEqual(524, blkx.GetLength(0));
string blkxStr = blkx.GetName(0);
Assert.AreEqual("Whole Device (Apple_XXX : 0)", blkxStr); //"First Segment"
@@ -215,7 +219,7 @@ namespace Claunia.RsrcFork.Test
Resource plst = rsrc.GetResource(0x706C7374);
Assert.IsNotNull(plst);
short[] plstIds = plst.GetIds();
Assert.AreEqual(0, plstIds[0]);
Assert.AreEqual(0, plstIds[0]);
Assert.AreEqual(1544, plst.GetLength(0));
string plstStr = plst.GetName(0);
Assert.IsNull(plstStr);
@@ -224,5 +228,4 @@ namespace Claunia.RsrcFork.Test
Assert.IsNull(vers);
}
}
}
}

View File

@@ -23,51 +23,48 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System;
using System.Text;
namespace Claunia.RsrcFork
{
/// <summary>
/// Contains convertes between .NET and Pascal strings. Only ASCII supported right now.
/// Contains convertes between .NET and Pascal strings. Only ASCII supported right now.
/// </summary>
public static class PascalString
{
/// <summary>
/// Converts an ASCII Pascal string to a .NET string.
/// Converts an ASCII Pascal string to a .NET string.
/// </summary>
/// <returns>The .NET string.</returns>
/// <param name="PStr">The ASCII Pascal string.</param>
public static string GetString(byte[] PStr)
{
if(PStr == null || PStr[0] >= PStr.Length)
return null;
if(PStr == null || PStr[0] >= PStr.Length) return null;
return Encoding.ASCII.GetString(PStr, 1, PStr[0]);
}
/// <summary>
/// Converts a .NET string to an ASCII Pascal string.
/// Converts a .NET string to an ASCII Pascal string.
/// </summary>
/// <returns>The ASCII Pascal string.</returns>
/// <param name="str">The .NET string.</param>
public static byte[] GetBytes(string str)
{
if(str == null)
return new byte[1];
if(str == null) return new byte[1];
byte[] str_b = Encoding.ASCII.GetBytes(str);
byte[] PStr;
if(str_b.Length >= 256)
PStr = new byte[256];
else
PStr = new byte[str_b.Length + 1];
if(str_b.Length >= 256) PStr = new byte[256];
else PStr = new byte[str_b.Length + 1];
Array.Copy(str_b, 0, PStr, 1, PStr.Length - 1);
PStr[0] = (byte)(PStr.Length - 1);
PStr[0] = (byte)(PStr.Length - 1);
return PStr;
}
}
}
}

View File

@@ -33,24 +33,18 @@ using System.Text;
namespace Claunia.RsrcFork
{
/// <summary>
/// This class represents a resource type.
/// This class represents a resource type.
/// </summary>
public class Resource
{
readonly Dictionary<short, string> resourceNames;
readonly List<short> ids;
readonly Dictionary<short, byte[]> resourceCache;
readonly Dictionary<short, string> resourceNames;
readonly Dictionary<short, ResourceData> resources;
readonly Dictionary<short, byte[]> resourceCache;
readonly Stream rsrcStream;
readonly List<short> ids;
struct ResourceData
{
public long offset;
public long length;
}
readonly Stream rsrcStream;
/// <summary>
/// Initializates the specified resource type.
/// Initializates the specified resource type.
/// </summary>
/// <param name="stream">Stream where the resources of this reside.</param>
/// <param name="resources">How many resource of this type are.</param>
@@ -58,13 +52,15 @@ namespace Claunia.RsrcFork
/// <param name="resourceNameOffset">Offset from start of stream to resource name list.</param>
/// <param name="resourceDataOffset">Offset from start of stream to resource data.</param>
/// <param name="OSType">Resource type.</param>
internal Resource(Stream stream, ushort resources, long referenceListOff, long resourceNameOffset, long resourceDataOffset, uint OSType)
internal Resource(Stream stream, ushort resources, long referenceListOff, long resourceNameOffset,
long resourceDataOffset, uint OSType)
{
rsrcStream = stream;
Dictionary<short, ResourceTypeReferenceListItem> referenceLists = new Dictionary<short, ResourceTypeReferenceListItem>();
resourceNames = new Dictionary<short, string>();
Dictionary<short, ResourceTypeReferenceListItem> referenceLists =
new Dictionary<short, ResourceTypeReferenceListItem>();
resourceNames = new Dictionary<short, string>();
this.resources = new Dictionary<short, ResourceData>();
ids = new List<short>();
ids = new List<short>();
byte[] tmp;
rsrcStream.Seek(referenceListOff + 2, SeekOrigin.Begin);
@@ -76,11 +72,11 @@ namespace Claunia.RsrcFork
item.id = BitConverter.ToInt16(tmp.Reverse().ToArray(), 0);
rsrcStream.Read(tmp, 0, 2);
item.nameOff = BitConverter.ToInt16(tmp.Reverse().ToArray(), 0);
tmp = new byte[4];
tmp = new byte[4];
rsrcStream.Read(tmp, 0, 4);
item.attributes = tmp[0];
tmp[0] = 0;
item.dataOff = BitConverter.ToInt32(tmp.Reverse().ToArray(), 0);
tmp[0] = 0;
item.dataOff = BitConverter.ToInt32(tmp.Reverse().ToArray(), 0);
rsrcStream.Read(tmp, 0, 4);
item.handle = BitConverter.ToUInt32(tmp.Reverse().ToArray(), 0);
@@ -90,15 +86,14 @@ namespace Claunia.RsrcFork
foreach(ResourceTypeReferenceListItem item in referenceLists.Values)
{
string name;
string name;
ResourceData data = new ResourceData();
if(item.nameOff == -1)
name = null;
if(item.nameOff == -1) name = null;
else
{
rsrcStream.Seek(resourceNameOffset + item.nameOff, SeekOrigin.Begin);
byte nameLen = (byte)rsrcStream.ReadByte();
byte nameLen = (byte)rsrcStream.ReadByte();
byte[] nameBytes = new byte[nameLen];
rsrcStream.Read(nameBytes, 0, nameLen);
// TODO: Use MacRoman
@@ -119,7 +114,7 @@ namespace Claunia.RsrcFork
}
/// <summary>
/// Gets the name of the specified resource id, or null if there is no name.
/// Gets the name of the specified resource id, or null if there is no name.
/// </summary>
/// <returns>The name.</returns>
/// <param name="id">Identifier.</param>
@@ -130,7 +125,7 @@ namespace Claunia.RsrcFork
}
/// <summary>
/// Gets the resource contents.
/// Gets the resource contents.
/// </summary>
/// <returns>The resource.</returns>
/// <param name="id">Identifier.</param>
@@ -138,13 +133,11 @@ namespace Claunia.RsrcFork
{
byte[] resource;
if(resourceCache.TryGetValue(id, out resource))
return resource;
if(resourceCache.TryGetValue(id, out resource)) return resource;
ResourceData data;
if(!resources.TryGetValue(id, out data))
return null;
if(!resources.TryGetValue(id, out data)) return null;
resource = new byte[data.length];
rsrcStream.Seek(data.offset, SeekOrigin.Begin);
@@ -156,7 +149,7 @@ namespace Claunia.RsrcFork
}
/// <summary>
/// Gets the length of the resource specified by ID.
/// Gets the length of the resource specified by ID.
/// </summary>
/// <returns>The length.</returns>
/// <param name="id">Resource identifier.</param>
@@ -167,23 +160,22 @@ namespace Claunia.RsrcFork
}
/// <summary>
/// Gets the IDs of all the resources contained by this instance.
/// Gets the IDs of all the resources contained by this instance.
/// </summary>
/// <returns>The identifiers.</returns>
public short[] GetIds()
{
return ids.ToArray();
}
public short[] GetIds() => ids.ToArray();
/// <summary>
/// Checks if the resource specified by ID is contained by this instance.
/// Checks if the resource specified by ID is contained by this instance.
/// </summary>
/// <returns><c>true</c>, if the resource is contained in this instance, <c>false</c> otherwise.</returns>
/// <param name="id">Resource identifier.</param>
public bool ContainsId(short id)
public bool ContainsId(short id) => ids.Contains(id);
struct ResourceData
{
return ids.Contains(id);
public long offset;
public long length;
}
}
}
}

View File

@@ -31,19 +31,19 @@ using System.Linq;
namespace Claunia.RsrcFork
{
/// <summary>
/// This class represents a resource fork.
/// This class represents a resource fork.
/// </summary>
public class ResourceFork
{
Stream rsrcStream;
ResourceHeader header;
ResourceMap map;
ResourceHeader header;
ResourceMap map;
List<uint> osTypes;
Dictionary<uint, Resource> resourceCache;
Dictionary<uint, ResourceTypeListItem> resourceTypeList;
Dictionary<uint, Resource> resourceCache;
List<uint> osTypes;
readonly Stream rsrcStream;
/// <summary>
/// Initializates a resource fork using a byte array as backend.
/// Initializates a resource fork using a byte array as backend.
/// </summary>
/// <param name="buffer">Buffer.</param>
public ResourceFork(byte[] buffer)
@@ -53,7 +53,7 @@ namespace Claunia.RsrcFork
}
/// <summary>
/// Initializates a resource fork using a stream as backed.
/// Initializates a resource fork using a stream as backed.
/// </summary>
/// <param name="stream">Stream.</param>
public ResourceFork(Stream stream)
@@ -63,16 +63,15 @@ namespace Claunia.RsrcFork
}
/// <summary>
/// Cleans up this instances and closes the underlying stream.
/// Cleans up this instances and closes the underlying stream.
/// </summary>
~ResourceFork()
{
if(rsrcStream != null)
rsrcStream.Dispose();
if(rsrcStream != null) rsrcStream.Dispose();
}
/// <summary>
/// Initializes this instance.
/// Initializes this instance.
/// </summary>
void Init()
{
@@ -88,14 +87,14 @@ namespace Claunia.RsrcFork
rsrcStream.Read(tmp, 0, 4);
header.resourceMapLen = BitConverter.ToInt32(tmp.Reverse().ToArray(), 0);
if(header.resourceDataOff <= 0 || header.resourceMapOff <= 0 || header.resourceDataLen <= 0 || header.resourceMapLen <= 0)
throw new InvalidCastException("Not a resource fork");
if(header.resourceDataOff <= 0 || header.resourceMapOff <= 0 || header.resourceDataLen <= 0 ||
header.resourceMapLen <= 0) throw new InvalidCastException("Not a resource fork");
if(header.resourceDataOff + header.resourceDataLen > rsrcStream.Length ||
header.resourceMapOff + header.resourceMapLen > rsrcStream.Length)
header.resourceMapOff + header.resourceMapLen > rsrcStream.Length)
throw new InvalidCastException("Not a resource fork");
map = new ResourceMap();
map = new ResourceMap();
map.header = new ResourceHeader();
rsrcStream.Seek(header.resourceMapOff, SeekOrigin.Begin);
rsrcStream.Read(tmp, 0, 4);
@@ -109,13 +108,13 @@ namespace Claunia.RsrcFork
if(map.header.resourceDataOff != header.resourceDataOff ||
map.header.resourceDataLen != header.resourceDataLen ||
map.header.resourceMapOff != header.resourceMapOff ||
map.header.resourceMapLen != header.resourceMapLen)
map.header.resourceMapOff != header.resourceMapOff ||
map.header.resourceMapLen != header.resourceMapLen)
throw new InvalidCastException("Header copy is not same as header.");
rsrcStream.Read(tmp, 0, 4);
map.handleToNextMap = BitConverter.ToUInt32(tmp.Reverse().ToArray(), 0);
tmp = new byte[2];
tmp = new byte[2];
rsrcStream.Read(tmp, 0, 2);
map.fileRefNo = BitConverter.ToUInt16(tmp.Reverse().ToArray(), 0);
rsrcStream.Read(tmp, 0, 2);
@@ -132,14 +131,15 @@ namespace Claunia.RsrcFork
map.numberOfTypes = BitConverter.ToUInt16(tmp.Reverse().ToArray(), 0);
resourceTypeList = new Dictionary<uint, ResourceTypeListItem>();
osTypes = new List<uint>();
osTypes = new List<uint>();
for(int i = 0; i <= map.numberOfTypes; i++) {
for(int i = 0; i <= map.numberOfTypes; i++)
{
ResourceTypeListItem typeList = new ResourceTypeListItem();
tmp = new byte[4];
rsrcStream.Read(tmp, 0, 4);
typeList.type = BitConverter.ToUInt32(tmp.Reverse().ToArray(), 0);
tmp = new byte[2];
tmp = new byte[2];
rsrcStream.Read(tmp, 0, 2);
typeList.resources = BitConverter.ToUInt16(tmp.Reverse().ToArray(), 0);
rsrcStream.Read(tmp, 0, 2);
@@ -153,7 +153,7 @@ namespace Claunia.RsrcFork
}
/// <summary>
/// Gets the resources with indicated type
/// Gets the resources with indicated type
/// </summary>
/// <returns>The resource.</returns>
/// <param name="OSType">OSType.</param>
@@ -161,14 +161,15 @@ namespace Claunia.RsrcFork
{
Resource rsrc;
if(resourceCache.TryGetValue(OSType, out rsrc))
return rsrc;
if(resourceCache.TryGetValue(OSType, out rsrc)) return rsrc;
ResourceTypeListItem typeList;
if(!resourceTypeList.TryGetValue(OSType, out typeList))
return null;
if(!resourceTypeList.TryGetValue(OSType, out typeList)) return null;
rsrc = new Resource(rsrcStream, (ushort)(typeList.resources + 1), header.resourceMapOff + map.typeListOff + typeList.referenceOff - 2, header.resourceMapOff + map.nameListOff, header.resourceDataOff, OSType);
rsrc = new Resource(rsrcStream, (ushort)(typeList.resources + 1),
header.resourceMapOff + map.typeListOff + typeList.referenceOff - 2,
header.resourceMapOff + map.nameListOff,
header.resourceDataOff, OSType);
resourceCache.Add(OSType, rsrc);
@@ -176,22 +177,15 @@ namespace Claunia.RsrcFork
}
/// <summary>
/// Gets all OSTypes stored in this resource fork
/// Gets all OSTypes stored in this resource fork
/// </summary>
/// <returns>The types.</returns>
public uint[] GetTypes()
{
return osTypes.ToArray();
}
public uint[] GetTypes() => osTypes.ToArray();
/// <summary>
/// Returns true if the specified OSType is present in this resource fork.
/// Returns true if the specified OSType is present in this resource fork.
/// </summary>
/// <param name="OSType">OSType.</param>
public bool ContainsKey(uint OSType)
{
return resourceTypeList.ContainsKey(OSType);
}
public bool ContainsKey(uint OSType) => resourceTypeList.ContainsKey(OSType);
}
}
}

View File

@@ -31,68 +31,35 @@ using Claunia.RsrcFork;
namespace Resources
{
/// <summary>
/// This class handles the "VERS" resource fork
/// This class handles the "VERS" resource fork
/// </summary>
public class Version
{
static uint ostype = 0x76657273;
#region On-disk structure
/// <summary>
/// Major version.
/// </summary>
public byte MajorVersion;
/// <summary>
/// Minor version.
/// </summary>
public byte MinorVersion;
/// <summary>
/// Development stage.
/// </summary>
public DevelopmentStage DevStage;
/// <summary>
/// Pre-release version.
/// </summary>
public byte PreReleaseVersion;
/// <summary>
/// Region code.
/// </summary>
public ushort RegionCode;
/// <summary>
/// Version string.
/// </summary>
public string VersionString;
/// <summary>
/// Version message.
/// </summary>
public string VersionMessage;
#endregion
/// <summary>
/// Known development stages
/// Known development stages
/// </summary>
public enum DevelopmentStage : byte
{
/// <summary>
/// Pre-alpha.
/// Pre-alpha.
/// </summary>
PreAlpha = 0x20,
/// <summary>
/// Alpha.
/// Alpha.
/// </summary>
Alpha = 0x40,
/// <summary>
/// Beta.
/// Beta.
/// </summary>
Beta = 0x60,
/// <summary>
/// Final release.
/// Final release.
/// </summary>
Final = 0x80
}
/// <summary>
/// Initializes a new instance of the <see cref="T:Resources.Version"/> class.
/// Initializes a new instance of the <see cref="T:Resources.Version" /> class.
/// </summary>
/// <param name="resource">Byte array containing the "VERS" resource.</param>
public Version(byte[] resource)
@@ -101,30 +68,36 @@ namespace Resources
tmpShort = new byte[2];
MajorVersion = BCDToNumber(resource[0]);
MinorVersion = BCDToNumber(resource[1]);
DevStage = (DevelopmentStage)resource[2];
MajorVersion = BCDToNumber(resource[0]);
MinorVersion = BCDToNumber(resource[1]);
DevStage = (DevelopmentStage)resource[2];
PreReleaseVersion = BCDToNumber(resource[3]);
Array.Copy(resource, 4, tmpShort, 0, 2);
RegionCode = BitConverter.ToUInt16(tmpShort.Reverse().ToArray(), 0);
tmpStr = new byte[resource[6] + 1];
tmpStr = new byte[resource[6] + 1];
Array.Copy(resource, 6, tmpStr, 0, tmpStr.Length);
VersionString = PascalString.GetString(tmpStr);
tmpMsg = new byte[resource[6 + tmpStr.Length] + 1];
tmpMsg = new byte[resource[6 + tmpStr.Length] + 1];
Array.Copy(resource, 6 + tmpStr.Length, tmpMsg, 0, tmpMsg.Length);
VersionMessage = PascalString.GetString(tmpMsg);
}
/// <summary>
/// Gets a byte array with the "VERS" resource contained by this instance.
/// Gets the OSTYPE of this resource.
/// </summary>
/// <value>The OSTYPE.</value>
public static uint OSType { get; } = 0x76657273;
/// <summary>
/// Gets a byte array with the "VERS" resource contained by this instance.
/// </summary>
/// <returns>The "VERS" resource.</returns>
public byte[] GetBytes()
{
byte[] tmpShort, tmpStr, tmpMsg;
tmpShort = BitConverter.GetBytes(RegionCode).Reverse().ToArray();
tmpStr = PascalString.GetBytes(VersionString);
tmpMsg = PascalString.GetBytes(VersionMessage);
tmpStr = PascalString.GetBytes(VersionString);
tmpMsg = PascalString.GetBytes(VersionMessage);
byte[] vers = new byte[6 + tmpStr.Length + tmpMsg.Length];
@@ -132,35 +105,51 @@ namespace Resources
vers[1] = NumberToBCD(MinorVersion);
vers[2] = (byte)DevStage;
vers[3] = NumberToBCD(PreReleaseVersion);
Array.Copy(tmpShort, 0, vers, 4, 2);
Array.Copy(tmpStr, 0, vers, 6, tmpStr.Length);
Array.Copy(tmpMsg, 0, vers, 6 + tmpStr.Length, tmpMsg.Length);
Array.Copy(tmpShort, 0, vers, 4, 2);
Array.Copy(tmpStr, 0, vers, 6, tmpStr.Length);
Array.Copy(tmpMsg, 0, vers, 6 + tmpStr.Length, tmpMsg.Length);
return vers;
}
/// <summary>
/// Gets the OSTYPE of this resource.
/// </summary>
/// <value>The OSTYPE.</value>
public static uint OSType {
get {
return ostype;
}
}
byte BCDToNumber(byte bcd)
{
return Convert.ToByte(string.Format("{0:X2}", bcd), 10);
}
byte BCDToNumber(byte bcd) => Convert.ToByte(string.Format("{0:X2}", bcd), 10);
byte NumberToBCD(byte number)
{
if(number >= 100)
number = 99;
if(number >= 100) number = 99;
return Convert.ToByte(string.Format("{0:D2}", number), 16);
}
}
}
#region On-disk structure
/// <summary>
/// Major version.
/// </summary>
public byte MajorVersion;
/// <summary>
/// Minor version.
/// </summary>
public byte MinorVersion;
/// <summary>
/// Development stage.
/// </summary>
public DevelopmentStage DevStage;
/// <summary>
/// Pre-release version.
/// </summary>
public byte PreReleaseVersion;
/// <summary>
/// Region code.
/// </summary>
public ushort RegionCode;
/// <summary>
/// Version string.
/// </summary>
public string VersionString;
/// <summary>
/// Version message.
/// </summary>
public string VersionMessage;
#endregion
}
}

View File

@@ -29,19 +29,19 @@ namespace Claunia.RsrcFork
struct ResourceHeader
{
/// <summary>
/// Offset from start of resource fork to resource data
/// Offset from start of resource fork to resource data
/// </summary>
public int resourceDataOff;
/// <summary>
/// Offset from start of resource fork to resource map
/// Offset from start of resource fork to resource map
/// </summary>
public int resourceMapOff;
/// <summary>
/// Length of resource data
/// Length of resource data
/// </summary>
public int resourceDataLen;
/// <summary>
/// Length of resource map
/// Length of resource map
/// </summary>
public int resourceMapLen;
}
@@ -49,31 +49,31 @@ namespace Claunia.RsrcFork
struct ResourceMap
{
/// <summary>
/// Copy of the resource fork header
/// Copy of the resource fork header
/// </summary>
public ResourceHeader header;
/// <summary>
/// Reserved for handle to next resource map
/// Reserved for handle to next resource map
/// </summary>
public uint handleToNextMap;
/// <summary>
/// Reserved for file reference number
/// Reserved for file reference number
/// </summary>
public ushort fileRefNo;
/// <summary>
/// Resource fork attributes
/// Resource fork attributes
/// </summary>
public ushort attributes;
/// <summary>
/// Offset from start of resource map to resource type list
/// Offset from start of resource map to resource type list
/// </summary>
public short typeListOff;
/// <summary>
/// Offset from start of resource map to resource name list
/// Offset from start of resource map to resource name list
/// </summary>
public short nameListOff;
/// <summary>
/// Number of types in the map minus 1
/// Number of types in the map minus 1
/// </summary>
public ushort numberOfTypes;
}
@@ -81,15 +81,15 @@ namespace Claunia.RsrcFork
struct ResourceTypeListItem
{
/// <summary>
/// Resource type
/// Resource type
/// </summary>
public uint type;
/// <summary>
/// Number of resources of this type minus 1
/// Number of resources of this type minus 1
/// </summary>
public ushort resources;
/// <summary>
/// Offset from beginning of resource type list to reference list
/// Offset from beginning of resource type list to reference list
/// </summary>
public short referenceOff;
}
@@ -97,25 +97,24 @@ namespace Claunia.RsrcFork
struct ResourceTypeReferenceListItem
{
/// <summary>
/// Resource ID
/// Resource ID
/// </summary>
public short id;
/// <summary>
/// Offset from beginning of resource name list to resource name. -1 if it does not have a name
/// Offset from beginning of resource name list to resource name. -1 if it does not have a name
/// </summary>
public short nameOff;
/// <summary>
/// Resource attributes
/// Resource attributes
/// </summary>
public byte attributes;
/// <summary>
/// Offset from beginning of resource data to resource. First byte is <see cref="attributes"/>.
/// Offset from beginning of resource data to resource. First byte is <see cref="attributes" />.
/// </summary>
public int dataOff;
/// <summary>
/// Reserved for handle to resource
/// Reserved for handle to resource
/// </summary>
public uint handle;
}
}
}

View File

@@ -25,24 +25,25 @@
// THE SOFTWARE.
using System;
using System.Text;
using System.Linq;
using System.Text;
namespace Claunia.RsrcFork
{
/// <summary>
/// This class contains static methods for OSTYPE handling.
/// This class contains static methods for OSTYPE handling.
/// </summary>
public static class Types
{
/// <summary>
/// Gets a descriptive name of a resource from its OSTYPE.
/// Gets a descriptive name of a resource from its OSTYPE.
/// </summary>
/// <returns>The name corresponding to the specified OSTYPE.</returns>
/// <param name="OSType">The OSTYPE.</param>
public static string GetName(uint OSType)
{
switch(OSType) {
switch(OSType)
{
case 0x2E58534C: // ".XSL"
return "XML style sheet";
case 0x33444D46: // "3DMF"
@@ -683,26 +684,23 @@ namespace Claunia.RsrcFork
return "MC680x0 Code";
case 0x5F505043: // "_PPC"
return "PowerPC Code";
default:
return null;
default: return null;
}
}
/// <summary>
/// Gets a descriptive name of a resource from its OSTYPE.
/// Gets a descriptive name of a resource from its OSTYPE.
/// </summary>
/// <returns>The name corresponding to the specified OSTYPE.</returns>
/// <param name="OSType">The OSTYPE.</param>
public static string GetName(string OSType)
{
if(OSType.Length != 4)
return null;
if(OSType.Length != 4) return null;
byte[] typB = Encoding.ASCII.GetBytes(OSType);
uint type = BitConverter.ToUInt32(typB.Reverse().ToArray(), 0);
uint type = BitConverter.ToUInt32(typB.Reverse().ToArray(), 0);
return GetName(type);
}
}
}
}