Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-23 13:45:34 +08:00
Code Issues Projects Releases Wiki Activity

IBinaryStream migration - continued.

Browse Source
This commit is contained in:
morkt 2016-10-15 12:21:12 +04:00
parent 503b734645
commit d0c1d5da01
39 changed files with 529 additions and 574 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ArcFormats/Abel/ImageGPS.cs
View File

@ -52,18 +52,18 @@ namespace GameRes.Formats.Abel
Extensions = new string[] { "gps", "cmp" }; Extensions = new string[] { "gps", "cmp" };
} }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x29]; var header = stream.ReadHeader (0x29);
if (header.Length != stream.Read (header, 0, header.Length)) if (header.Length != 0x29)
return null; return null;
var gps = new GpsMetaData var gps = new GpsMetaData
{ {
Width = LittleEndian.ToUInt32 (header, 0x19), Width = header.ToUInt32 (0x19),
Height = LittleEndian.ToUInt32 (header, 0x1D), Height = header.ToUInt32 (0x1D),
Compression = header[0x10], Compression = header[0x10],
UnpackedSize = LittleEndian.ToInt32 (header, 0x11), UnpackedSize = header.ToInt32 (0x11),
PackedSize = LittleEndian.ToInt32 (header, 0x15), PackedSize = header.ToInt32 (0x15),
}; };
// read BMP header // read BMP header
using (var input = OpenGpsStream (stream, gps.Compression, 0x54)) using (var input = OpenGpsStream (stream, gps.Compression, 0x54))
@ -76,7 +76,7 @@ namespace GameRes.Formats.Abel
} }
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var gps = (GpsMetaData)info; var gps = (GpsMetaData)info;
stream.Position = 0x29; stream.Position = 0x29;
@ -89,21 +89,23 @@ namespace GameRes.Formats.Abel
throw new System.NotImplementedException ("GpsFormat.Write not implemented"); throw new System.NotImplementedException ("GpsFormat.Write not implemented");
} }
Stream OpenGpsStream (Stream input, byte compression, int unpacked_size) IBinaryStream OpenGpsStream (IBinaryStream input, byte compression, int unpacked_size)
{ {
Stream gps = null;
if (0 == compression) if (0 == compression)
return new StreamRegion (input, 0x29, true); gps = new StreamRegion (input.AsStream, 0x29, true);
else if (1 == compression) else if (1 == compression)
return OpenRLEStream (input, unpacked_size); gps = OpenRLEStream (input.AsStream, unpacked_size);
else if (2 == compression) else if (2 == compression)
return new LzssStream (input, LzssMode.Decompress, true); gps = new LzssStream (input.AsStream, LzssMode.Decompress, true);
else if (3 == compression) else if (3 == compression)
{ {
using (var lzss = new LzssStream (input, LzssMode.Decompress, true)) using (var lzss = new LzssStream (input.AsStream, LzssMode.Decompress, true))
return OpenRLEStream (lzss, unpacked_size); gps = OpenRLEStream (lzss, unpacked_size);
} }
else else
throw new InvalidFormatException(); throw new InvalidFormatException();
return new BinaryStream (gps);
} }
Stream OpenRLEStream (Stream input, int output_size) Stream OpenRLEStream (Stream input, int output_size)

15
ArcFormats/AdvSys/ImageGWD.cs
View File

@ -43,10 +43,10 @@ namespace GameRes.Formats.AdvSys
public override string Description { get { return "AdvSys3 engine image format"; } } public override string Description { get { return "AdvSys3 engine image format"; } }
public override uint Signature { get { return 0; } } public override uint Signature { get { return 0; } }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[12]; var header = stream.ReadHeader (12);
if (header.Length != stream.Read (header, 0, header.Length)) if (header.Length != 12)
return null; return null;
if (!Binary.AsciiEqual (header, 4, "GWD")) if (!Binary.AsciiEqual (header, 4, "GWD"))
return null; return null;
@ -59,7 +59,7 @@ namespace GameRes.Formats.AdvSys
}; };
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
PixelFormat format = 24 == info.BPP ? PixelFormats.Bgr24 : PixelFormats.Gray8; PixelFormat format = 24 == info.BPP ? PixelFormats.Bgr24 : PixelFormats.Gray8;
byte[] image; byte[] image;
@ -71,7 +71,8 @@ namespace GameRes.Formats.AdvSys
stream.Position = 4 + meta.DataSize; stream.Position = 4 + meta.DataSize;
if (24 == info.BPP && 1 == stream.ReadByte()) if (24 == info.BPP && 1 == stream.ReadByte())
{ {
using (var alpha_stream = new StreamRegion (stream, stream.Position, true)) using (var part = new StreamRegion (stream.AsStream, stream.Position, true))
using (var alpha_stream = new BinaryStream (part))
{ {
var alpha_info = ReadMetaData (alpha_stream) as GwdMetaData; var alpha_info = ReadMetaData (alpha_stream) as GwdMetaData;
if (null != alpha_info && 8 == alpha_info.BPP if (null != alpha_info && 8 == alpha_info.BPP
@ -120,13 +121,13 @@ namespace GameRes.Formats.AdvSys
public byte[] Pixels { get { return m_output; } } public byte[] Pixels { get { return m_output; } }
public int InputSize { get; private set; } public int InputSize { get; private set; }
public GwdReader (Stream input, ImageMetaData info) public GwdReader (IBinaryStream input, ImageMetaData info)
{ {
m_bpp = info.BPP; m_bpp = info.BPP;
if (m_bpp != 8 && m_bpp != 24) if (m_bpp != 8 && m_bpp != 24)
throw new InvalidFormatException(); throw new InvalidFormatException();
m_input = new MsbBitStream (input, true); m_input = new MsbBitStream (input.AsStream, true);
m_width = (int)info.Width; m_width = (int)info.Width;
m_height = (int)info.Height; m_height = (int)info.Height;
m_stride = m_width * m_bpp / 8; m_stride = m_width * m_bpp / 8;

8
ArcFormats/AliceSoft/ImageAJP.cs
View File

@ -50,7 +50,7 @@ namespace GameRes.Formats.AliceSoft
0x5D, 0x91, 0xAE, 0x87, 0x4A, 0x56, 0x41, 0xCD, 0x83, 0xEC, 0x4C, 0x92, 0xB5, 0xCB, 0x16, 0x34 0x5D, 0x91, 0xAE, 0x87, 0x4A, 0x56, 0x41, 0xCD, 0x83, 0xEC, 0x4C, 0x92, 0xB5, 0xCB, 0x16, 0x34
}; };
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x18]; var header = new byte[0x18];
stream.Position = 0xC; stream.Position = 0xC;
@ -68,12 +68,12 @@ namespace GameRes.Formats.AliceSoft
}; };
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var meta = (AjpMetaData)info; var meta = (AjpMetaData)info;
int stride = (int)meta.Width * 4; int stride = (int)meta.Width * 4;
byte[] pixels; byte[] pixels;
using (var jpeg = DecryptStream (stream, meta.ImageOffset, meta.ImageSize)) using (var jpeg = DecryptStream (stream.AsStream, meta.ImageOffset, meta.ImageSize))
{ {
var decoder = new JpegBitmapDecoder (jpeg, var decoder = new JpegBitmapDecoder (jpeg,
BitmapCreateOptions.None, BitmapCacheOption.OnLoad); BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
@ -84,7 +84,7 @@ namespace GameRes.Formats.AliceSoft
pixels = new byte[stride * (int)meta.Height]; pixels = new byte[stride * (int)meta.Height];
bitmap.CopyPixels (pixels, stride, 0); bitmap.CopyPixels (pixels, stride, 0);
} }
using (var mask = DecryptStream (stream, meta.AlphaOffset, meta.AlphaSize)) using (var mask = DecryptStream (stream.AsStream, meta.AlphaOffset, meta.AlphaSize))
{ {
var alpha = ReadMask (mask); var alpha = ReadMask (mask);
int src = 0; int src = 0;

81
ArcFormats/AliceSoft/ImageDCF.cs
View File

@ -46,39 +46,36 @@ namespace GameRes.Formats.AliceSoft
public override string Description { get { return "AliceSoft System incremental image"; } } public override string Description { get { return "AliceSoft System incremental image"; } }
public override uint Signature { get { return 0x20666364; } } // 'dcf ' public override uint Signature { get { return 0x20666364; } } // 'dcf '
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
using (var reader = new ArcView.Reader (stream)) stream.Seek (4, SeekOrigin.Current);
uint header_size = stream.ReadUInt32();
long data_pos = stream.Position + header_size;
if (stream.ReadInt32() != 1)
return null;
uint width = stream.ReadUInt32();
uint height = stream.ReadUInt32();
int bpp = stream.ReadInt32();
int name_length = stream.ReadInt32();
if (name_length <= 0)
return null;
int shift = (name_length % 7) + 1;
var name_bits = stream.ReadBytes (name_length);
for (int i = 0; i < name_length; ++i)
{ {
stream.Seek (4, SeekOrigin.Current); name_bits[i] = Binary.RotByteL (name_bits[i], shift);
uint header_size = reader.ReadUInt32();
long data_pos = stream.Position + header_size;
if (reader.ReadInt32() != 1)
return null;
uint width = reader.ReadUInt32();
uint height = reader.ReadUInt32();
int bpp = reader.ReadInt32();
int name_length = reader.ReadInt32();
if (name_length <= 0)
return null;
int shift = (name_length % 7) + 1;
var name_bits = reader.ReadBytes (name_length);
for (int i = 0; i < name_length; ++i)
{
name_bits[i] = Binary.RotByteL (name_bits[i], shift);
}
return new DcfMetaData
{
Width = width,
Height = height,
BPP = bpp,
BaseName = Encodings.cp932.GetString (name_bits),
DataOffset = data_pos,
};
} }
return new DcfMetaData
{
Width = width,
Height = height,
BPP = bpp,
BaseName = Encodings.cp932.GetString (name_bits),
DataOffset = data_pos,
};
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
using (var reader = new DcfReader (stream, (DcfMetaData)info)) using (var reader = new DcfReader (stream, (DcfMetaData)info))
{ {
@ -93,9 +90,9 @@ namespace GameRes.Formats.AliceSoft
} }
} }
internal class DcfReader : IDisposable internal sealed class DcfReader : IDisposable
{ {
BinaryReader m_input; IBinaryStream m_input;
DcfMetaData m_info; DcfMetaData m_info;
byte[] m_output; byte[] m_output;
byte[] m_mask = null; byte[] m_mask = null;
@ -111,9 +108,9 @@ namespace GameRes.Formats.AliceSoft
public PixelFormat Format { get; private set; } public PixelFormat Format { get; private set; }
public int Stride { get; private set; } public int Stride { get; private set; }
public DcfReader (Stream input, DcfMetaData info) public DcfReader (IBinaryStream input, DcfMetaData info)
{ {
m_input = new ArcView.Reader (input); m_input = input;
m_info = info; m_info = info;
} }
@ -122,7 +119,7 @@ namespace GameRes.Formats.AliceSoft
long next_pos = m_info.DataOffset; long next_pos = m_info.DataOffset;
for (;;) for (;;)
{ {
m_input.BaseStream.Position = next_pos; m_input.Position = next_pos;
uint id = m_input.ReadUInt32(); uint id = m_input.ReadUInt32();
next_pos += 8 + m_input.ReadUInt32(); next_pos += 8 + m_input.ReadUInt32();
if (0x6C646664 == id) // 'dfdl' if (0x6C646664 == id) // 'dfdl'
@ -131,22 +128,22 @@ namespace GameRes.Formats.AliceSoft
if (unpacked_size <= 0) if (unpacked_size <= 0)
continue; continue;
m_mask = new byte[unpacked_size]; m_mask = new byte[unpacked_size];
using (var input = new ZLibStream (m_input.BaseStream, CompressionMode.Decompress, true)) using (var input = new ZLibStream (m_input.AsStream, CompressionMode.Decompress, true))
input.Read (m_mask, 0, unpacked_size); input.Read (m_mask, 0, unpacked_size);
} }
else if (0x64676364 == id) // 'dcgd' else if (0x64676364 == id) // 'dcgd'
break; break;
} }
long qnt_pos = m_input.BaseStream.Position; long qnt_pos = m_input.Position;
if (m_input.ReadUInt32() != Qnt.Signature) if (m_input.ReadUInt32() != Qnt.Signature)
throw new InvalidFormatException(); throw new InvalidFormatException();
m_input.BaseStream.Seek (-4, SeekOrigin.Current); m_input.Seek (-4, SeekOrigin.Current);
var qnt_info = Qnt.ReadMetaData (m_input.BaseStream) as QntMetaData; var qnt_info = Qnt.ReadMetaData (m_input) as QntMetaData;
if (null == qnt_info) if (null == qnt_info)
throw new InvalidFormatException(); throw new InvalidFormatException();
m_input.BaseStream.Position = qnt_pos + 0x44; m_input.Position = qnt_pos + 0x44;
var overlay = new QntFormat.Reader (m_input.BaseStream, qnt_info); var overlay = new QntFormat.Reader (m_input, qnt_info);
overlay.Unpack(); overlay.Unpack();
m_overlay_bpp = overlay.BPP; m_overlay_bpp = overlay.BPP;
if (m_mask != null) if (m_mask != null)
@ -236,14 +233,8 @@ namespace GameRes.Formats.AliceSoft
} }
#region IDisposable Members #region IDisposable Members
bool _disposed = false;
public void Dispose () public void Dispose ()
{ {
if (!_disposed)
{
m_input.Dispose();
_disposed = true;
}
} }
#endregion #endregion
} }

22
ArcFormats/Ankh/AudioPCM.cs
View File

@ -42,28 +42,26 @@ namespace GameRes.Formats.Ice
Signatures = new uint[] { 0x010001, 0x020001 }; Signatures = new uint[] { 0x010001, 0x020001 };
} }
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
var header = new byte[0x16]; var header = file.ReadHeader (0x16);
if (header.Length != file.Read (header, 0, header.Length)) ushort tag = header.ToUInt16 (0);
return null;
ushort tag = LittleEndian.ToUInt16 (header, 0);
if (tag != 1) if (tag != 1)
return null; return null;
int extra_size = LittleEndian.ToUInt16 (header, 0x10); int extra_size = header.ToUInt16 (0x10);
if (0 != extra_size) if (0 != extra_size)
return null; return null;
uint pcm_size = LittleEndian.ToUInt32 (header, 0x12); uint pcm_size = header.ToUInt32 (0x12);
if (pcm_size + 0x16 != file.Length) if (pcm_size + 0x16 != file.Length)
return null; return null;
var format = new WaveFormat { FormatTag = tag }; var format = new WaveFormat { FormatTag = tag };
format.Channels = LittleEndian.ToUInt16 (header, 2); format.Channels = header.ToUInt16 (2);
if (format.Channels != 1 && format.Channels != 2) if (format.Channels != 1 && format.Channels != 2)
return null; return null;
format.SamplesPerSecond = LittleEndian.ToUInt32 (header, 4); format.SamplesPerSecond = header.ToUInt32 (4);
format.AverageBytesPerSecond = LittleEndian.ToUInt32 (header, 8); format.AverageBytesPerSecond = header.ToUInt32 (8);
format.BlockAlign = LittleEndian.ToUInt16 (header, 0xC); format.BlockAlign = header.ToUInt16 (0xC);
format.BitsPerSample = LittleEndian.ToUInt16 (header, 0xE); format.BitsPerSample = header.ToUInt16 (0xE);
if (0 == format.AverageBytesPerSecond if (0 == format.AverageBytesPerSecond
|| format.SamplesPerSecond * format.BlockAlign != format.AverageBytesPerSecond) || format.SamplesPerSecond * format.BlockAlign != format.AverageBytesPerSecond)
return null; return null;

140
ArcFormats/Aoi/ImageAGF.cs
View File

@ -54,120 +54,118 @@ namespace GameRes.Formats.Aoi
Extensions = new string[] { "agf" }; Extensions = new string[] { "agf" };
} }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x80]; var header = stream.ReadHeader (0x80);
if (header.Length != stream.Read (header, 0, header.Length)) int version = header.ToInt32 (4);
return null;
int version = LittleEndian.ToInt32 (header, 4);
if (version != 1 && version != 2) if (version != 1 && version != 2)
return null; return null;
var info = new AgfMetaData var info = new AgfMetaData
{ {
Width = LittleEndian.ToUInt32 (header, 0x1C), Width = header.ToUInt32 (0x1C),
Height = LittleEndian.ToUInt32 (header, 0x20), Height = header.ToUInt32 (0x20),
BPP = 32, BPP = 32,
Version = version, Version = version,
}; };
if (1 == version) if (1 == version)
{ {
info.DataOffset = LittleEndian.ToUInt32 (header, 0x0C); info.DataOffset = header.ToUInt32 (0x0C);
} }
else else
{ {
info.DataOffset = LittleEndian.ToUInt32 (header, 0x10); info.DataOffset = header.ToUInt32 (0x10);
info.Flags = LittleEndian.ToUInt32 (header, 0x54); info.Flags = header.ToUInt32 (0x54);
info.BaseNameOffset = LittleEndian.ToUInt32 (header, 0x6C); info.BaseNameOffset = header.ToUInt32 (0x6C);
} }
return info; return info;
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream input, ImageMetaData info)
{ {
var meta = (AgfMetaData)info; var meta = (AgfMetaData)info;
var pixels = new byte[meta.Width * meta.Height * 4]; var pixels = new byte[meta.Width * meta.Height * 4];
int dst = 0; int dst = 0;
stream.Position = meta.DataOffset; input.Position = meta.DataOffset;
using (var input = new BinaryReader (stream, Encoding.Unicode, true)) while (dst < pixels.Length)
{ {
while (dst < pixels.Length) uint op = input.ReadUInt32();
int count = (int)(op >> 8);
switch (op & 0xFF)
{ {
uint op = input.ReadUInt32(); case 1:
int count = (int)(op >> 8); count *= 4;
switch (op & 0xFF) input.Read (pixels, dst, count);
{ break;
case 1:
count *= 4;
input.Read (pixels, dst, count);
break;
case 2: case 2:
input.Read (pixels, dst, 4); input.Read (pixels, dst, 4);
count *= 4; count *= 4;
Binary.CopyOverlapped (pixels, dst, dst+4, count - 4); Binary.CopyOverlapped (pixels, dst, dst+4, count - 4);
break; break;
case 3: case 3:
int chunk_size = (count >> 8) * 4; int chunk_size = (count >> 8) * 4;
count = (count & 0xFF) * chunk_size; count = (count & 0xFF) * chunk_size;
input.Read (pixels, dst, chunk_size); input.Read (pixels, dst, chunk_size);
Binary.CopyOverlapped (pixels, dst, dst + chunk_size, count - chunk_size); Binary.CopyOverlapped (pixels, dst, dst + chunk_size, count - chunk_size);
break; break;
case 4: case 4:
int offset = (count & 0xFFF) * 4; int offset = (count & 0xFFF) * 4;
count = (count >> 12) * 4; count = (count >> 12) * 4;
Binary.CopyOverlapped (pixels, dst - offset, dst, count); Binary.CopyOverlapped (pixels, dst - offset, dst, count);
break; break;
case 5: case 5:
count = (count >> 8) & 0xFF; count = (count >> 8) & 0xFF;
input.BaseStream.Seek ((count - count / 4) * 4, SeekOrigin.Current); input.BaseStream.Seek ((count - count / 4) * 4, SeekOrigin.Current);
count *= 4; count *= 4;
break; break;
default: default:
throw new InvalidFormatException(); throw new InvalidFormatException();
}
dst += count;
} }
if (0 != (meta.Flags & 0x10) && 0 != meta.BaseNameOffset) dst += count;
}
if (0 != (meta.Flags & 0x10) && 0 != meta.BaseNameOffset)
{
try
{ {
try var base_name = ReadBaseName (input, meta);
if (VFS.FileExists (base_name))
{ {
var base_name = ReadBaseName (input, meta); using (var base_file = VFS.OpenSeekableStream (base_name))
if (VFS.FileExists (base_name))
{ {
using (var base_file = VFS.OpenSeekableStream (base_name)) var base_image = Read (base_name, base_file);
{ BlendImage (meta, pixels, base_image.Bitmap);
var base_image = Read (base_name, base_file);
BlendImage (meta, pixels, base_image.Bitmap);
}
} }
} }
catch (Exception X) }
{ catch (Exception X)
Trace.WriteLine (string.Format ("{0}: baseline image read error: {1}", {
meta.FileName, X.Message), "[AGF]"); Trace.WriteLine (string.Format ("{0}: baseline image read error: {1}",
} meta.FileName, X.Message), "[AGF]");
} }
} }
return ImageData.Create (info, PixelFormats.Bgra32, null, pixels); return ImageData.Create (info, PixelFormats.Bgra32, null, pixels);
} }
string ReadBaseName (BinaryReader input, AgfMetaData info) string ReadBaseName (IBinaryStream input, AgfMetaData info)
{ {
input.BaseStream.Position = info.DataOffset + info.BaseNameOffset; input.BaseStream.Position = info.DataOffset + info.BaseNameOffset;
var name = new StringBuilder(); using (var reader = new BinaryReader (input.AsStream, Encoding.Unicode, true))
for (;;)
{ {
char c = input.ReadChar(); var name = new StringBuilder();
if (0 == c) for (;;)
break; {
name.Append (c); char c = input.ReadChar();
if (0 == c)
break;
name.Append (c);
}
var dir_name = VFS.GetDirectoryName (info.FileName);
return VFS.CombinePath (dir_name, name.ToString());
} }
var dir_name = VFS.GetDirectoryName (info.FileName);
return VFS.CombinePath (dir_name, name.ToString());
} }
void BlendImage (AgfMetaData info, byte[] overlay, BitmapSource bitmap) void BlendImage (AgfMetaData info, byte[] overlay, BitmapSource bitmap)

29
ArcFormats/AudioVOC.cs
View File

@ -34,30 +34,30 @@ namespace GameRes.Formats.Creative
{ {
int m_version; int m_version;
int m_header_size; int m_header_size;
BinaryReader m_input; IBinaryStream m_input;
WaveFormat m_format; WaveFormat m_format;
public WaveFormat Format { get { return m_format; } } public WaveFormat Format { get { return m_format; } }
public VocReader (Stream input, byte[] header) public VocReader (IBinaryStream input, byte[] header)
{ {
m_header_size = LittleEndian.ToUInt16 (header, 0x14); m_header_size = LittleEndian.ToUInt16 (header, 0x14);
if (m_header_size < 0x1A) if (m_header_size < 0x1A)
throw new InvalidFormatException(); throw new InvalidFormatException();
m_version = LittleEndian.ToUInt16 (header, 0x16); m_version = LittleEndian.ToUInt16 (header, 0x16);
m_input = new ArcView.Reader (input); m_input = input;
} }
public Stream ConvertToPcm () public Stream ConvertToPcm ()
{ {
m_input.BaseStream.Position = m_header_size; m_input.Position = m_header_size;
bool format_read = false; bool format_read = false;
var pcm = new MemoryStream(); var pcm = new MemoryStream();
try try
{ {
for (;;) for (;;)
{ {
int block_type = m_input.BaseStream.ReadByte(); int block_type = m_input.ReadByte();
if (-1 == block_type || 0 == block_type) if (-1 == block_type || 0 == block_type)
break; break;
int block_size = m_input.ReadUInt16(); int block_size = m_input.ReadUInt16();
@ -96,7 +96,7 @@ namespace GameRes.Formats.Creative
Copy (block_size-12, pcm); Copy (block_size-12, pcm);
break; break;
default: default:
m_input.BaseStream.Seek (block_size, SeekOrigin.Current); m_input.Seek (block_size, SeekOrigin.Current);
break; break;
} }
if (codec != -1) if (codec != -1)
@ -144,14 +144,8 @@ namespace GameRes.Formats.Creative
} }
#region IDisposable Members #region IDisposable Members
bool _disposed = false;
public void Dispose () public void Dispose ()
{ {
if (!_disposed)
{
m_input.Dispose();
_disposed = true;
}
} }
#endregion #endregion
} }
@ -164,18 +158,17 @@ namespace GameRes.Formats.Creative
public override uint Signature { get { return 0x61657243; } } // 'Crea' public override uint Signature { get { return 0x61657243; } } // 'Crea'
public override bool CanWrite { get { return false; } } public override bool CanWrite { get { return false; } }
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
var header = new byte[0x1A]; var header = file.ReadHeader (0x1A);
if (header.Length != file.Read (header, 0, header.Length)) if (!header.AsciiEqual ("Creative Voice File\x1A"))
return null; return null;
if (!Binary.AsciiEqual (header, 0, "Creative Voice File\x1A")) using (var reader = new VocReader (file, header.ToArray()))
return null;
using (var reader = new VocReader (file, header))
{ {
var pcm = reader.ConvertToPcm(); var pcm = reader.ConvertToPcm();
if (null == pcm) if (null == pcm)
return null; return null;
file.Dispose();
return new RawPcmInput (pcm, reader.Format); return new RawPcmInput (pcm, reader.Format);
} }
} }

22
ArcFormats/Banana/ImageGEC.cs
View File

@ -45,24 +45,22 @@ namespace GameRes.Formats.YellowPig
public override string Description { get { return "Yellow Pig image format"; } } public override string Description { get { return "Yellow Pig image format"; } }
public override uint Signature { get { return 0; } } public override uint Signature { get { return 0; } }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x11]; var header = stream.ReadHeader (0x11);
if (header.Length != stream.Read (header, 0, header.Length))
return null;
byte type = header[0]; byte type = header[0];
if (type != 0 && type != 1) if (type != 0 && type != 1)
return null; return null;
var info = new GecMetaData var info = new GecMetaData
{ {
Type = type, Type = type,
OffsetX = LittleEndian.ToInt16 (header, 1), OffsetX = header.ToInt16 (1),
OffsetY = LittleEndian.ToInt16 (header, 3), OffsetY = header.ToInt16 (3),
Width = LittleEndian.ToUInt16 (header, 5), Width = header.ToUInt16 (5),
Height = LittleEndian.ToUInt16 (header, 7), Height = header.ToUInt16 (7),
BPP = 0 == type ? 24 : 32, BPP = 0 == type ? 24 : 32,
AlphaOffset = LittleEndian.ToInt32 (header, 9), AlphaOffset = header.ToInt32 (9),
DataOffset = LittleEndian.ToInt32 (header, 0xD), DataOffset = header.ToInt32 (0xD),
}; };
if (info.OffsetX < 0 || info.OffsetY < 0 || info.Width <= 0 || info.Height <= 0 if (info.OffsetX < 0 || info.OffsetY < 0 || info.Width <= 0 || info.Height <= 0
|| info.DataOffset < 0 || info.DataOffset > stream.Length) || info.DataOffset < 0 || info.DataOffset > stream.Length)
@ -72,9 +70,9 @@ namespace GameRes.Formats.YellowPig
return info; return info;
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var reader = new GecReader (stream, (GecMetaData)info); var reader = new GecReader (stream.AsStream, (GecMetaData)info);
reader.Unpack(); reader.Unpack();
return ImageData.CreateFlipped (info, reader.Format, null, reader.Data, reader.Stride); return ImageData.CreateFlipped (info, reader.Format, null, reader.Data, reader.Stride);
} }

4
ArcFormats/Bruns/AudioUM3.cs
View File

@ -36,9 +36,9 @@ namespace GameRes.Formats
public override string Description { get { return "UltraMarine3 audio format (Ogg/Vorbis)"; } } public override string Description { get { return "UltraMarine3 audio format (Ogg/Vorbis)"; } }
public override uint Signature { get { return 0xAC9898B0; } } // ~'OggS' public override uint Signature { get { return 0xAC9898B0; } } // ~'OggS'
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
return new OggInput (new Um3Stream (file)); return new OggInput (new Um3Stream (file.AsStream));
} }
} }

44
ArcFormats/Bruns/ImageEENC.cs
View File

@ -54,14 +54,12 @@ namespace GameRes.Formats.Bruns
Signatures = new uint[] { 0x434E4545, 0x5A4E4545 }; // 'EENC', 'EENZ' Signatures = new uint[] { 0x434E4545, 0x5A4E4545 }; // 'EENC', 'EENZ'
} }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[8]; var header = stream.ReadHeader (8);
if (8 != stream.Read (header, 0, 8))
return null;
bool compressed = 'Z' == header[3]; bool compressed = 'Z' == header[3];
uint key = LittleEndian.ToUInt32 (header, 4) ^ EencKey; uint key = header.ToUInt32 (4) ^ EencKey;
Stream input = new StreamRegion (stream, 8, true); Stream input = new StreamRegion (stream.AsStream, 8, true);
try try
{ {
input = new EencStream (input, key); input = new EencStream (input, key);
@ -70,19 +68,22 @@ namespace GameRes.Formats.Bruns
input = new ZLibStream (input, CompressionMode.Decompress); input = new ZLibStream (input, CompressionMode.Decompress);
input = new SeekableStream (input); input = new SeekableStream (input);
} }
var format = FindFormat (input); using (var bin = new BinaryStream (input, stream.Name, true))
if (null == format)
return null;
return new EencMetaData
{ {
Width = format.Item2.Width, var format = FindFormat (bin);
Height = format.Item2.Height, if (null == format)
BPP = format.Item2.BPP, return null;
Key = key, return new EencMetaData
Info = format.Item2, {
Format = format.Item1, Width = format.Item2.Width,
Compressed = compressed, Height = format.Item2.Height,
}; BPP = format.Item2.BPP,
Key = key,
Info = format.Item2,
Format = format.Item1,
Compressed = compressed,
};
}
} }
finally finally
{ {
@ -90,17 +91,18 @@ namespace GameRes.Formats.Bruns
} }
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var meta = (EencMetaData)info; var meta = (EencMetaData)info;
meta.Info.FileName = info.FileName; meta.Info.FileName = info.FileName;
Stream input = new StreamRegion (stream, 8, true); Stream input = new StreamRegion (stream.AsStream, 8, true);
try try
{ {
input = new EencStream (input, meta.Key); input = new EencStream (input, meta.Key);
if (meta.Compressed) if (meta.Compressed)
input = new ZLibStream (input, CompressionMode.Decompress); input = new ZLibStream (input, CompressionMode.Decompress);
return meta.Format.Read (input, meta.Info); using (var bin = new BinaryStream (input, stream.Name, true))
return meta.Format.Read (input, meta.Info);
} }
finally finally
{ {

31
ArcFormats/CaramelBox/ImageFCB.cs
View File

@ -43,41 +43,36 @@ namespace GameRes.Formats.CaramelBox
public override string Description { get { return "Caramel BOX image format"; } } public override string Description { get { return "Caramel BOX image format"; } }
public override uint Signature { get { return 0x31626366; } } // 'fcb1' public override uint Signature { get { return 0x31626366; } } // 'fcb1'
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x10]; var header = stream.ReadHeader (0x10);
if (header.Length != stream.Read (header, 0, header.Length))
return null;
return new FcbMetaData return new FcbMetaData
{ {
Width = LittleEndian.ToUInt32 (header, 4), Width = header.ToUInt32 (4),
Height = LittleEndian.ToUInt32 (header, 8), Height = header.ToUInt32 (8),
Method = LittleEndian.ToInt32 (header, 12), Method = header.ToInt32 (12),
BPP = 32, BPP = 32,
}; };
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var meta = (FcbMetaData)info; var meta = (FcbMetaData)info;
byte[] input; byte[] input;
if (1 == meta.Method) if (1 == meta.Method)
{ {
stream.Position = 0x14; stream.Position = 0x14;
using (var reader = new ArcView.Reader (stream)) int unpacked_size = Binary.BigEndian (stream.ReadInt32());
{ stream.ReadInt32(); // packed_size
int unpacked_size = Binary.BigEndian (reader.ReadInt32()); input = new byte[unpacked_size];
reader.ReadInt32(); // packed_size using (var z = new ZLibStream (stream.AsStream, CompressionMode.Decompress, true))
input = new byte[unpacked_size]; if (unpacked_size != z.Read (input, 0, unpacked_size))
using (var z = new ZLibStream (stream, CompressionMode.Decompress, true)) throw new EndOfStreamException();
if (unpacked_size != z.Read (input, 0, unpacked_size))
throw new EndOfStreamException();
}
} }
else if (0 == meta.Method) else if (0 == meta.Method)
{ {
stream.Position = 0x10; stream.Position = 0x10;
using (var tz = new TzCompression (stream)) using (var tz = new TzCompression (stream.AsStream))
input = tz.Unpack(); input = tz.Unpack();
} }
else else

4
ArcFormats/Circus/ArcCRM.cs
View File

@ -39,12 +39,12 @@ namespace GameRes.Formats.Circus
OffsetMap = offset_map; OffsetMap = offset_map;
} }
internal Stream OpenByOffset (uint offset) internal IBinaryStream OpenByOffset (uint offset)
{ {
Entry entry; Entry entry;
if (!OffsetMap.TryGetValue (offset, out entry)) if (!OffsetMap.TryGetValue (offset, out entry))
throw new FileNotFoundException(); throw new FileNotFoundException();
return OpenEntry (entry); return OpenBinaryEntry (entry);
} }
} }

44
ArcFormats/Circus/ImageCRX.cs
View File

@ -48,31 +48,29 @@ namespace GameRes.Formats.Circus
public override string Description { get { return "Circus image format"; } } public override string Description { get { return "Circus image format"; } }
public override uint Signature { get { return 0x47585243; } } // 'CRXG' public override uint Signature { get { return 0x47585243; } } // 'CRXG'
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x14]; var header = stream.ReadHeader (0x14);
if (header.Length != stream.Read (header, 0, header.Length)) int compression = header.ToUInt16 (0xC);
return null;
int compression = LittleEndian.ToUInt16 (header, 0xC);
if (compression < 1 || compression > 3) if (compression < 1 || compression > 3)
return null; return null;
int depth = LittleEndian.ToInt16 (header, 0x10); int depth = header.ToInt16 (0x10);
var info = new CrxMetaData var info = new CrxMetaData
{ {
Width = LittleEndian.ToUInt16 (header, 8), Width = header.ToUInt16 (8),
Height = LittleEndian.ToUInt16 (header, 10), Height = header.ToUInt16 (10),
OffsetX = LittleEndian.ToInt16 (header, 4), OffsetX = header.ToInt16 (4),
OffsetY = LittleEndian.ToInt16 (header, 6), OffsetY = header.ToInt16 (6),
BPP = 0 == depth ? 24 : 1 == depth ? 32 : 8, BPP = 0 == depth ? 24 : 1 == depth ? 32 : 8,
Compression = compression, Compression = compression,
CompressionFlags = LittleEndian.ToUInt16 (header, 0xE), CompressionFlags = header.ToUInt16 (0xE),
Colors = depth, Colors = depth,
Mode = LittleEndian.ToUInt16 (header, 0x12), Mode = header.ToUInt16 (0x12),
}; };
return info; return info;
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
using (var reader = new Reader (stream, (CrxMetaData)info)) using (var reader = new Reader (stream, (CrxMetaData)info))
{ {
@ -88,7 +86,7 @@ namespace GameRes.Formats.Circus
internal sealed class Reader : IDisposable internal sealed class Reader : IDisposable
{ {
BinaryReader m_input; IBinaryStream m_input;
byte[] m_output; byte[] m_output;
int m_width; int m_width;
int m_height; int m_height;
@ -103,7 +101,7 @@ namespace GameRes.Formats.Circus
public BitmapPalette Palette { get; private set; } public BitmapPalette Palette { get; private set; }
public int Stride { get { return m_stride; } } public int Stride { get { return m_stride; } }
public Reader (Stream input, CrxMetaData info) public Reader (IBinaryStream input, CrxMetaData info)
{ {
m_width = (int)info.Width; m_width = (int)info.Width;
m_height = (int)info.Height; m_height = (int)info.Height;
@ -120,8 +118,8 @@ namespace GameRes.Formats.Circus
} }
m_stride = (m_width * m_bpp / 8 + 3) & ~3; m_stride = (m_width * m_bpp / 8 + 3) & ~3;
m_output = new byte[m_height*m_stride]; m_output = new byte[m_height*m_stride];
m_input = new ArcView.Reader (input); m_input = input;
input.Position = 0x14; m_input.Position = 0x14;
if (8 == m_bpp) if (8 == m_bpp)
ReadPalette (info.Colors); ReadPalette (info.Colors);
} }
@ -157,7 +155,7 @@ namespace GameRes.Formats.Circus
if (m_compression >= 3) if (m_compression >= 3)
{ {
int count = m_input.ReadInt32(); int count = m_input.ReadInt32();
m_input.BaseStream.Seek (count * 0x10, SeekOrigin.Current); m_input.Seek (count * 0x10, SeekOrigin.Current);
} }
if (0 != (m_flags & 0x10)) if (0 != (m_flags & 0x10))
{ {
@ -321,7 +319,7 @@ namespace GameRes.Formats.Circus
{ {
int pixel_size = m_bpp / 8; int pixel_size = m_bpp / 8;
int src_stride = m_width * pixel_size; int src_stride = m_width * pixel_size;
using (var zlib = new ZLibStream (m_input.BaseStream, CompressionMode.Decompress, true)) using (var zlib = new ZLibStream (m_input.AsStream, CompressionMode.Decompress, true))
using (var src = new BinaryReader (zlib)) using (var src = new BinaryReader (zlib))
{ {
if (m_bpp >= 24) if (m_bpp >= 24)
@ -400,16 +398,8 @@ namespace GameRes.Formats.Circus
} }
#region IDisposable Members #region IDisposable Members
bool m_disposed = false;
public void Dispose () public void Dispose ()
{ {
if (!m_disposed)
{
m_input.Dispose();
m_disposed = true;
}
GC.SuppressFinalize (this);
} }
#endregion #endregion
} }

43
ArcFormats/Circus/ImageCRXD.cs
View File

@ -50,17 +50,14 @@ namespace GameRes.Formats.Circus
Extensions = new string[] { "crx" }; Extensions = new string[] { "crx" };
} }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x24]; var header = stream.ReadHeader (0x24);
if (header.Length != stream.Read (header, 0, header.Length))
return null;
CrxdMetaData info = null; CrxdMetaData info = null;
if (Binary.AsciiEqual (header, 0x20, "CRXJ")) if (header.AsciiEqual (0x20, "CRXJ"))
{ {
stream.Position = 0x28; stream.Position = 0x28;
stream.Read (header, 0, 4); uint diff_offset = stream.ReadUInt32();
uint diff_offset = LittleEndian.ToUInt32 (header, 0);
using (var crx = OpenByOffset (diff_offset)) using (var crx = OpenByOffset (diff_offset))
{ {
if (null == crx) if (null == crx)
@ -70,9 +67,10 @@ namespace GameRes.Formats.Circus
info.DiffOffset = diff_offset; info.DiffOffset = diff_offset;
} }
} }
else if (Binary.AsciiEqual (header, 0x20, "CRXG")) else if (header.AsciiEqual (0x20, "CRXG"))
{ {
using (var crx = new StreamRegion (stream, 0x20, true)) using (var crx_input = new StreamRegion (stream.AsStream, 0x20, true))
using (var crx = new BinaryStream (crx_input))
{ {
var diff_info = base.ReadMetaData (crx) as CrxMetaData; var diff_info = base.ReadMetaData (crx) as CrxMetaData;
if (null == diff_info) if (null == diff_info)
@ -91,7 +89,7 @@ namespace GameRes.Formats.Circus
} }
if (info != null) if (info != null)
{ {
info.BaseOffset = LittleEndian.ToUInt32 (header, 8); info.BaseOffset = header.ToUInt32 (8);
info.BaseFileName = Binary.GetCString (header, 0xC, 0x14); info.BaseFileName = Binary.GetCString (header, 0xC, 0x14);
} }
return info; return info;
@ -108,27 +106,34 @@ namespace GameRes.Formats.Circus
return arc.OpenByOffset (offset); return arc.OpenByOffset (offset);
} }
Stream OpenDiffStream (Stream diff, CrxdMetaData info) IBinaryStream OpenDiffStream (IBinaryStream diff, CrxdMetaData info)
{ {
Stream input;
if (0 == info.DiffOffset) if (0 == info.DiffOffset)
return new StreamRegion (diff, 0x20, true); {
diff = OpenByOffset (info.DiffOffset); input = new StreamRegion (diff.AsStream, 0x20, true);
if (null == diff) }
throw new FileNotFoundException ("Referenced diff image not found"); else
return new StreamRegion (diff, 0x20); {
diff = OpenByOffset (info.DiffOffset);
if (null == diff)
throw new FileNotFoundException ("Referenced diff image not found");
input = new StreamRegion (diff, 0x20);
}
return new BinaryStream (input);
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var meta = (CrxdMetaData)info; var meta = (CrxdMetaData)info;
Stream base_file = OpenByOffset (meta.BaseOffset); IBinaryStream base_file = OpenByOffset (meta.BaseOffset);
if (null == base_file) if (null == base_file)
{ {
var dir_name = VFS.GetDirectoryName (meta.FileName); var dir_name = VFS.GetDirectoryName (meta.FileName);
var name = VFS.CombinePath (dir_name, meta.BaseFileName); var name = VFS.CombinePath (dir_name, meta.BaseFileName);
if (!VFS.FileExists (name)) if (!VFS.FileExists (name))
throw new FileNotFoundException ("Base image not found", meta.BaseFileName); throw new FileNotFoundException ("Base image not found", meta.BaseFileName);
base_file = VFS.OpenSeekableStream (name); base_file = VFS.OpenBinaryStream (name);
} }
using (base_file) using (base_file)
{ {

16
ArcFormats/Cmvs/AudioMV.cs
View File

@ -37,7 +37,7 @@ namespace GameRes.Formats.Pvns
public override string Description { get { return "PVNS engine compressed audio format"; } } public override string Description { get { return "PVNS engine compressed audio format"; } }
public override uint Signature { get { return 0x53564B4D; } } // 'MKVS' public override uint Signature { get { return 0x53564B4D; } } // 'MKVS'
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
using (var reader = new MvReader (file)) using (var reader = new MvReader (file))
{ {
@ -52,7 +52,7 @@ namespace GameRes.Formats.Pvns
internal sealed class MvReader : IDisposable internal sealed class MvReader : IDisposable
{ {
BinaryReader m_input; IBinaryStream m_input;
byte[] m_output; byte[] m_output;
WaveFormat m_format; WaveFormat m_format;
int m_channel_size; int m_channel_size;
@ -61,7 +61,7 @@ namespace GameRes.Formats.Pvns
public byte[] Data { get { return m_output; } } public byte[] Data { get { return m_output; } }
public WaveFormat Format { get { return m_format; } } public WaveFormat Format { get { return m_format; } }
public MvReader (Stream input) public MvReader (IBinaryStream input)
{ {
var header = new byte[0x12]; var header = new byte[0x12];
input.Read (header, 0, header.Length); input.Read (header, 0, header.Length);
@ -72,14 +72,14 @@ namespace GameRes.Formats.Pvns
m_format.SamplesPerSecond = LittleEndian.ToUInt16 (header, 0xA); m_format.SamplesPerSecond = LittleEndian.ToUInt16 (header, 0xA);
m_format.BlockAlign = (ushort)(m_format.Channels*m_format.BitsPerSample/8); m_format.BlockAlign = (ushort)(m_format.Channels*m_format.BitsPerSample/8);
m_format.AverageBytesPerSecond = m_format.SamplesPerSecond*m_format.BlockAlign; m_format.AverageBytesPerSecond = m_format.SamplesPerSecond*m_format.BlockAlign;
m_input = new ArcView.Reader (input); m_input = input;
m_output = new byte[2 * m_format.Channels * m_channel_size]; m_output = new byte[2 * m_format.Channels * m_channel_size];
m_samples = LittleEndian.ToInt32 (header, 0xE); m_samples = LittleEndian.ToInt32 (header, 0xE);
} }
public void Unpack () public void Unpack ()
{ {
m_input.BaseStream.Position = 0x12; m_input.Position = 0x12;
var pre_sample1 = new int[0x400]; var pre_sample1 = new int[0x400];
var pre_sample2 = new int[0x400]; var pre_sample2 = new int[0x400];
var pre_sample3 = new int[0x140 * m_format.Channels]; var pre_sample3 = new int[0x140 * m_format.Channels];
@ -180,14 +180,8 @@ namespace GameRes.Formats.Pvns
} }
#region IDisposable Members #region IDisposable Members
bool _disposed = false;
public void Dispose () public void Dispose ()
{ {
if (!_disposed)
{
m_input.Dispose();
_disposed = true;
}
} }
#endregion #endregion

25
ArcFormats/Cmvs/ImagePSB.cs
View File

@ -45,14 +45,11 @@ namespace GameRes.Formats.Pvns
public override string Description { get { return "PVNS engine image format"; } } public override string Description { get { return "PVNS engine image format"; } }
public override uint Signature { get { return 0x50425350; } } // 'PSBP' public override uint Signature { get { return 0x50425350; } } // 'PSBP'
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x14]; var header = stream.ReadHeader (0x14);
if (header.Length != stream.Read (header, 0, header.Length))
return null;
stream.Seek (-0x13, SeekOrigin.End); stream.Seek (-0x13, SeekOrigin.End);
var tail = new byte[0x13]; var tail = stream.ReadBytes (0x13);
stream.Read (tail, 0, tail.Length);
for (int i = 4; i < 0x14; ++i) for (int i = 4; i < 0x14; ++i)
{ {
header[i] ^= tail[tail.Length - 3 + (i & 1)]; header[i] ^= tail[tail.Length - 3 + (i & 1)];
@ -60,18 +57,18 @@ namespace GameRes.Formats.Pvns
} }
return new PsbMetaData return new PsbMetaData
{ {
Width = LittleEndian.ToUInt16 (header, 0x0E), Width = header.ToUInt16 (0x0E),
Height = LittleEndian.ToUInt16 (header, 0x10), Height = header.ToUInt16 (0x10),
BPP = LittleEndian.ToUInt16 (header, 0x12), BPP = header.ToUInt16 (0x12),
Method = LittleEndian.ToUInt16 (header, 0x0C), Method = header.ToUInt16 (0x0C),
TableOffset = LittleEndian.ToInt32 (header, 4), TableOffset = header.ToInt32 (4),
DataOffset = LittleEndian.ToInt32 (header, 8), DataOffset = header.ToInt32 (8),
}; };
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var reader = new PsbReader (stream, (PsbMetaData)info); var reader = new PsbReader (stream.AsStream, (PsbMetaData)info);
reader.Unpack(); reader.Unpack();
return ImageData.Create (info, reader.Format, null, reader.Data); return ImageData.Create (info, reader.Format, null, reader.Data);
} }

10
ArcFormats/Cri/AudioADX.cs
View File

@ -38,21 +38,21 @@ namespace GameRes.Formats.Cri
public override string Description { get { return "CRI MiddleWare ADPCM audio"; } } public override string Description { get { return "CRI MiddleWare ADPCM audio"; } }
public override uint Signature { get { return 0; } } public override uint Signature { get { return 0; } }
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
uint signature = FormatCatalog.ReadSignature (file); uint signature = file.Signature;
if (0x80 != (signature & 0xFFFF)) if (0x80 != (signature & 0xFFFF))
return null; return null;
uint header_size = Binary.BigEndian (signature & 0xFFFF0000); uint header_size = Binary.BigEndian (signature & 0xFFFF0000);
if (header_size < 0x10 || header_size >= file.Length) if (header_size < 0x10 || header_size >= file.Length)
return null; return null;
var header = new byte[header_size]; var header = file.ReadBytes (header_size);
if (header.Length != file.Read (header, 0, header.Length)) if (header.Length != header_size)
return null; return null;
if (!Binary.AsciiEqual (header, header.Length-6, "(c)CRI")) if (!Binary.AsciiEqual (header, header.Length-6, "(c)CRI"))
return null; return null;
return new AdxInput (file, header); return new AdxInput (file.AsStream, header);
} }
} }

4
ArcFormats/Cri/AudioHCA.cs
View File

@ -49,9 +49,9 @@ namespace GameRes.Formats.Cri
static readonly Tuple<uint, uint> DefaultKey = Tuple.Create (0x30DBE1ABu, 0xCC554639u); static readonly Tuple<uint, uint> DefaultKey = Tuple.Create (0x30DBE1ABu, 0xCC554639u);
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
return new HcaInput (file, ConversionFormat.IeeeFloat, DefaultKey); return new HcaInput (file.AsStream, ConversionFormat.IeeeFloat, DefaultKey);
} }
} }

16
ArcFormats/Cri/ImageSPC.cs
View File

@ -42,22 +42,24 @@ namespace GameRes.Formats.Cri
Signatures = new uint[] { 0 }; Signatures = new uint[] { 0 };
} }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
uint unpacked_size = FormatCatalog.ReadSignature (stream); uint unpacked_size = stream.Signature;
if (unpacked_size <= 0x20 || unpacked_size > 0x5000000) // ~83MB if (unpacked_size <= 0x20 || unpacked_size > 0x5000000) // ~83MB
return null; return null;
using (var lzss = new LzssStream (stream, LzssMode.Decompress, true)) using (var lzss = new LzssStream (stream.AsStream, LzssMode.Decompress, true))
using (var input = new SeekableStream (lzss)) using (var input = new SeekableStream (lzss))
return base.ReadMetaData (input); using (var xtx = new BinaryStream (input))
return base.ReadMetaData (xtx);
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
stream.Position = 4; stream.Position = 4;
using (var lzss = new LzssStream (stream, LzssMode.Decompress, true)) using (var lzss = new LzssStream (stream.AsStream, LzssMode.Decompress, true))
using (var input = new SeekableStream (lzss)) using (var input = new SeekableStream (lzss))
return base.Read (input, info); using (var xtx = new BinaryStream (input))
return base.Read (xtx, info);
} }
public override void Write (Stream file, ImageData image) public override void Write (Stream file, ImageData image)

10
ArcFormats/Cri/ImageXTX.cs
View File

@ -51,11 +51,9 @@ namespace GameRes.Formats.Cri
Signatures = new uint[] { 0x00787478, 0 }; Signatures = new uint[] { 0x00787478, 0 };
} }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x20]; var header = stream.ReadHeader (0x20).ToArray();
if (0x20 != stream.Read (header, 0, 0x20))
return null;
if (!Binary.AsciiEqual (header, 0, "xtx\0")) if (!Binary.AsciiEqual (header, 0, "xtx\0"))
{ {
var header_size = LittleEndian.ToUInt32 (header, 0); var header_size = LittleEndian.ToUInt32 (header, 0);
@ -87,9 +85,9 @@ namespace GameRes.Formats.Cri
}; };
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var reader = new XtxReader (stream, (XtxMetaData)info); var reader = new XtxReader (stream.AsStream, (XtxMetaData)info);
var pixels = reader.Unpack(); var pixels = reader.Unpack();
return ImageData.Create (info, reader.Format, null, pixels); return ImageData.Create (info, reader.Format, null, pixels);
} }

14
ArcFormats/Crowd/ImageGAX.cs
View File

@ -41,14 +41,15 @@ namespace GameRes.Formats.Crowd
public override string Description { get { return "ANIM encrypted image"; } } public override string Description { get { return "ANIM encrypted image"; } }
public override uint Signature { get { return 0x01000000; } } public override uint Signature { get { return 0x01000000; } }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var key = new byte[0x10]; var key = new byte[0x10];
stream.Position = 4; stream.Position = 4;
if (key.Length != stream.Read (key, 0, key.Length)) if (key.Length != stream.Read (key, 0, key.Length))
return null; return null;
using (var enc = new InputProxyStream (stream, true)) using (var enc = new InputProxyStream (stream.AsStream, true))
using (var input = new CryptoStream (enc, new GaxTransform (key), CryptoStreamMode.Read)) using (var crypto = new CryptoStream (enc, new GaxTransform (key), CryptoStreamMode.Read))
using (var input = new BinaryStream (crypto, stream.Name))
{ {
var info = Png.ReadMetaData (input); var info = Png.ReadMetaData (input);
if (null == info) if (null == info)
@ -65,11 +66,12 @@ namespace GameRes.Formats.Crowd
} }
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var meta = (GaxMetaData)info; var meta = (GaxMetaData)info;
using (var enc = new StreamRegion (stream, 0x14, true)) using (var enc = new StreamRegion (stream.AsStream, 0x14, true))
using (var input = new CryptoStream (enc, new GaxTransform (meta.Key), CryptoStreamMode.Read)) using (var crypto = new CryptoStream (enc, new GaxTransform (meta.Key), CryptoStreamMode.Read))
using (var input = new BinaryStream (crypto, stream.Name))
return Png.Read (input, info); return Png.Read (input, info);
} }

7
ArcFormats/Cyberworks/AudioTINK.cs
View File

@ -59,7 +59,7 @@ namespace GameRes.Formats.Cyberworks
set { KnownKeys = ((TinkAudioScheme)value).KnownKeys; } set { KnownKeys = ((TinkAudioScheme)value).KnownKeys; }
} }
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
var header = new byte[Math.Min (0xE1F, file.Length)]; var header = new byte[Math.Min (0xE1F, file.Length)];
if (0x10 != file.Read (header, 0, 0x10)) if (0x10 != file.Read (header, 0, 0x10))
@ -89,8 +89,9 @@ namespace GameRes.Formats.Cyberworks
if (header.Length >= file.Length) if (header.Length >= file.Length)
input = new MemoryStream (header); input = new MemoryStream (header);
else else
input = new PrefixStream (header, new StreamRegion (file, file.Position)); input = new PrefixStream (header, new StreamRegion (file.AsStream, file.Position));
var sound = OggAudio.Instance.TryOpen (input); var ogg = new BinaryStream (input, file.Name);
var sound = OggAudio.Instance.TryOpen (ogg);
if (sound != null && header.Length >= file.Length) if (sound != null && header.Length >= file.Length)
file.Dispose(); file.Dispose();
return sound; return sound;

37
ArcFormats/EmonEngine/ImageBMP.cs
View File

@ -54,37 +54,34 @@ namespace GameRes.Formats.EmonEngine
Extensions = new string[] { "bmp" }; Extensions = new string[] { "bmp" };
} }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
using (var reader = new ArcView.Reader (stream)) stream.ReadInt32();
{ var info = new EmMetaData();
reader.ReadInt32(); info.LzssFrameSize = stream.ReadUInt16();
var info = new EmMetaData(); info.LzssInitPos = stream.ReadUInt16();
info.LzssFrameSize = reader.ReadUInt16(); info.BPP = stream.ReadUInt16() & 0xFF;
info.LzssInitPos = reader.ReadUInt16(); info.Width = stream.ReadUInt16();
info.BPP = reader.ReadUInt16() & 0xFF; info.Height = stream.ReadUInt16();
info.Width = reader.ReadUInt16(); info.Colors = stream.ReadUInt16();
info.Height = reader.ReadUInt16(); info.Stride = stream.ReadInt32();
info.Colors = reader.ReadUInt16(); info.OffsetX = stream.ReadInt32();
info.Stride = reader.ReadInt32(); info.OffsetY = stream.ReadInt32();
info.OffsetX = reader.ReadInt32(); info.DataOffset = 40;
info.OffsetY = reader.ReadInt32(); return info;
info.DataOffset = 40;
return info;
}
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var meta = (EmMetaData)info; var meta = (EmMetaData)info;
stream.Position = meta.DataOffset; stream.Position = meta.DataOffset;
BitmapPalette palette = null; BitmapPalette palette = null;
if (meta.Colors != 0) if (meta.Colors != 0)
palette = ReadPalette (stream, Math.Max (meta.Colors, 3)); palette = ReadPalette (stream.AsStream, Math.Max (meta.Colors, 3));
var pixels = new byte[meta.Stride * (int)info.Height]; var pixels = new byte[meta.Stride * (int)info.Height];
if (meta.LzssFrameSize != 0) if (meta.LzssFrameSize != 0)
{ {
using (var lzss = new LzssStream (stream, LzssMode.Decompress, true)) using (var lzss = new LzssStream (stream.AsStream, LzssMode.Decompress, true))
{ {
lzss.Config.FrameSize = meta.LzssFrameSize; lzss.Config.FrameSize = meta.LzssFrameSize;
lzss.Config.FrameInitPos = meta.LzssInitPos; lzss.Config.FrameInitPos = meta.LzssInitPos;

11
ArcFormats/ImageMB.cs
View File

@ -36,7 +36,7 @@ namespace GameRes.Formats
public override uint Signature { get { return 0; } } public override uint Signature { get { return 0; } }
public override bool CanWrite { get { return true; } } public override bool CanWrite { get { return true; } }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
int c1 = stream.ReadByte(); int c1 = stream.ReadByte();
int c2 = stream.ReadByte(); int c2 = stream.ReadByte();
@ -46,17 +46,18 @@ namespace GameRes.Formats
return base.ReadMetaData (bmp); return base.ReadMetaData (bmp);
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
using (var bmp = OpenAsBitmap (stream)) using (var bmp = OpenAsBitmap (stream))
return base.Read (bmp, info); return base.Read (bmp, info);
} }
Stream OpenAsBitmap (Stream input) IBinaryStream OpenAsBitmap (IBinaryStream input)
{ {
var header = new byte[2] { (byte)'B', (byte)'M' }; var header = new byte[2] { (byte)'B', (byte)'M' };
input = new StreamRegion (input, 2, true); Stream stream = new StreamRegion (input.AsStream, 2, true);
return new PrefixStream (header, input); stream = new PrefixStream (header, input);
return new BinaryStream (stream, input.Name);
} }
public override void Write (Stream file, ImageData image) public override void Write (Stream file, ImageData image)

2
ArcFormats/Ipac/AudioWST.cs
View File

@ -37,7 +37,7 @@ namespace GameRes.Formats.BaseUnit
public override string Description { get { return "IPAC ADPCM audio format"; } } public override string Description { get { return "IPAC ADPCM audio format"; } }
public override uint Signature { get { return 0x32545357; } } // 'WST2' public override uint Signature { get { return 0x32545357; } } // 'WST2'
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
var adpcm_data = new byte[0x20]; var adpcm_data = new byte[0x20];
file.Position = 12; file.Position = 12;

16
ArcFormats/Ipac/ImageIES.cs
View File

@ -38,20 +38,18 @@ namespace GameRes.Formats.BaseUnit
public override string Description { get { return "IPAC image format"; } } public override string Description { get { return "IPAC image format"; } }
public override uint Signature { get { return 0x32534549; } } // 'IES2' public override uint Signature { get { return 0x32534549; } } // 'IES2'
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x14]; var header = stream.ReadHeader (0x14);
if (header.Length != stream.Read (header, 0, header.Length))
return null;
return new ImageMetaData return new ImageMetaData
{ {
Width = LittleEndian.ToUInt32 (header, 0x08), Width = header.ToUInt32 (0x08),
Height = LittleEndian.ToUInt32 (header, 0x0C), Height = header.ToUInt32 (0x0C),
BPP = LittleEndian.ToInt32 (header, 0x10), BPP = header.ToInt32 (0x10),
}; };
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
if (24 == info.BPP) if (24 == info.BPP)
{ {
@ -78,7 +76,7 @@ namespace GameRes.Formats.BaseUnit
else if (8 == info.BPP) else if (8 == info.BPP)
{ {
stream.Position = 0x20; stream.Position = 0x20;
var palette = ReadPalette (stream); var palette = ReadPalette (stream.AsStream);
var pixels = new byte[info.Width * info.Height]; var pixels = new byte[info.Width * info.Height];
if (pixels.Length != stream.Read (pixels, 0, pixels.Length)) if (pixels.Length != stream.Read (pixels, 0, pixels.Length))
throw new EndOfStreamException(); throw new EndOfStreamException();

6
ArcFormats/Ivory/AudioCTRK.cs
View File

@ -43,7 +43,7 @@ namespace GameRes.Formats.Ivory
Signatures = new uint[] { 0x20585066, 0x4B525463 }; Signatures = new uint[] { 0x20585066, 0x4B525463 };
} }
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
var header = new byte[0x24]; var header = new byte[0x24];
if (8 != file.Read (header, 0, 8)) if (8 != file.Read (header, 0, 8))
@ -77,12 +77,12 @@ namespace GameRes.Formats.Ivory
}; };
format.BlockAlign = (ushort)(format.BitsPerSample * format.Channels / 8); format.BlockAlign = (ushort)(format.BitsPerSample * format.Channels / 8);
format.AverageBytesPerSecond = format.SamplesPerSecond * format.BlockAlign; format.AverageBytesPerSecond = format.SamplesPerSecond * format.BlockAlign;
var input = new StreamRegion (file, start_offset, data_length); var input = new StreamRegion (file.AsStream, start_offset, data_length);
return new RawPcmInput (input, format); return new RawPcmInput (input, format);
} }
else if (2 == type) else if (2 == type)
{ {
using (var decoder = new TrkDecoder (file, header, start_offset, data_length)) using (var decoder = new TrkDecoder (file.AsStream, header, start_offset, data_length))
{ {
var pcm = decoder.Decode(); var pcm = decoder.Decode();
return new RawPcmInput (new MemoryStream (pcm), decoder.Format); return new RawPcmInput (new MemoryStream (pcm), decoder.Format);

93
ArcFormats/Ivory/ImageMMD.cs
View File

@ -47,78 +47,73 @@ namespace GameRes.Formats.Ivory
public override string Description { get { return "Ivory image format"; } } public override string Description { get { return "Ivory image format"; } }
public override uint Signature { get { return 0x1A444D4D; } } // 'MMD' public override uint Signature { get { return 0x1A444D4D; } } // 'MMD'
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x18]; var header = stream.ReadHeader (0x18);
if (header.Length != stream.Read (header, 0, header.Length))
return null;
var info = new MmdMetaData var info = new MmdMetaData
{ {
Width = LittleEndian.ToUInt16 (header, 4), Width = header.ToUInt16 (4),
Height = LittleEndian.ToUInt16 (header, 6), Height = header.ToUInt16 (6),
BPP = 8, BPP = 8,
Size1 = LittleEndian.ToInt32 (header, 8), Size1 = header.ToInt32 (8),
Size2 = LittleEndian.ToInt32 (header, 0x0C), Size2 = header.ToInt32 (0x0C),
Size3 = LittleEndian.ToInt32 (header, 0x10), Size3 = header.ToInt32 (0x10),
Colors = LittleEndian.ToInt32 (header, 0x14), Colors = header.ToInt32 (0x14),
}; };
if (info.Size1 <= 0 || info.Size2 <= info.Size1 || info.Size3 <= 0) if (info.Size1 <= 0 || info.Size2 <= info.Size1 || info.Size3 <= 0)
return null; return null;
return info; return info;
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream input, ImageMetaData info)
{ {
var meta = (MmdMetaData)info; var meta = (MmdMetaData)info;
var pixels = new byte[info.Width * info.Height]; var pixels = new byte[info.Width * info.Height];
stream.Position = 0x18; input.Position = 0x18;
using (var input = new ArcView.Reader (stream)) var buf1 = input.ReadBytes (meta.Size1);
var buf2 = input.ReadBytes (meta.Size2 - meta.Size1);
int w = (int)info.Width / 4;
var line = new byte[w];
int mask = 0x80;
int b1 = 0;
int b2 = 0;
int dst = 0;
for (int y = (int)info.Height; y > 0; --y)
{ {
var buf1 = input.ReadBytes (meta.Size1); for (int x = 0; x < w; ++x)
var buf2 = input.ReadBytes (meta.Size2 - meta.Size1);
int w = (int)info.Width / 4;
var line = new byte[w];
int mask = 0x80;
int b1 = 0;
int b2 = 0;
int dst = 0;
for (int y = (int)info.Height; y > 0; --y)
{ {
for (int x = 0; x < w; ++x) if (0 != (mask & buf1[b1]))
{ {
if (0 != (mask & buf1[b1])) line[x] ^= buf2[b2++];
}
mask >>= 1;
if (0 == mask)
{
mask = 0x80;
++b1;
}
byte p = line[x];
int q = p >> 4;
for (int j = 0; j < 2; ++j)
{
if (0 != q)
{ {
line[x] ^= buf2[b2++]; int offset = ShiftTable[q + 16] + (int)info.Width * ShiftTable[q];
int src = dst - offset;
pixels[dst++] = pixels[src];
pixels[dst++] = pixels[src+1];
} }
mask >>= 1; else
if (0 == mask)
{ {
mask = 0x80; input.Read (pixels, dst, 2);
++b1; dst += 2;
}
byte p = line[x];
int q = p >> 4;
for (int j = 0; j < 2; ++j)
{
if (0 != q)
{
int offset = ShiftTable[q + 16] + (int)info.Width * ShiftTable[q];
int src = dst - offset;
pixels[dst++] = pixels[src];
pixels[dst++] = pixels[src+1];
}
else
{
input.Read (pixels, dst, 2);
dst += 2;
}
q = p & 0xF;
} }
q = p & 0xF;
} }
} }
} }
stream.Position = 0x18 + meta.Size2 + meta.Size3; input.Position = 0x18 + meta.Size2 + meta.Size3;
var palette = ReadPalette (stream, meta.Colors); var palette = ReadPalette (input.AsStream, meta.Colors);
return ImageData.Create (info, PixelFormats.Indexed8, palette, pixels); return ImageData.Create (info, PixelFormats.Indexed8, palette, pixels);
} }

8
ArcFormats/Ivory/ImageMOE.cs
View File

@ -37,19 +37,19 @@ namespace GameRes.Formats.Ivory
public override string Description { get { return "Ivory image format"; } } public override string Description { get { return "Ivory image format"; } }
public override uint Signature { get { return 0; } } public override uint Signature { get { return 0; } }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var wh = FormatCatalog.ReadSignature (stream); var wh = stream.Signature;
uint width = wh & 0xFFFF; uint width = wh & 0xFFFF;
uint height = wh >> 16; uint height = wh >> 16;
if (0 == width || width > 800 || 0 == height || height > 600) if (0 == width || width > 800 || 0 == height || height > 600)
return null; return null;
if (!IsValidInput (stream, width, height)) if (!IsValidInput (stream.AsStream, width, height))
return null; return null;
return new ImageMetaData { Width = width, Height = height, BPP = 24 }; return new ImageMetaData { Width = width, Height = height, BPP = 24 };
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
stream.Position = 4; stream.Position = 4;
var pixels = new byte[3 * info.Width * info.Height]; var pixels = new byte[3 * info.Width * info.Height];

34
ArcFormats/Ivory/ImageSG.cs
View File

@ -53,11 +53,11 @@ namespace GameRes.Formats.Ivory
public override string Description { get { return "Ivory image format"; } } public override string Description { get { return "Ivory image format"; } }
public override uint Signature { get { return 0x20475366; } } // 'fSG ' public override uint Signature { get { return 0x20475366; } } // 'fSG '
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
stream.Position = 8; stream.Position = 8;
var header = new byte[0x24]; var header = stream.ReadBytes (0x24);
if (header.Length != stream.Read (header, 0, header.Length)) if (header.Length != 0x24)
return null; return null;
int header_size = LittleEndian.ToInt32 (header, 8); int header_size = LittleEndian.ToInt32 (header, 8);
if (Binary.AsciiEqual (header, "cRGB")) if (Binary.AsciiEqual (header, "cRGB"))
@ -90,7 +90,7 @@ namespace GameRes.Formats.Ivory
return null; return null;
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var meta = (SgMetaData)info; var meta = (SgMetaData)info;
if (SgType.cRGB == meta.Type) if (SgType.cRGB == meta.Type)
@ -107,11 +107,11 @@ namespace GameRes.Formats.Ivory
} }
} }
ImageData ReadJpeg (Stream stream, SgMetaData info) ImageData ReadJpeg (IBinaryStream stream, SgMetaData info)
{ {
stream.Position = info.DataOffset; stream.Position = info.DataOffset;
var input = new byte[info.DataSize]; var input = stream.ReadBytes (info.DataSize);
if (input.Length != stream.Read (input, 0, input.Length)) if (input.Length != info.DataSize)
throw new EndOfStreamException(); throw new EndOfStreamException();
PakOpener.Decrypt (input, info.JpegKey); PakOpener.Decrypt (input, info.JpegKey);
using (var img = new MemoryStream (input)) using (var img = new MemoryStream (input))
@ -131,7 +131,7 @@ namespace GameRes.Formats.Ivory
internal sealed class SgRgbReader : IDisposable internal sealed class SgRgbReader : IDisposable
{ {
BinaryReader m_input; IBinaryStream m_input;
SgMetaData m_info; SgMetaData m_info;
int m_width; int m_width;
int m_height; int m_height;
@ -148,7 +148,7 @@ namespace GameRes.Formats.Ivory
{ {
if (info.Type != SgType.cRGB || !(0x18 == info.BPP || 0x20 == info.BPP)) if (info.Type != SgType.cRGB || !(0x18 == info.BPP || 0x20 == info.BPP))
throw new InvalidFormatException(); throw new InvalidFormatException();
m_input = new ArcView.Reader (input); m_input = input;
m_info = info; m_info = info;
m_width = (int)info.Width; m_width = (int)info.Width;
m_height = (int)info.Height; m_height = (int)info.Height;
@ -158,7 +158,7 @@ namespace GameRes.Formats.Ivory
public void Unpack () public void Unpack ()
{ {
m_input.BaseStream.Position = m_info.DataOffset; m_input.Position = m_info.DataOffset;
switch (m_info.RgbMode) switch (m_info.RgbMode)
{ {
case 0: UnpackV0(); break; case 0: UnpackV0(); break;
@ -243,11 +243,11 @@ namespace GameRes.Formats.Ivory
var index = new int[m_height]; var index = new int[m_height];
for (int i = 0; i < m_height; ++i) for (int i = 0; i < m_height; ++i)
index[i] = m_input.ReadInt32(); index[i] = m_input.ReadInt32();
var data_pos = m_input.BaseStream.Position; var data_pos = m_input.Position;
int dst = 0; int dst = 0;
for (int y = 0; y < m_height; ++y) for (int y = 0; y < m_height; ++y)
{ {
m_input.BaseStream.Position = data_pos + index[y]; m_input.Position = data_pos + index[y];
for (int x = 0; x < m_width; ) for (int x = 0; x < m_width; )
{ {
int ctl = m_input.ReadByte(); int ctl = m_input.ReadByte();
@ -282,9 +282,9 @@ namespace GameRes.Formats.Ivory
var index = new int[m_height]; var index = new int[m_height];
for (int i = 0; i < m_height; ++i) for (int i = 0; i < m_height; ++i)
index[i] = m_input.ReadInt32(); index[i] = m_input.ReadInt32();
var data_pos = m_input.BaseStream.Position; var data_pos = m_input.Position;
int dst = 0; int dst = 0;
using (var bits = new LsbBitStream (m_input.BaseStream, true)) using (var bits = new LsbBitStream (m_input.AsStream, true))
{ {
for (int y = 0; y < m_height; ++y) for (int y = 0; y < m_height; ++y)
{ {
@ -358,14 +358,8 @@ namespace GameRes.Formats.Ivory
} }
#region IDisposable Members #region IDisposable Members
bool _disposed = false;
public void Dispose () public void Dispose ()
{ {
if (!_disposed)
{
m_input.Dispose();
_disposed = true;
}
} }
#endregion #endregion
} }

26
ArcFormats/KScript/ImageKGP.cs
View File

@ -45,22 +45,21 @@ namespace GameRes.Formats.KScript
public override string Description { get { return "KScript image format"; } } public override string Description { get { return "KScript image format"; } }
public override uint Signature { get { return 0x48505247; } } // 'GRPH' public override uint Signature { get { return 0x48505247; } } // 'GRPH'
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x1C]; var header = stream.ReadHeader (0x1C);
if (header.Length != stream.Read (header, 0, header.Length))
return null;
byte key = (byte)(header[4] ^ header[5]); byte key = (byte)(header[4] ^ header[5]);
int data_offset = 0x14; int data_offset = 0x14;
int x = 0, y = 0; int x = 0, y = 0;
if (0 != header[0xC]) if (0 != header[0xC])
{ {
data_offset += LittleEndian.ToInt32 (header, 0x10) / 0x10 * 0x18; data_offset += header.ToInt32 (0x10) / 0x10 * 0x18;
x = LittleEndian.ToInt32 (header, 0x14); x = header.ToInt32 (0x14);
y = LittleEndian.ToInt32 (header, 0x18); y = header.ToInt32 (0x18);
} }
using (var input = new StreamRegion (stream, data_offset, true)) using (var input = new StreamRegion (stream.AsStream, data_offset, true))
using (var png = new CryptoStream (input, new XorTransform (key), CryptoStreamMode.Read)) using (var crypto = new CryptoStream (input, new XorTransform (key), CryptoStreamMode.Read))
using (var png = new BinaryStream (crypto, stream.Name))
{ {
var info = Png.ReadMetaData (png); var info = Png.ReadMetaData (png);
if (null == info) if (null == info)
@ -74,16 +73,17 @@ namespace GameRes.Formats.KScript
BPP = info.BPP, BPP = info.BPP,
Key = key, Key = key,
DataOffset = data_offset, DataOffset = data_offset,
DataLength = LittleEndian.ToInt32 (header, 8), DataLength = header.ToInt32 (8),
}; };
} }
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var meta = (KgpMetaData)info; var meta = (KgpMetaData)info;
using (var input = new StreamRegion (stream, meta.DataOffset, true)) using (var input = new StreamRegion (stream.AsStream, meta.DataOffset, true))
using (var png = new CryptoStream (input, new XorTransform (meta.Key), CryptoStreamMode.Read)) using (var crypto = new CryptoStream (input, new XorTransform (meta.Key), CryptoStreamMode.Read))
using (var png = new BinaryStream (crypto, stream.Name))
return Png.Read (png, info); return Png.Read (png, info);
} }

17
ArcFormats/KScript/ImageKSL.cs
View File

@ -43,27 +43,24 @@ namespace GameRes.Formats.KScript
public override string Description { get { return "KScript grayscale image format"; } } public override string Description { get { return "KScript grayscale image format"; } }
public override uint Signature { get { return 0x4D4C534B; } } // 'KSLM' public override uint Signature { get { return 0x4D4C534B; } } // 'KSLM'
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x14]; var header = stream.ReadHeader (0x14);
if (header.Length != stream.Read (header, 0, header.Length))
return null;
return new KslMetaData return new KslMetaData
{ {
Width = LittleEndian.ToUInt32 (header, 0xC), Width = header.ToUInt32 (0xC),
Height = LittleEndian.ToUInt32 (header, 0x10), Height = header.ToUInt32 (0x10),
BPP = 8, BPP = 8,
Key = (byte)(header[4] ^ header[5]), Key = (byte)(header[4] ^ header[5]),
DataLength = LittleEndian.ToInt32 (header, 8), DataLength = header.ToInt32 (8),
}; };
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
var meta = (KslMetaData)info; var meta = (KslMetaData)info;
var pixels = new byte[meta.DataLength];
stream.Position = 0x14; stream.Position = 0x14;
stream.Read (pixels, 0, pixels.Length); var pixels = stream.ReadBytes (meta.DataLength);
for (int i = 0; i < pixels.Length; ++i) for (int i = 0; i < pixels.Length; ++i)
pixels[i] ^= meta.Key; pixels[i] ^= meta.Key;
return ImageData.Create (info, PixelFormats.Gray8, null, pixels); return ImageData.Create (info, PixelFormats.Gray8, null, pixels);

12
ArcFormats/Leaf/AudioG.cs
View File

@ -43,17 +43,15 @@ namespace GameRes.Formats.Leaf
Extensions = new string[] { "g" }; Extensions = new string[] { "g" };
} }
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
var header = new byte[0x1C]; var header = file.ReadHeader (0x1C);
if (header.Length != file.Read (header, 0, header.Length)) if (header.AsciiEqual ("OggS") || header.AsciiEqual ("RIFF"))
return null; return null;
if (Binary.AsciiEqual (header, "OggS") || Binary.AsciiEqual (header, "RIFF")) if (header[4] != 0 || header[5] != 2 || header.ToInt64 (6) != 0)
return null;
if (header[4] != 0 || header[5] != 2 || LittleEndian.ToInt64 (header, 6) != 0)
return null; return null;
file.Position = 0; file.Position = 0;
var input = new GStream (file); var input = new GStream (file.AsStream);
return new OggInput (new SeekableStream (input)); return new OggInput (new SeekableStream (input));
} }
} }

16
ArcFormats/Leaf/AudioW.cs
View File

@ -41,27 +41,25 @@ namespace GameRes.Formats.Leaf
Extensions = new string[] { "w" }; Extensions = new string[] { "w" };
} }
public override SoundInput TryOpen (Stream file) public override SoundInput TryOpen (IBinaryStream file)
{ {
var header = new byte[0x12]; var header = file.ReadHeader (0x12);
if (header.Length != file.Read (header, 0, header.Length))
return null;
var format = new WaveFormat var format = new WaveFormat
{ {
FormatTag = 1, FormatTag = 1,
Channels = header[0], Channels = header[0],
SamplesPerSecond = LittleEndian.ToUInt16 (header, 2), SamplesPerSecond = header.ToUInt16 (2),
AverageBytesPerSecond = LittleEndian.ToUInt32 (header, 6), AverageBytesPerSecond = header.ToUInt32 (6),
BlockAlign = header[1], BlockAlign = header[1],
BitsPerSample = LittleEndian.ToUInt16 (header, 4), BitsPerSample = header.ToUInt16 (4),
}; };
uint pcm_size = LittleEndian.ToUInt32 (header, 0xA); uint pcm_size = header.ToUInt32 (0xA);
if (0 == pcm_size || 0 == format.AverageBytesPerSecond || format.BitsPerSample < 8 if (0 == pcm_size || 0 == format.AverageBytesPerSecond || format.BitsPerSample < 8
|| 0 == format.Channels || format.Channels > 8 || 0 == format.Channels || format.Channels > 8
|| (format.BlockAlign * format.SamplesPerSecond != format.AverageBytesPerSecond) || (format.BlockAlign * format.SamplesPerSecond != format.AverageBytesPerSecond)
|| (pcm_size + 0x12 != file.Length)) || (pcm_size + 0x12 != file.Length))
return null; return null;
var pcm = new StreamRegion (file, 0x12, pcm_size); var pcm = new StreamRegion (file.AsStream, 0x12, pcm_size);
return new RawPcmInput (pcm, format); return new RawPcmInput (pcm, format);
} }
} }

14
ArcFormats/Leaf/ImageLGF.cs
View File

@ -44,28 +44,26 @@ namespace GameRes.Formats.Leaf
Signatures = new uint[] { 0x1866676C, 0x2066676C, 0x0966676C }; Signatures = new uint[] { 0x1866676C, 0x2066676C, 0x0966676C };
} }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[8]; var header = stream.ReadHeader (8);
if (8 != stream.Read (header, 0, 8))
return null;
int bpp = header[3]; int bpp = header[3];
return new ImageMetaData return new ImageMetaData
{ {
Width = LittleEndian.ToUInt16 (header, 4), Width = header.ToUInt16 (4),
Height = LittleEndian.ToUInt16 (header, 6), Height = header.ToUInt16 (6),
BPP = 9 == bpp ? 8 : bpp, BPP = 9 == bpp ? 8 : bpp,
}; };
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
int stride = (int)info.Width * info.BPP / 8; int stride = (int)info.Width * info.BPP / 8;
var pixels = new byte[stride * (int)info.Height]; var pixels = new byte[stride * (int)info.Height];
stream.Position = 12; stream.Position = 12;
BitmapPalette palette = null; BitmapPalette palette = null;
if (8 == info.BPP) if (8 == info.BPP)
palette = ReadPalette (stream); palette = ReadPalette (stream.AsStream);
if (pixels.Length != stream.Read (pixels, 0, pixels.Length)) if (pixels.Length != stream.Read (pixels, 0, pixels.Length))
throw new EndOfStreamException(); throw new EndOfStreamException();
PixelFormat format = 24 == info.BPP ? PixelFormats.Bgr24 PixelFormat format = 24 == info.BPP ? PixelFormats.Bgr24

62
ArcFormats/Leaf/ImagePX.cs
View File

@ -49,23 +49,21 @@ namespace GameRes.Formats.Leaf
public override string Description { get { return "Leaf image format"; } } public override string Description { get { return "Leaf image format"; } }
public override uint Signature { get { return 0; } } public override uint Signature { get { return 0; } }
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
{ {
var header = new byte[0x20]; var header = stream.ReadHeader (0x20);
if (header.Length != stream.Read (header, 0, header.Length)) int type = header.ToUInt16 (0x10);
return null;
int type = LittleEndian.ToUInt16 (header, 0x10);
if (0x0C == type) if (0x0C == type)
{ {
int count = LittleEndian.ToInt32 (header, 0); int count = header.ToInt32 (0);
if (!ArchiveFormat.IsSaneCount (count)) if (!ArchiveFormat.IsSaneCount (count))
return null; return null;
int block_size = LittleEndian.ToInt32 (header, 4); int block_size = header.ToInt32 (4);
if (block_size <= 0) if (block_size <= 0)
return null; return null;
int bpp = LittleEndian.ToUInt16 (header, 0x12); int bpp = header.ToUInt16 (0x12);
uint width = LittleEndian.ToUInt16 (header, 0x14); uint width = header.ToUInt16 (0x14);
uint height = LittleEndian.ToUInt16 (header, 0x16); uint height = header.ToUInt16 (0x16);
if (bpp != 32 || 0 == width || 0 == height) if (bpp != 32 || 0 == width || 0 == height)
return null; return null;
return new PxMetaData return new PxMetaData
@ -76,34 +74,35 @@ namespace GameRes.Formats.Leaf
Type = type, Type = type,
FrameCount = count, FrameCount = count,
BlockSize = block_size, BlockSize = block_size,
BlocksWidth = LittleEndian.ToUInt16 (header, 0x1C), BlocksWidth = header.ToUInt16 (0x1C),
BlocksHeight = LittleEndian.ToUInt16 (header, 0x1E), BlocksHeight = header.ToUInt16 (0x1E),
}; };
} }
else if (0x80 == type || 0x90 == type) else if (0x80 == type || 0x90 == type)
{ {
if (!Binary.AsciiEqual (header, 0x14, "Leaf")) if (!header.AsciiEqual (0x14, "Leaf"))
return null; return null;
int count = LittleEndian.ToInt32 (header, 4); int count = header.ToInt32 (4);
if (!ArchiveFormat.IsSaneCount (count)) if (!ArchiveFormat.IsSaneCount (count))
return null; return null;
if (0x20 != stream.Read (header, 0, 0x20)) var header_ex = stream.ReadBytes (0x20);
if (0x20 != header_ex.Length)
return null; return null;
if (0x0A != LittleEndian.ToUInt16 (header, 0x10)) if (0x0A != LittleEndian.ToUInt16 (header_ex, 0x10))
return null; return null;
return new PxMetaData return new PxMetaData
{ {
Width = LittleEndian.ToUInt32 (header, 0), Width = LittleEndian.ToUInt32 (header_ex, 0),
Height = LittleEndian.ToUInt32 (header, 0), Height = LittleEndian.ToUInt32 (header_ex, 0),
BPP = LittleEndian.ToUInt16 (header, 0x12), BPP = LittleEndian.ToUInt16 (header_ex, 0x12),
Type = type, Type = type,
FrameCount = count, FrameCount = count,
}; };
} }
return null; return null;
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
using (var reader = new PxReader (stream, (PxMetaData)info)) using (var reader = new PxReader (stream, (PxMetaData)info))
{ {
@ -120,7 +119,7 @@ namespace GameRes.Formats.Leaf
internal sealed class PxReader : IDisposable internal sealed class PxReader : IDisposable
{ {
BinaryReader m_input; IBinaryStream m_input;
PxMetaData m_info; PxMetaData m_info;
byte[] m_output; byte[] m_output;
int m_pixel_size; int m_pixel_size;
@ -131,9 +130,9 @@ namespace GameRes.Formats.Leaf
public int Stride { get { return m_stride; } } public int Stride { get { return m_stride; } }
public int FrameCount { get { return m_info.FrameCount; } } public int FrameCount { get { return m_info.FrameCount; } }
public PxReader (Stream input, PxMetaData info) public PxReader (IBinaryStream input, PxMetaData info)
{ {
m_input = new ArcView.Reader (input); m_input = input;
m_info = info; m_info = info;
m_pixel_size = m_info.BPP / 8; m_pixel_size = m_info.BPP / 8;
m_stride = (int)m_info.Width * m_pixel_size; m_stride = (int)m_info.Width * m_pixel_size;
@ -156,10 +155,9 @@ namespace GameRes.Formats.Leaf
void Unpack0C (int frame) void Unpack0C (int frame)
{ {
var stream = m_input.BaseStream;
int block_count = m_info.BlocksWidth * m_info.BlocksHeight; int block_count = m_info.BlocksWidth * m_info.BlocksHeight;
var block_table = new ushort[block_count]; var block_table = new ushort[block_count];
stream.Position = 0x20 + frame * block_count * 2; m_input.Position = 0x20 + frame * block_count * 2;
for (int i = 0; i < block_count; ++i) for (int i = 0; i < block_count; ++i)
block_table[i] = m_input.ReadUInt16(); block_table[i] = m_input.ReadUInt16();
int data_pos = 0x20 + FrameCount * block_count * 2; int data_pos = 0x20 + FrameCount * block_count * 2;
@ -174,7 +172,7 @@ namespace GameRes.Formats.Leaf
int block_num = block_table[current_block++]; int block_num = block_table[current_block++];
if (block_num != 0) if (block_num != 0)
{ {
stream.Position = data_pos + (block_num - 1) * block_length; m_input.Position = data_pos + (block_num - 1) * block_length;
int block_width = m_input.ReadByte() - 2; int block_width = m_input.ReadByte() - 2;
int block_height = m_input.ReadByte() - 2; int block_height = m_input.ReadByte() - 2;
int line_length = block_width * m_pixel_size; int line_length = block_width * m_pixel_size;
@ -182,7 +180,7 @@ namespace GameRes.Formats.Leaf
{ {
m_input.Read (m_output, dst, line_length); m_input.Read (m_output, dst, line_length);
dst += m_stride; dst += m_stride;
stream.Seek (8, SeekOrigin.Current); m_input.Seek (8, SeekOrigin.Current);
} }
} }
} }
@ -192,7 +190,7 @@ namespace GameRes.Formats.Leaf
void Unpack90 (int frame) void Unpack90 (int frame)
{ {
m_input.BaseStream.Position = 0x40 + frame * (0x20 + m_output.Length); m_input.Position = 0x40 + frame * (0x20 + m_output.Length);
if (m_output.Length != m_input.Read (m_output, 0, m_output.Length)) if (m_output.Length != m_input.Read (m_output, 0, m_output.Length))
throw new EndOfStreamException(); throw new EndOfStreamException();
} }
@ -203,14 +201,8 @@ namespace GameRes.Formats.Leaf
} }
#region IDisposable Members #region IDisposable Members
bool _disposed = false;
public void Dispose () public void Dispose ()
{ {
if (!_disposed)
{
m_input.Dispose();
_disposed = true;
}
} }
#endregion #endregion
} }

71
ArcFormats/elf/ImageGPH.cs
View File

@ -46,41 +46,38 @@ namespace GameRes.Formats.Elf
public override string Description { get { return "Elf GPH image format"; } } public override string Description { get { return "Elf GPH image format"; } }
public override uint Signature { get { return 0x1D485047; } } // 'GPH\x1D' public override uint Signature { get { return 0x1D485047; } } // 'GPH\x1D'
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (IBinaryStream input)
{ {
stream.Position = 4; input.Position = 4;
using (var input = new ArcView.Reader (stream)) int frame_count = input.ReadUInt16();
int frame_offset = input.ReadInt32();
if (0 == frame_count || frame_offset > input.Length)
return null;
input.Position = frame_offset;
int frame_length = input.ReadInt32();
int flags = input.ReadUInt16();
if (0 == (flags & 4))
input.Seek (0x20, SeekOrigin.Current);
int left = input.ReadInt16();
int top = input.ReadInt16();
int right = input.ReadInt16() + 1;
int bottom = input.ReadInt16() + 1;
left *= 2;
right *= 2;
return new GphMetaData
{ {
int frame_count = input.ReadUInt16(); Width = (uint)(right - left),
int frame_offset = input.ReadInt32(); Height = (uint)(bottom - top),
if (0 == frame_count || frame_offset > stream.Length) OffsetX = left,
return null; OffsetY = top,
stream.Position = frame_offset; BPP = 4,
int frame_length = input.ReadInt32(); DataOffset = frame_offset+4,
int flags = input.ReadUInt16(); DataSize = frame_length,
if (0 == (flags & 4)) Flags = flags,
stream.Seek (0x20, SeekOrigin.Current); };
int left = input.ReadInt16();
int top = input.ReadInt16();
int right = input.ReadInt16() + 1;
int bottom = input.ReadInt16() + 1;
left *= 2;
right *= 2;
return new GphMetaData
{
Width = (uint)(right - left),
Height = (uint)(bottom - top),
OffsetX = left,
OffsetY = top,
BPP = 4,
DataOffset = frame_offset+4,
DataSize = frame_length,
Flags = flags,
};
}
} }
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{ {
using (var reader = new GphReader (stream, (GphMetaData)info)) using (var reader = new GphReader (stream, (GphMetaData)info))
{ {
@ -97,7 +94,7 @@ namespace GameRes.Formats.Elf
internal sealed class GphReader : IDisposable internal sealed class GphReader : IDisposable
{ {
BinaryReader m_input; IBinaryStream m_input;
GphMetaData m_info; GphMetaData m_info;
byte[] m_output; byte[] m_output;
@ -106,9 +103,9 @@ namespace GameRes.Formats.Elf
public BitmapPalette Palette { get; private set; } public BitmapPalette Palette { get; private set; }
public int Stride { get; private set; } public int Stride { get; private set; }
public GphReader (Stream input, GphMetaData info) public GphReader (IBinaryStream input, GphMetaData info)
{ {
m_input = new ArcView.Reader (input); m_input = input;
m_info = info; m_info = info;
Stride = (int)m_info.Width / 2; Stride = (int)m_info.Width / 2;
m_output = new byte[Stride * (int)m_info.Height]; m_output = new byte[Stride * (int)m_info.Height];
@ -437,14 +434,8 @@ namespace GameRes.Formats.Elf
} }
#region IDisposable Members #region IDisposable Members
bool _disposed = false;
public void Dispose () public void Dispose ()
{ {
if (!_disposed)
{
m_input.Dispose();
_disposed = true;
}
} }
#endregion #endregion
} }

57
GameRes/BinaryStream.cs
View File

@ -133,9 +133,7 @@ namespace GameRes
{ {
if (!m_own_copy) if (!m_own_copy)
{ {
m_source = ToArray(); Reclaim();
m_offset = 0;
m_own_copy = true;
} }
m_source[pos] = value; m_source[pos] = value;
} }
@ -160,6 +158,13 @@ namespace GameRes
Array.Copy (m_source, m_offset, copy, 0, m_count); Array.Copy (m_source, m_offset, copy, 0, m_count);
return copy; return copy;
} }
internal void Reclaim ()
{
m_source = ToArray();
m_offset = 0;
m_own_copy = true;
}
} }
public static class CowByteArray public static class CowByteArray
@ -198,6 +203,24 @@ namespace GameRes
{ {
return (long)ToUInt64 (arr, index); return (long)ToUInt64 (arr, index);
} }
public static bool AsciiEqual (this CowArray<byte> arr, int index, string str)
{
arr.Reclaim();
return Binary.AsciiEqual (arr.ToArray(), index, str);
}
public static bool AsciiEqual (this CowArray<byte> arr, string str)
{
arr.Reclaim();
return Binary.AsciiEqual (arr.ToArray(), str);
}
public static string GetCString (this CowArray<byte> arr, int index, int length_limit)
{
arr.Reclaim();
return Binary.GetCString (arr.ToArray(), index, length_limit);
}
} }
public class BinaryStream : Stream, IBinaryStream public class BinaryStream : Stream, IBinaryStream
@ -224,22 +247,22 @@ namespace GameRes
m_buffer = new byte[0x10]; m_buffer = new byte[0x10];
m_buffer_pos = 0; m_buffer_pos = 0;
m_buffer_end = 0; m_buffer_end = 0;
m_signature = new Lazy<uint> (ReadSignature);
m_header_size = 0; m_header_size = 0;
Name = name ?? ""; Name = name ?? "";
if (!input.CanSeek) m_source = input;
m_should_dispose = !leave_open;
if (!m_source.CanSeek)
{ {
m_source = new MemoryStream(); m_buffer_end = m_source.Read (m_buffer, 0, 4);
input.CopyTo (m_source); if (4 == m_buffer_end)
m_should_dispose = true; {
if (!leave_open) uint signature = LittleEndian.ToUInt32 (m_buffer, 0);
input.Dispose(); m_signature = new Lazy<uint> (() => signature);
m_source.Position = 0; }
} }
else else
{ {
m_source = input; m_signature = new Lazy<uint> (ReadSignature);
m_should_dispose = !leave_open;
} }
} }
@ -265,6 +288,8 @@ namespace GameRes
public CowArray<byte> ReadHeader (int size) public CowArray<byte> ReadHeader (int size)
{ {
if (!CanSeek)
throw new NotSupportedException ("Unseekable stream");
if (m_header_size < size) if (m_header_size < size)
{ {
if (null == m_header || m_header.Length < size) if (null == m_header || m_header.Length < size)
@ -272,7 +297,11 @@ namespace GameRes
Position = m_header_size; Position = m_header_size;
m_header_size += Read (m_header, m_header_size, size - m_header_size); m_header_size += Read (m_header, m_header_size, size - m_header_size);
} }
size = Math.Min (size, m_header_size); if (size > m_header_size)
{
Position = m_header_size;
throw new EndOfStreamException();
}
Position = size; Position = size;
return new CowArray<byte> (m_header, 0, size); return new CowArray<byte> (m_header, 0, size);
} }

2
GameRes/ImageBMP.cs
View File

@ -63,7 +63,7 @@ namespace GameRes
public override ImageData Read (IBinaryStream file, ImageMetaData info) public override ImageData Read (IBinaryStream file, ImageMetaData info)
{ {
var bmp_info = info as BmpMetaData; var bmp_info = info as BmpMetaData;
if (bmp_info != null && EnableExtensions) if (bmp_info != null && EnableExtensions && file.AsStream.CanSeek)
{ {
foreach (var ext in m_extensions) foreach (var ext in m_extensions)
{ {