Merge remote-tracking branch 'refs/remotes/origin/master' into gui-dialogs

ArcFormats/ArcFormats.csproj

@@ -93,6 +93,7 @@
     <Compile Include="ArcCG.cs" />
     <Compile Include="Artemis\ArcPFS.cs" />
     <Compile Include="AudioWMA.cs" />
+    <Compile Include="BlackRainbow\ArcDAT.cs" />
     <Compile Include="BlackRainbow\ArcDX.cs" />
     <Compile Include="C4\AudioVMD.cs" />
     <Compile Include="C4\ImageGD.cs" />

ArcFormats/BlackRainbow/ArcDAT.cs

@@ -0,0 +1,88 @@
+//! \file       ArcDAT.cs
+//! \date       Fri Feb 03 11:41:21 2017
+//! \brief      BlackRainbow resource archive.
+//
+// Copyright (C) 2015-2017 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.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IO;
+
+namespace GameRes.Formats.BlackRainbow
+{
+    [Export(typeof(ArchiveFormat))]
+    public class DatOpener : ArchiveFormat
+    {
+        public override string         Tag { get { return "DAT/BR"; } }
+        public override string Description { get { return "BlackRainbow resource archive"; } }
+        public override uint     Signature { get { return 0; } }
+        public override bool  IsHierarchic { get { return false; } }
+        public override bool      CanWrite { get { return false; } }
+
+        public DatOpener ()
+        {
+            Extensions = new string[] { "dat", "pak" };
+            Signatures = new uint[] { 2u, 4u, 5u, 6u };
+        }
+
+        public override ArcFile TryOpen (ArcView file)
+        {
+            int count = file.View.ReadInt32 (8);
+            if (!IsSaneCount (count))
+                return null;
+            uint base_offset = file.View.ReadUInt32 (0x0c);
+            uint index_offset = 0x10;
+            uint index_size = 4u * (uint)count;
+            if (base_offset >= file.MaxOffset || base_offset < (index_offset+index_size))
+                return null;
+            if (index_size > file.View.Reserve (index_offset, index_size))
+                return null;
+            var index = new List<uint> (count);
+            for (int i = 0; i < count; ++i)
+            {
+                uint offset = file.View.ReadUInt32 (index_offset);
+                if (offset != 0xffffffff)
+                    index.Add (base_offset + offset);
+                index_offset += 4;
+            }
+            var base_name = Path.GetFileNameWithoutExtension (file.Name);
+            index.Sort();
+            var dir = new List<Entry> (index.Count);
+            for (int i = 0; i < index.Count; ++i)
+            {
+                long offset = index[i];
+                string name = file.View.ReadString (offset, 0x24);
+                if (0 == name.Length)
+                {
+                    name = string.Format ("{0:D2}_{1}#{0:D2}", i, base_name);
+                    if (file.View.AsciiEqual (offset + 0x24, "_BMD"))
+                        name += ".bmd";
+                }
+                var entry = FormatCatalog.Instance.Create<Entry> (name);
+                entry.Offset = offset + 0x24;
+                entry.Size   = (uint)((i + 1 < index.Count ? index[i+1]  : file.MaxOffset) - entry.Offset);
+                dir.Add (entry);
+            }
+            return new ArcFile (file, this, dir);
+        }
+    }
+}

ArcFormats/BlackRainbow/ArcGSP.cs

@@ -23,11 +23,8 @@
 // IN THE SOFTWARE.
 //
 
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
-using System.IO;
-using GameRes.Utility;
 
 namespace GameRes.Formats.BlackRainbow
 {
@@ -67,61 +64,4 @@ namespace GameRes.Formats.BlackRainbow
             return new ArcFile (file, this, dir);
         }
     }
-
-    [Export(typeof(ArchiveFormat))]
-    public class DatOpener : ArchiveFormat
-    {
-        public override string         Tag { get { return "DAT/BR"; } }
-        public override string Description { get { return "BlackRainbow resource archive"; } }
-        public override uint     Signature { get { return 0; } }
-        public override bool  IsHierarchic { get { return false; } }
-        public override bool      CanWrite { get { return false; } }
-
-        public DatOpener ()
-        {
-            Extensions = new string[] { "dat", "pak" };
-            Signatures = new uint[] { 2u, 4u, 5u, 6u };
-        }
-
-        public override ArcFile TryOpen (ArcView file)
-        {
-            int count = file.View.ReadInt32 (8);
-            if (!IsSaneCount (count))
-                return null;
-            uint base_offset = file.View.ReadUInt32 (0x0c);
-            uint index_offset = 0x10;
-            uint index_size = 4u * (uint)count;
-            if (base_offset >= file.MaxOffset || base_offset < (index_offset+index_size))
-                return null;
-            if (index_size > file.View.Reserve (index_offset, index_size))
-                return null;
-            var index = new List<uint> (count);
-            for (int i = 0; i < count; ++i)
-            {
-                uint offset = file.View.ReadUInt32 (index_offset);
-                if (offset != 0xffffffff)
-                    index.Add (base_offset + offset);
-                index_offset += 4;
-            }
-            var base_name = Path.GetFileNameWithoutExtension (file.Name);
-            index.Sort();
-            var dir = new List<Entry> (index.Count);
-            for (int i = 0; i < index.Count; ++i)
-            {
-                long offset = index[i];
-                string name = file.View.ReadString (offset, 0x24);
-                if (0 == name.Length)
-                {
-                    name = string.Format ("{0:D2}_{1}#{0:D2}", i, base_name);
-                    if (file.View.AsciiEqual (offset + 0x24, "_BMD"))
-                        name += ".bmd";
-                }
-                var entry = FormatCatalog.Instance.Create<Entry> (name);
-                entry.Offset = offset + 0x24;
-                entry.Size   = (uint)((i + 1 < index.Count ? index[i+1]  : file.MaxOffset) - entry.Offset);
-                dir.Add (entry);
-            }
-            return new ArcFile (file, this, dir);
-        }
-    }
 }

ArcFormats/ShiinaRio/ArcWARC.cs

@@ -158,13 +158,15 @@ namespace GameRes.Formats.ShiinaRio // 椎名里緒
             uint unpacked_size = LittleEndian.ToUInt32 (enc_data, 4);
             sig ^= (unpacked_size ^ 0x82AD82) & 0xffffff;
 
-            if (0 != (wentry.Flags & 0x80000000u) && entry.Size > 8) // encrypted entry
+            if (entry.Size > 8)
-                warc.Decoder.Decrypt (enc_data, 8, entry.Size-8);
+            {
-            if (warc.Decoder.ExtraCrypt != null)
+                if (0 != (wentry.Flags & 0x80000000u)) // encrypted entry
-                warc.Decoder.ExtraCrypt.Decrypt (enc_data, 8, entry.Size-8, 0x202);
+                    warc.Decoder.Decrypt (enc_data, 8, entry.Size-8);
-            if (0 != (wentry.Flags & 0x20000000u) && entry.Size > 8)
+                if (warc.Decoder.ExtraCrypt != null)
-                warc.Decoder.Decrypt2 (enc_data, 8, entry.Size-8);
+                    warc.Decoder.ExtraCrypt.Decrypt (enc_data, 8, entry.Size-8, 0x202);
-
+                if (0 != (wentry.Flags & 0x20000000u))
+                    warc.Decoder.Decrypt2 (enc_data, 8, entry.Size-8);
+            }
             byte[] unpacked = enc_data;
             UnpackMethod unpack = null;
             switch (sig & 0xffffff)

ArcFormats/ShiinaRio/WarcEncryption.cs

@@ -1126,4 +1126,35 @@ namespace GameRes.Formats.ShiinaRio
             }
         }
     }
+
+    [Serializable]
+    public class CountCrypt : IDecryptExtra
+    {
+        public void Decrypt (byte[] data, int index, uint length, uint flags)
+        {
+            if (length >= 0x200 && (flags & 0x204) == 0x204)
+                DoCountCrypt (data, index, (int)length);
+        }
+
+        public void Encrypt (byte[] data, int index, uint length, uint flags)
+        {
+            if (length >= 0x200 && (flags & 0x104) == 0x104)
+                DoCountCrypt (data, index, (int)length);
+        }
+
+        void DoCountCrypt (byte[] data, int index, int length)
+        {
+            length = (length & 0x7E) | 1;
+            byte count_00 = 0, count_FF = 0;
+            for (int i = 0; i < length; ++i)
+            {
+                if (0xFF == data[index+i])
+                    count_FF++;
+                else if (0 == data[index+i])
+                    count_00++;
+            }
+            data[index + 0x100] ^= count_00;
+            data[index + 0x104] ^= count_FF;
+        }
+    }
 }