diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj index 8c1c5228..7fdc8a89 100644 --- a/ArcFormats/ArcFormats.csproj +++ b/ArcFormats/ArcFormats.csproj @@ -67,10 +67,10 @@ + - @@ -116,6 +116,7 @@ CreateYPFWidget.xaml + diff --git a/ArcFormats/ArcGSP.cs b/ArcFormats/ArcGSP.cs new file mode 100644 index 00000000..f87e0457 --- /dev/null +++ b/ArcFormats/ArcGSP.cs @@ -0,0 +1,68 @@ +//! \file ArcGSP.cs +//! \date Wed Mar 04 11:30:32 2015 +//! \brief GSP archive implementation. +// +// Copyright (C) 2015 by morkt +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +// + +using System; +using System.Collections.Generic; +using System.ComponentModel.Composition; +using System.IO; +using GameRes.Utility; + +namespace GameRes.Formats.BlackRainbow +{ + [Export(typeof(ArchiveFormat))] + public class GspOpener : ArchiveFormat + { + public override string Tag { get { return "GSP"; } } + public override string Description { get { return "GSP resource archive"; } } + public override uint Signature { get { return 0; } } + public override bool IsHierarchic { get { return false; } } + public override bool CanCreate { get { return false; } } + + public override ArcFile TryOpen (ArcView file) + { + int count = file.View.ReadInt32 (0); + if (count <= 0 || count > 0x1ffff) + return null; + uint index_size = 0x40u * (uint)count; + if (index_size > file.View.Reserve (4, index_size)) + return null; + var dir = new List (count); + long index_offset = 4; + long data_offset = index_offset + index_size; + for (int i = 0; i < count; ++i) + { + string name = file.View.ReadString (index_offset+8, 0x38); + var entry = FormatCatalog.Instance.CreateEntry (name); + entry.Offset = file.View.ReadUInt32 (index_offset); + entry.Size = file.View.ReadUInt32 (index_offset+4); + if (entry.Offset < data_offset || !entry.CheckPlacement (file.MaxOffset)) + return null; + dir.Add (entry); + index_offset += 0x40; + } + return new ArcFile (file, this, dir); + } + } +} diff --git a/ArcFormats/ImageBMZ.cs b/ArcFormats/ImageBMZ.cs new file mode 100644 index 00000000..f04d4f78 --- /dev/null +++ b/ArcFormats/ImageBMZ.cs @@ -0,0 +1,73 @@ +//! \file ImageBMZ.cs +//! \date Wed Mar 04 11:48:31 2015 +//! \brief Compressed bitmap image format. +// +// Copyright (C) 2015 by morkt +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to +// deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +// sell copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +// IN THE SOFTWARE. +// + +using System.ComponentModel.Composition; +using System.IO; +using System.Text; +using GameRes.Utility; +using ZLibNet; + +namespace GameRes.Formats.BlackRainbow +{ + [Export(typeof(ImageFormat))] + public class BmzFormat : BmpFormat + { + public override string Tag { get { return "BMZ"; } } + public override string Description { get { return "Compressed bitmap format"; } } + public override uint Signature { get { return 0x33434c5au; } } // 'ZLC3' + + public override void Write (Stream file, ImageData image) + { + using (var bmp = new MemoryStream()) + { + base.Write (bmp, image); + using (var output = new BinaryWriter (file, Encoding.ASCII, true)) + { + output.Write (Signature); + output.Write ((uint)bmp.Length); + } + bmp.Position = 0; + using (var zstream = new ZLibStream (file, CompressionMode.Compress, CompressionLevel.Level9, true)) + bmp.CopyTo (zstream); + } + } + + public override ImageMetaData ReadMetaData (Stream stream) + { + var header = new byte[8]; + if (header.Length != stream.Read (header, 0, header.Length)) + return null; + using (var zstream = new ZLibStream (stream, CompressionMode.Decompress, true)) + return base.ReadMetaData (zstream); + } + + public override ImageData Read (Stream stream, ImageMetaData info) + { + stream.Seek (8, SeekOrigin.Current); + using (var zstream = new ZLibStream (stream, CompressionMode.Decompress, true)) + return base.Read (zstream, info); + } + } +} diff --git a/ArcFormats/Properties/AssemblyInfo.cs b/ArcFormats/Properties/AssemblyInfo.cs index adf36034..a0ceda9b 100644 --- a/ArcFormats/Properties/AssemblyInfo.cs +++ b/ArcFormats/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion ("1.0.3.25")] -[assembly: AssemblyFileVersion ("1.0.3.25")] +[assembly: AssemblyVersion ("1.0.3.26")] +[assembly: AssemblyFileVersion ("1.0.3.26")]