The-Homebrew-Cloud
/
dsdecmp
mirror of https://github.com/Barubary/dsdecmp.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

C#: the composite formats that were added in r48 should now be supported by the program. Not yet tested though. 

Added support for the 'NULL' compression format; a built-in Nitro format that only contains plaintext (but includes the nitro compression header with magic byte 0)
This commit is contained in:
barubary 2011-12-22 22:59:37 +00:00
parent 6dc34d20a6
commit 4ddd87206b
7 changed files with 213 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CSharp/DSDecmp/DSDecmp.csproj
View File

@ -56,6 +56,7 @@
<Compile Include="Formats\Nitro\LZ10.cs" />
<Compile Include="Formats\Nitro\LZ11.cs" />
<Compile Include="Formats\Nitro\NitroCFormat.cs" />
<Compile Include="Formats\Nitro\NullCompression.cs" />
<Compile Include="Formats\Nitro\RLE.cs" />
<Compile Include="NewestProgram.cs" />
<Compile Include="TestProgram.cs" />

2
CSharp/DSDecmp/Formats/Nitro/NitroCFormat.cs
View File

@ -39,7 +39,7 @@ namespace DSDecmp.Formats.Nitro
}
/// <summary>
/// Checks if the first four bytes match the format used in nitro compression formats.
/// Checks if the first four (or eight) bytes match the format used in nitro compression formats.
/// </summary>
public override bool Supports(System.IO.Stream stream, long inLength)
{

158
CSharp/DSDecmp/Formats/Nitro/NullCompression.cs Normal file
View File

@ -0,0 +1,158 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.IO;
namespace DSDecmp.Formats.Nitro
{
/// <summary>
/// 'Compression' format without any compression whatsoever.
/// Compression using this format will only prepend 0x00 plus the original file size to the file.
/// </summary>
public class NullCompression : NitroCFormat
{
/// <summary>
/// Gets a short string identifying this compression format.
/// </summary>
public override string ShortFormatString
{
get { return "NULL"; }
}
/// <summary>
/// Gets a short description of this compression format (used in the program usage).
/// </summary>
public override string Description
{
get { return "NULL-'compression' format. Prefixes file with 0x00 and filesize."; }
}
/// <summary>
/// Gets if this format supports compressing a file.
/// </summary>
public override bool SupportsCompression
{
get { return true; }
}
/// <summary>
/// Gets the value that must be given on the command line in order to compress using this format.
/// </summary>
public override string CompressionFlag
{
get { return "null"; }
}
/// <summary>
/// Creates a new instance of the NULL-compression format.
/// </summary>
public NullCompression()
: base(0) { }
/// <summary>
/// Checks if the given stream is (or could be) 'compressed' using the NULL compression format.
/// </summary>
public override bool Supports(System.IO.Stream stream, long inLength)
{
long startPosition = stream.Position;
try
{
int firstByte = stream.ReadByte();
if (firstByte != 0)
return false;
byte[] sizeBytes = new byte[3];
stream.Read(sizeBytes, 0, 3);
int outSize = IOUtils.ToNDSu24(sizeBytes, 0);
int headerSize = 4;
if (outSize == 0)
{
sizeBytes = new byte[4];
stream.Read(sizeBytes, 0, 4);
outSize = (int)IOUtils.ToNDSu32(sizeBytes, 0);
headerSize = 8;
}
return outSize == inLength - headerSize;
}
finally
{
stream.Position = startPosition;
}
}
/// <summary>
/// 'Decompresses' the given input stream using the NULL format.
/// </summary>
public override long Decompress(System.IO.Stream instream, long inLength, System.IO.Stream outstream)
{
long readBytes = 0;
byte type = (byte)instream.ReadByte();
if (type != base.magicByte)
throw new InvalidDataException("The provided stream is not a valid Null "
+ "compressed stream (invalid type 0x" + type.ToString("X") + ")");
byte[] sizeBytes = new byte[3];
instream.Read(sizeBytes, 0, 3);
int decompressedSize = IOUtils.ToNDSu24(sizeBytes, 0);
readBytes += 4;
if (decompressedSize == 0)
{
sizeBytes = new byte[4];
instream.Read(sizeBytes, 0, 4);
decompressedSize = IOUtils.ToNDSs32(sizeBytes, 0);
readBytes += 4;
}
byte[] data = new byte[decompressedSize];
int readLength = instream.Read(data, 0, decompressedSize);
outstream.Write(data, 0, readLength);
if (readLength < decompressedSize)
throw new NotEnoughDataException(readLength, decompressedSize);
return readLength;
}
/// <summary>
/// 'Compresses' the given input stream using the NULL format.
/// </summary>
public override int Compress(System.IO.Stream instream, long inLength, System.IO.Stream outstream)
{
if (inLength > 0xFFFFFFFF)
throw new InputTooLargeException();
long outSize = 4;
outstream.WriteByte(0);
if (inLength <= 0xFFFFFF)
{
outstream.WriteByte((byte)(inLength & 0xFF));
outstream.WriteByte((byte)((inLength >> 8) & 0xFF));
outstream.WriteByte((byte)((inLength >> 16) & 0xFF));
}
else
{
outstream.WriteByte(0);
outstream.WriteByte(0);
outstream.WriteByte(0);
outstream.WriteByte((byte)(inLength & 0xFF));
outstream.WriteByte((byte)((inLength >> 8) & 0xFF));
outstream.WriteByte((byte)((inLength >> 16) & 0xFF));
outstream.WriteByte((byte)((inLength >> 24) & 0xFF));
outSize = 8;
}
byte[] buffer = new byte[Math.Min(int.MaxValue, inLength)];
long remaining = inLength;
while (remaining > 0)
{
int readLength = instream.Read(buffer, 0, (int)Math.Min(buffer.Length, remaining));
if (readLength == 0)
throw new StreamTooShortException();
remaining -= readLength;
outstream.Write(buffer, 0, readLength);
outSize += readLength;
}
return (int)Math.Min(int.MaxValue, outSize);
}
}
}

9
CSharp/DSDecmp/NewestProgram.cs
View File

@ -8,7 +8,7 @@ using DSDecmp.Formats.Nitro;
namespace DSDecmp
{
class NewestProgram
public class NewestProgram
{
#if DEBUG
public static string PluginFolder = "./Plugins/Debug";
@ -177,7 +177,7 @@ namespace DSDecmp
using (MemoryStream inStr = new MemoryStream(inputData),
outStr = new MemoryStream())
{
if (!format.Supports(inStr, input.Length))
if (!format.Supports(inStr, inputData.Length))
continue;
try
{
@ -549,9 +549,12 @@ namespace DSDecmp
yield return new Huffman4();
yield return new Huffman8();
yield return new RLE();
yield return new NullCompression();
if (alsoCompositeFormats)
{
yield return new HuffmanAny();
yield return new CompositeGBAFormat();
yield return new CompositeNDSFormat();
}
}
/// <summary>

48
CSharp/PluginDistro/DSDecmp.xml
View File

@ -257,7 +257,7 @@
</member>
<member name="M:DSDecmp.Formats.Nitro.NitroCFormat.Supports(System.IO.Stream,System.Int64)">
<summary>
Checks if the first four bytes match the format used in nitro compression formats.
Checks if the first four (or eight) bytes match the format used in nitro compression formats.
</summary>
</member>
<member name="T:DSDecmp.Formats.CompositeFormat">
@ -1090,5 +1090,51 @@
Gets the value that must be given on the command line in order to compress using this format.
</summary>
</member>
<member name="T:DSDecmp.Formats.Nitro.NullCompression">
<summary>
'Compression' format without any compression whatsoever.
Compression using this format will only prepend 0x00 plus the original file size to the file.
</summary>
</member>
<member name="M:DSDecmp.Formats.Nitro.NullCompression.#ctor">
<summary>
Creates a new instance of the NULL-compression format.
</summary>
</member>
<member name="M:DSDecmp.Formats.Nitro.NullCompression.Supports(System.IO.Stream,System.Int64)">
<summary>
Checks if the given stream is (or could be) 'compressed' using the NULL compression format.
</summary>
</member>
<member name="M:DSDecmp.Formats.Nitro.NullCompression.Decompress(System.IO.Stream,System.Int64,System.IO.Stream)">
<summary>
'Decompresses' the given input stream using the NULL format.
</summary>
</member>
<member name="M:DSDecmp.Formats.Nitro.NullCompression.Compress(System.IO.Stream,System.Int64,System.IO.Stream)">
<summary>
'Compresses' the given input stream using the NULL format.
</summary>
</member>
<member name="P:DSDecmp.Formats.Nitro.NullCompression.ShortFormatString">
<summary>
Gets a short string identifying this compression format.
</summary>
</member>
<member name="P:DSDecmp.Formats.Nitro.NullCompression.Description">
<summary>
Gets a short description of this compression format (used in the program usage).
</summary>
</member>
<member name="P:DSDecmp.Formats.Nitro.NullCompression.SupportsCompression">
<summary>
Gets if this format supports compressing a file.
</summary>
</member>
<member name="P:DSDecmp.Formats.Nitro.NullCompression.CompressionFlag">
<summary>
Gets the value that must be given on the command line in order to compress using this format.
</summary>
</member>
</members>
</doc>

BIN
CSharp/PluginDistro/GoldenSunDD.dll
View File

Binary file not shown.

BIN
CSharp/PluginDistro/LuminousArc.dll
View File

Binary file not shown.