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

(ZLibStream): checksum is written correctly.

Browse Source
This commit is contained in:
morkt
2015-07-28 23:22:16 +04:00
parent a2a093dc31
commit ef50d4ac2f
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ArcFormats/ZLibStream.cs
View File

@@ -61,6 +61,7 @@ namespace GameRes.Compression
{ {
DeflateStream m_stream; DeflateStream m_stream;
CheckedStream m_adler; CheckedStream m_adler;
bool m_should_dispose_base;
bool m_writing; bool m_writing;
int m_total_in = 0; int m_total_in = 0;
@@ -79,22 +80,23 @@ namespace GameRes.Compression
public ZLibStream (Stream stream, CompressionMode mode, CompressionLevel level, bool leave_open = false) public ZLibStream (Stream stream, CompressionMode mode, CompressionLevel level, bool leave_open = false)
{ {
if (CompressionMode.Decompress == mode) if (CompressionMode.Decompress == mode)
InitDecompress (stream, leave_open); InitDecompress (stream);
else else
InitCompress (stream, level, leave_open); InitCompress (stream, level);
m_should_dispose_base = !leave_open;
} }
private void InitDecompress (Stream stream, bool leave_open) private void InitDecompress (Stream stream)
{ {
int b1 = stream.ReadByte(); int b1 = stream.ReadByte();
int b2 = stream.ReadByte(); int b2 = stream.ReadByte();
if (0x78 != b1 || 0 != (b1 << 8 | b2) % 31) if ((0x78 != b1 && 0x58 != b1) || 0 != (b1 << 8 | b2) % 31)
throw new InvalidDataException ("Data not recoginzed as zlib-compressed stream"); throw new InvalidDataException ("Data not recoginzed as zlib-compressed stream");
m_stream = new DeflateStream (stream, System.IO.Compression.CompressionMode.Decompress, leave_open); m_stream = new DeflateStream (stream, System.IO.Compression.CompressionMode.Decompress, true);
m_writing = false; m_writing = false;
} }
private void InitCompress (Stream stream, CompressionLevel level, bool leave_open) private void InitCompress (Stream stream, CompressionLevel level)
{ {
int flevel = (int)level; int flevel = (int)level;
System.IO.Compression.CompressionLevel sys_level; System.IO.Compression.CompressionLevel sys_level;
@@ -116,11 +118,20 @@ namespace GameRes.Compression
cmf = ((cmf + 30) / 31) * 31; cmf = ((cmf + 30) / 31) * 31;
stream.WriteByte ((byte)(cmf >> 8)); stream.WriteByte ((byte)(cmf >> 8));
stream.WriteByte ((byte)cmf); stream.WriteByte ((byte)cmf);
m_stream = new DeflateStream (stream, sys_level, leave_open); m_stream = new DeflateStream (stream, sys_level, true);
m_adler = new CheckedStream (m_stream, new Adler32()); m_adler = new CheckedStream (m_stream, new Adler32());
m_writing = true; m_writing = true;
} }
void WriteCheckSum (Stream output)
{
uint checksum = m_adler.CheckSumValue;
output.WriteByte ((byte)(checksum >> 24));
output.WriteByte ((byte)(checksum >> 16));
output.WriteByte ((byte)(checksum >> 8));
output.WriteByte ((byte)(checksum));
}
#region IO.Stream Members #region IO.Stream Members
public override bool CanRead { get { return !m_writing; } } public override bool CanRead { get { return !m_writing; } }
public override bool CanSeek { get { return false; } } public override bool CanSeek { get { return false; } }
@@ -180,17 +191,15 @@ namespace GameRes.Compression
{ {
if (disposing) if (disposing)
{ {
var output = m_stream.BaseStream;
m_stream.Dispose();
if (m_writing) if (m_writing)
{ {
uint checksum = m_adler.CheckSumValue; WriteCheckSum (output);
m_stream.Flush();
m_stream.BaseStream.WriteByte ((byte)(checksum >> 24));
m_stream.BaseStream.WriteByte ((byte)(checksum >> 16));
m_stream.BaseStream.WriteByte ((byte)(checksum >> 8));
m_stream.BaseStream.WriteByte ((byte)(checksum));
m_adler.Dispose(); m_adler.Dispose();
} }
m_stream.Dispose(); if (m_should_dispose_base)
output.Dispose();
} }
m_disposed = true; m_disposed = true;
} }