epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove BinaryReader from MixFile.

Browse Source
This commit is contained in:
Paul Chote
2013-05-31 19:36:06 +12:00
parent 93b606da2c
commit 6edde6c4ac
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.FileFormats/Filesystem/MixFile.cs
View File

@@ -62,13 +62,12 @@ namespace OpenRA.FileFormats
// Detect format type // Detect format type
s.Seek(0, SeekOrigin.Begin); s.Seek(0, SeekOrigin.Begin);
var reader = new BinaryReader(s); var isCncMix = s.ReadUInt16() != 0;
var isCncMix = reader.ReadUInt16() != 0;
// The C&C mix format doesn't contain any flags or encryption // The C&C mix format doesn't contain any flags or encryption
var isEncrypted = false; var isEncrypted = false;
if (!isCncMix) if (!isCncMix)
isEncrypted = (reader.ReadUInt16() & 0x2) != 0; isEncrypted = (s.ReadUInt16() & 0x2) != 0;
List<PackageEntry> entries; List<PackageEntry> entries;
if (isEncrypted) if (isEncrypted)
@@ -88,13 +87,12 @@ namespace OpenRA.FileFormats
List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd) List<PackageEntry> ParseHeader(Stream s, long offset, out long headerEnd)
{ {
s.Seek(offset, SeekOrigin.Begin); s.Seek(offset, SeekOrigin.Begin);
var reader = new BinaryReader(s); var numFiles = s.ReadUInt16();
var numFiles = reader.ReadUInt16(); /*uint dataSize = */s.ReadUInt32();
/*uint dataSize = */reader.ReadUInt32();
var items = new List<PackageEntry>(); var items = new List<PackageEntry>();
for (var i = 0; i < numFiles; i++) for (var i = 0; i < numFiles; i++)
items.Add(new PackageEntry(reader)); items.Add(new PackageEntry(s));
headerEnd = offset + 6 + numFiles*PackageEntry.Size; headerEnd = offset + 6 + numFiles*PackageEntry.Size;
return items; return items;
@@ -103,16 +101,15 @@ namespace OpenRA.FileFormats
MemoryStream DecryptHeader(Stream s, long offset, out long headerEnd) MemoryStream DecryptHeader(Stream s, long offset, out long headerEnd)
{ {
s.Seek(offset, SeekOrigin.Begin); s.Seek(offset, SeekOrigin.Begin);
var reader = new BinaryReader(s);
// Decrypt blowfish key // Decrypt blowfish key
var keyblock = reader.ReadBytes(80); var keyblock = s.ReadBytes(80);
var blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock); var blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock);
var fish = new Blowfish(blowfishKey); var fish = new Blowfish(blowfishKey);
// Decrypt first block to work out the header length // Decrypt first block to work out the header length
var ms = Decrypt(ReadBlocks(s, offset + 80, 1), fish); var ms = Decrypt(ReadBlocks(s, offset + 80, 1), fish);
var numFiles = new BinaryReader(ms).ReadUInt16(); var numFiles = ms.ReadUInt16();
// Decrypt the full header - round bytes up to a full block // Decrypt the full header - round bytes up to a full block
var blockCount = (13 + numFiles*PackageEntry.Size)/8; var blockCount = (13 + numFiles*PackageEntry.Size)/8;
@@ -138,12 +135,11 @@ namespace OpenRA.FileFormats
uint[] ReadBlocks(Stream s, long offset, int count) uint[] ReadBlocks(Stream s, long offset, int count)
{ {
s.Seek(offset, SeekOrigin.Begin); s.Seek(offset, SeekOrigin.Begin);
var r = new BinaryReader(s);
// A block is a single encryption unit (represented as two 32-bit integers) // A block is a single encryption unit (represented as two 32-bit integers)
var ret = new uint[2*count]; var ret = new uint[2*count];
for (var i = 0; i < ret.Length; i++) for (var i = 0; i < ret.Length; i++)
ret[i] = r.ReadUInt32(); ret[i] = s.ReadUInt32();
return ret; return ret;
} }

8
OpenRA.FileFormats/PackageEntry.cs
View File

@@ -30,11 +30,11 @@ namespace OpenRA.FileFormats
Length = length; Length = length;
} }
public PackageEntry(BinaryReader r) public PackageEntry(Stream s)
{ {
Hash = r.ReadUInt32(); Hash = s.ReadUInt32();
Offset = r.ReadUInt32(); Offset = s.ReadUInt32();
Length = r.ReadUInt32(); Length = s.ReadUInt32();
} }
public void Write(BinaryWriter w) public void Write(BinaryWriter w)