implemented EPK archives and SUR images.

ArcFormats/ArcFormats.csproj

@@ -275,6 +275,8 @@
     <Compile Include="Tactics\WidgetTactics.xaml.cs">
       <DependentUpon>WidgetTactics.xaml</DependentUpon>
     </Compile>
+    <Compile Include="TamaSoft\ArcEPK.cs" />
+    <Compile Include="TamaSoft\ImageSUR.cs" />
     <Compile Include="TechnoBrain\ImageIPH.cs" />
     <Compile Include="DxLib\ArcDX.cs" />
     <Compile Include="ArcMiris.cs" />

ArcFormats/TamaSoft/ArcEPK.cs

@@ -0,0 +1,260 @@
+//! \file       ArcEPK.cs
+//! \date       Tue Sep 20 00:07:35 2016
+//! \brief      TamaSoft resource archive.
+//
+// Copyright (C) 2016 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.Tama
+{
+    internal class EpkEntry : Entry
+    {
+        public int  ArcNumber;
+    }
+
+    internal class EpkArchive : ArcFile
+    {
+        public readonly IReadOnlyList<ArcView>  Parts;
+
+        public EpkArchive (ArcView arc, ArchiveFormat impl, ICollection<Entry> dir, IReadOnlyList<ArcView> parts)
+            : base (arc, impl, dir)
+        {
+            Parts = parts;
+        }
+
+        bool _epk_disposed = false;
+        protected override void Dispose (bool disposing)
+        {
+            if (_epk_disposed)
+                return;
+
+            if (disposing)
+            {
+                foreach (var arc in Parts)
+                    arc.Dispose();
+            }
+            _epk_disposed = true;
+            base.Dispose (disposing);
+        }
+    }
+
+    [Export(typeof(ArchiveFormat))]
+    public class PakOpener : ArchiveFormat
+    {
+        public override string         Tag { get { return "EPK"; } }
+        public override string Description { get { return "TamaSoft ADV system resource archive"; } }
+        public override uint     Signature { get { return 0x204B5045; } } // 'EPK '
+        public override bool  IsHierarchic { get { return true; } }
+        public override bool     CanCreate { get { return false; } }
+
+        public override ArcFile TryOpen (ArcView file)
+        {
+            if (!file.View.AsciiEqual (0, "EPK "))
+                return null;
+            uint index_size = file.View.ReadUInt32 (4) - 0x20;
+            int count = file.View.ReadInt32 (0x18);
+            if (!IsSaneCount (count) || index_size >= file.MaxOffset)
+                return null;
+            uint index_offset = 0x20;
+            if (index_size > file.View.Reserve (index_offset, index_size))
+                return null;
+
+            var arc_list = new List<Entry>();
+            var arc_dir = VFS.GetDirectoryName (file.Name);
+            var arc_name = Path.GetFileNameWithoutExtension (file.Name);
+            for (int i = 1; i < 10; ++i)
+            {
+                var part_name = string.Format ("{0}.e{1:D02}", arc_name, i);
+                part_name = VFS.CombinePath (arc_dir, part_name);
+                if (!VFS.FileExists (part_name))
+                    break;
+                arc_list.Add (VFS.FindFile (part_name));
+            }
+
+            var name_buffer = new byte[0x40];
+            var dir = new List<Entry> (count);
+            for (int i = 0; i < count; ++i)
+            {
+                uint name_offset = file.View.ReadUInt32 (index_offset+8);
+                int name_length = file.View.ReadInt32 (name_offset);
+                if (name_length <= 0 || name_length >= index_size)
+                    return null;
+                if (name_length > name_buffer.Length)
+                    name_buffer = new byte[name_length];
+                file.View.Read (name_offset+4, name_buffer, 0, (uint)name_length);
+                for (int j = 0; j < name_length; ++j)
+                    name_buffer[j] ^= 0xFF;
+                var name = Encodings.cp932.GetString (name_buffer, 0, name_length);
+
+                var entry = FormatCatalog.Instance.Create<EpkEntry> (name);
+                entry.Offset = file.View.ReadInt64 (index_offset+0x10);
+                entry.Size   = file.View.ReadUInt32 (index_offset+0x18);
+                dir.Add (entry);
+                index_offset += 0x28;
+            }
+            var arc_set = new List<ArcView> (arc_list.Count);
+            try
+            {
+                long max_offset = file.MaxOffset;
+                var bounds = new List<long> (arc_list.Count+1);
+                bounds.Add (max_offset);
+                foreach (var arc_entry in arc_list)
+                {
+                    var arc_file = VFS.OpenView (arc_entry);
+                    arc_set.Add (arc_file);
+                    max_offset += arc_file.MaxOffset;
+                    bounds.Add (max_offset);
+                }
+                foreach (EpkEntry entry in dir)
+                {
+                    if (!entry.CheckPlacement (max_offset))
+                        return null;
+                    entry.ArcNumber = bounds.FindIndex (x => x > entry.Offset);
+                    if (entry.ArcNumber > 0)
+                        entry.Offset -= bounds[entry.ArcNumber-1];
+                }
+                var arc = new EpkArchive (file, this, dir, arc_set);
+                arc_set = null;
+                return arc;
+            }
+            finally
+            {
+                if (arc_set != null)
+                {
+                    foreach (var arc in arc_set)
+                        arc.Dispose();
+                }
+            }
+        }
+
+        public override Stream OpenEntry (ArcFile arc, Entry entry)
+        {
+            var earc = arc as EpkArchive;
+            var eent = entry as EpkEntry;
+            if (null == earc || null == eent)
+                return base.OpenEntry (arc, entry);
+            long entry_offset = entry.Offset;
+            ArcView file = arc.File;
+            if (eent.ArcNumber > 0)
+                file = earc.Parts[eent.ArcNumber-1];
+            if (entry_offset + entry.Size <= file.MaxOffset)
+                return file.CreateStream (entry_offset, entry.Size);
+            uint first_part_size = (uint)(file.MaxOffset - entry_offset);
+            var begin = file.CreateStream (entry_offset, first_part_size);
+            var end = earc.Parts[eent.ArcNumber].CreateStream (0, entry.Size - first_part_size);
+            return new ConcatStream (begin, end);
+        }
+    }
+
+    /// <summary>
+    /// Concatenation of the two input Streams.
+    /// </summary>
+    public class ConcatStream : InputProxyStream
+    {
+        Stream      m_second;
+        long        m_position;
+        Stream      m_active;
+
+        public ConcatStream (Stream first, Stream second) : base (first)
+        {
+            m_second = second;
+            m_position = 0;
+            m_active = first;
+        }
+
+        internal Stream  First { get { return BaseStream; } }
+        internal Stream Second { get { return m_second; } }
+
+        public override bool CanSeek  { get { return First.CanSeek && Second.CanSeek; } }
+        public override long Length   { get { return First.Length + Second.Length; } }
+        public override long Position
+        {
+            get { return m_position; }
+            set { m_position = value; }
+        }
+
+        public override int Read (byte[] buffer, int offset, int count)
+        {
+            if (First.CanSeek)
+            {
+                if (m_position >= First.Length)
+                {
+                    m_active = Second;
+                    m_active.Position = m_position - First.Length;
+                }
+                else
+                {
+                    m_active = First;
+                    m_active.Position = m_position;
+                }
+            }
+            int total_read = 0;
+            while (count > 0)
+            {
+                int read = m_active.Read (buffer, offset, count);
+                if (0 == read)
+                    break;
+                total_read += read;
+                m_position += read;
+                offset += read;
+                count -= read;
+            }
+            if (count > 0 && m_active != Second)
+            {
+                m_active = Second;
+                if (m_active.CanSeek)
+                    m_active.Position = 0;
+                int read = m_active.Read (buffer, offset, count);
+                m_position += read;
+                total_read += read;
+            }
+            return total_read;
+        }
+
+        public override long Seek (long offset, SeekOrigin origin)
+        {
+            if (SeekOrigin.Begin == origin)
+                Position = offset;
+            else if (SeekOrigin.Current == origin)
+                Position = m_position + offset;
+            else
+                Position = Length + offset;
+
+            return m_position;
+        }
+
+        bool _disposed = false;
+        protected override void Dispose (bool disposing)
+        {
+            if (!_disposed)
+            {
+                if (disposing)
+                    m_second.Dispose();
+                _disposed = true;
+                base.Dispose (disposing);
+            }
+        }
+    }
+}

ArcFormats/TamaSoft/ImageSUR.cs

@@ -0,0 +1,114 @@
+//! \file       ImageSUR.cs
+//! \date       Tue Sep 20 10:56:45 2016
+//! \brief      TamaSoft image format.
+//
+// Copyright (C) 2016 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.ComponentModel.Composition;
+using System.IO;
+using System.Windows.Media;
+using GameRes.Utility;
+
+namespace GameRes.Formats.Tama
+{
+    [Export(typeof(ImageFormat))]
+    public class SurFormat : ImageFormat
+    {
+        public override string         Tag { get { return "SUR"; } }
+        public override string Description { get { return "TamaSoft ADV system image"; } }
+        public override uint     Signature { get { return 0x52555345; } } // 'ESUR'
+
+        public override ImageMetaData ReadMetaData (Stream stream)
+        {
+            var header = new byte[0x10];
+            if (header.Length != stream.Read (header, 0, header.Length))
+                return null;
+            return new ImageMetaData
+            {
+                Width  = LittleEndian.ToUInt32 (header, 8),
+                Height = LittleEndian.ToUInt32 (header, 12),
+                BPP    = 32,
+            };
+        }
+
+        public override ImageData Read (Stream stream, ImageMetaData info)
+        {
+            var pixels = new byte[info.Width * info.Height * 4];
+            stream.Position = 0x20;
+            UnpackLzss (stream, pixels);
+            return ImageData.Create (info, PixelFormats.Bgra32, null, pixels);
+        }
+
+        public override void Write (Stream file, ImageData image)
+        {
+            throw new System.NotImplementedException ("SurFormat.Write not implemented");
+        }
+
+        /// <summary>
+        /// Differs from a common LZSS implementation by frame offset encoding.
+        /// </summary>
+        void UnpackLzss (Stream input, byte[] output)
+        {
+            int dst = 0;
+            var frame = new byte[0x1000];
+            int frame_pos = 0xFEE;
+            const int frame_mask = 0xFFF;
+            int ctl = 2;
+            while (dst < output.Length)
+            {
+                ctl >>= 1;
+                if (1 == ctl)
+                {
+                    ctl = input.ReadByte();
+                    if (-1 == ctl)
+                        throw new EndOfStreamException();
+                    ctl |= 0x100;
+                }
+                if (0 != (ctl & 1))
+                {
+                    byte b = (byte)input.ReadByte();
+                    frame[frame_pos++] = b;
+                    frame_pos &= frame_mask;
+                    output[dst++] = b;
+                }
+                else
+                {
+                    int lo = input.ReadByte();
+                    int hi = input.ReadByte();
+                    if (-1 == hi)
+                        throw new EndOfStreamException();
+                    int offset = hi >> 4 | lo << 4;
+                    int count = Math.Min (3 + (hi & 0xF), output.Length - dst);
+                    while (count --> 0)
+                    {
+                        byte v = frame[offset++];
+                        offset &= frame_mask;
+                        frame[frame_pos++] = v;
+                        frame_pos &= frame_mask;
+                        output[dst++] = v;
+                    }
+                }
+            }
+        }
+    }
+}

supported.html

@@ -139,6 +139,7 @@ White ~blanche comme la lune~<br/>
 Inpyuri -Hito to Anata to Ayakashi to-<br/>
 Nostradamus ni Kiitemiro♪<br/>
 Tiny Dungeon ~BLACK and WHITE~<br/>
+Tiny Dungeon ~Brave or Slave~<br/>
 </td></tr>
 <tr class="odd"><td>*.dat</td><td>-</td><td>No</td><td>Meteor<br/>Silver Bullet</td><td>
 Chokotto☆Vampire!<br/>
@@ -314,6 +315,7 @@ Men at Work 2<br/>
 Natsu Kagura<br/>
 </td></tr>
 <tr class="odd"><td>*.mbl</td><td>-</td><td>No</td><td rowspan="3">Marble</td><td rowspan="3">
+Amai Seikatsu -Saikou no Gibo to Saikou no Gishimai-<br/>
 Assault Angel Canon<br/>
 Chikatetsu Fuusa Jiken<br/>
 Eien no Owari ni<br/>
@@ -322,6 +324,7 @@ Fuurinkanzan<br/>
 Gedou Yuusha<br/>
 Himemiko<br/>
 Ikusa Otome Valkyrie<br/>
+Inmu Gakuen<br/>
 Mahou Tenshi Misaki<br/>
 Mahou Tenshi Misaki 2<br/>
 Ohime-sama wa Tokkun Chuu R! ~Seinaru Mahou Shugyou~<br/>
@@ -342,6 +345,7 @@ Ren no Koi<br/>
 <tr class="odd"><td>*.ald</td><td>-</td><td>No</td><td rowspan="6">Alice Soft</td><td rowspan="6">
 Boku dake no Hokenshitsu<br/>
 Daiteikoku<br/>
+Momoiro Guardian<br/>
 Pastel Chime 3 Bind Seeker<br/>
 Shaman's Sanctuary -Miko no Seiiki-<br/>
 Tsuma Shibori<br/>
@@ -883,6 +887,7 @@ Cafe Junkie<br/>
 Immoral<br/>
 Majidashi! Royale ~Finish wa Watashi no Naka de~<br/>
 MILK Junkies<br/>
+Oppai Life<br/>
 </td></tr>
 <tr class="odd"><td>*.zbm</td><td><tt>amp_</tt></td><td>No</td></tr>
 <tr class="odd last"><td>*.amv</td><td><tt>ampV</tt></td><td>No</td></tr>
@@ -1035,6 +1040,7 @@ Cartagra<br/>
 Kara no Shoujo 2<br/>
 </td></td>
 <tr><td>data.NN<br/>ArcNN.dat</td><td>-</td><td>No</td><td>Cyberworks</td><td>
+Aneboku ~Onee-chan wa Bijin 3 Shimai~<br/>
 Aniyome Kyouka-san to Sono Haha Chikako-san<br/>
 Aru Kazoku no Kankeizu<br/>
 Chou no Yume ~Futari no Chou~<br/>
@@ -1132,7 +1138,12 @@ Triangle Heart 1-2-3<br/>
 <tr class ="odd last"><td>*.px</td><td><tt>fPX</tt></td><td>No</td></tr>
 <tr><td>*.fpk</td><td><tt>FPK 0100</tt></td><td>No</td><td>MoonhirGames</td><td>
 Pretty Devil Paradise ~Millium Makai Dakkan Shirei~<br/>
+S Sensei no Koto<br/>
 </td></tr>
+<tr class="odd"><td>*.epk</td><td><tt>EPK</tt></td><td>No</td><td rowspan="2">TamaSoft</td><td rowspan="2">
+Lost Child<br/>
+</td></tr>
+<tr class="odd last"><td>*.sur</td><td><tt>ESUR</tt></td><td>No</td></tr>
 </table>
 <p><a name="note-1" class="footnote">1</a> Non-encrypted only</p>
 </body>