lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

IBinaryStream migration.

Browse Source
This commit is contained in:
morkt
2016-10-16 09:22:53 +04:00
parent d0c1d5da01
commit bb18303eb4
251 changed files with 3277 additions and 3630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ArcFormats/Yuka/ArcYKC.cs
View File

@@ -93,15 +93,14 @@ namespace GameRes.Formats.Yuka
|| !entry.Name.EndsWith (".yks", StringComparison.InvariantCultureIgnoreCase)
|| !arc.File.View.AsciiEqual (entry.Offset, "YKS001")
|| 1 != arc.File.View.ReadUInt16 (entry.Offset+6))
return arc.File.CreateStream (entry.Offset, entry.Size);
return base.OpenEntry (arc, entry);
// decrypt script contents
var data = new byte[entry.Size];
arc.File.View.Read (entry.Offset, data, 0, entry.Size);
var data = arc.File.View.ReadBytes (entry.Offset, entry.Size);
uint text_offset = LittleEndian.ToUInt32 (data, 0x20);
for (uint i = text_offset; i < data.Length; ++i)
data[i] ^= 0xAA;
data[6] = 0;
return new MemoryStream (data);
return new BinMemoryStream (data, entry.Name);
}
public override void Create (Stream output, IEnumerable<Entry> list, ResourceOptions options,

52
ArcFormats/Yuka/ImageYKG.cs
View File

@@ -52,44 +52,43 @@ namespace GameRes.Formats.Yuka
static readonly byte[] PngPrefix = new byte[4] { 0x89, 'P'^0, 'N'^0, 'G'^0 };
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream file)
{
var header = new byte[0x40];
if (header.Length != stream.Read (header, 0, header.Length))
return null;
if (!Binary.AsciiEqual (header, 4, "00\0\0"))
var header = file.ReadHeader (0x40);
if (!header.AsciiEqual (4, "00\0\0"))
return null;
var ykg = new YkgMetaData {
DataOffset = LittleEndian.ToUInt32 (header, 0x28),
DataSize = LittleEndian.ToUInt32 (header, 0x2C)
DataOffset = header.ToUInt32 (0x28),
DataSize = header.ToUInt32 (0x2C)
};
if (0 == ykg.DataOffset)
ykg.DataOffset = LittleEndian.ToUInt32 (header, 8);
ykg.DataOffset = header.ToUInt32 (8);
if (ykg.DataOffset < 0x30)
return null;
if (0 == ykg.DataSize)
ykg.DataSize = (uint)(stream.Length - ykg.DataOffset);
ykg.DataSize = (uint)(file.Length - ykg.DataOffset);
ImageMetaData info = null;
using (var img = new StreamRegion (stream, ykg.DataOffset, ykg.DataSize, true))
using (var reg = new StreamRegion (file.AsStream, ykg.DataOffset, ykg.DataSize, true))
using (var img = new BinaryStream (reg, file.Name))
{
if (4 != img.Read (header, 0, 4))
return null;
if (Binary.AsciiEqual (header, "BM"))
var img_header = img.ReadHeader (4);
if (header.AsciiEqual ("BM"))
{
img.Position = 0;
info = ImageFormat.Bmp.ReadMetaData (img);
info = Bmp.ReadMetaData (img);
ykg.Format = YkgImage.Bmp;
}
else if (Binary.AsciiEqual (header, "\x89PNG"))
else if (header.AsciiEqual ("\x89PNG"))
{
img.Position = 0;
info = Png.ReadMetaData (img);
ykg.Format = YkgImage.Png;
}
else if (Binary.AsciiEqual (header, "\x89GNP"))
else if (header.AsciiEqual ("\x89GNP"))
{
using (var body = new StreamRegion (stream, ykg.DataOffset+4, ykg.DataSize-4, true))
using (var png = new PrefixStream (PngPrefix, body))
using (var body = new StreamRegion (file.AsStream, ykg.DataOffset+4, ykg.DataSize-4, true))
using (var pre = new PrefixStream (PngPrefix, body))
using (var png = new BinaryStream (pre, file.Name))
info = Png.ReadMetaData (png);
ykg.Format = YkgImage.Gnp;
}
@@ -104,23 +103,24 @@ namespace GameRes.Formats.Yuka
return ykg;
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = info as YkgMetaData;
if (null == meta)
throw new ArgumentException ("YkgFormat.Read should be supplied with YkgMetaData", "info");
var meta = (YkgMetaData)info;
switch (meta.Format)
{
case YkgImage.Bmp:
using (var bmp = new StreamRegion (stream, meta.DataOffset, meta.DataSize, true))
using (var reg = new StreamRegion (stream.AsStream, meta.DataOffset, meta.DataSize, true))
using (var bmp = new BinaryStream (reg, stream.Name))
return Bmp.Read (bmp, info);
case YkgImage.Png:
using (var png = new StreamRegion (stream, meta.DataOffset, meta.DataSize, true))
using (var reg = new StreamRegion (stream.AsStream, meta.DataOffset, meta.DataSize, true))
using (var png = new BinaryStream (reg, stream.Name))
return Png.Read (png, info);
case YkgImage.Gnp:
using (var body = new StreamRegion (stream, meta.DataOffset+4, meta.DataSize-4, true))
using (var png = new PrefixStream (PngPrefix, body))
using (var body = new StreamRegion (stream.AsStream, meta.DataOffset+4, meta.DataSize-4, true))
using (var pre = new PrefixStream (PngPrefix, body))
using (var png = new BinaryStream (pre, stream.Name))
return Png.Read (png, info);
default:
throw new InvalidFormatException();