Merge branch 'master' of https://github.com/crskycode/GARbro

Make console version buildable

ArcFormats/KiriKiri/ArcXPK.cs

@@ -25,7 +25,9 @@
 
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
+using System.IO;
 using System.Text;
+using GameRes.Compression;
 using GameRes.Utility;
 
 namespace GameRes.Formats.KiriKiri
@@ -85,5 +87,13 @@ namespace GameRes.Formats.KiriKiri
                 throw new InvalidFormatException();
             return Binary.BigEndian (input.ReadUInt32());
         }
+
+        public override Stream OpenEntry(ArcFile arc, Entry entry)
+        {
+            PackedEntry packed_entry = entry as PackedEntry;
+            if (null == packed_entry || packed_entry.Size == packed_entry.UnpackedSize)
+                return arc.File.CreateStream(entry.Offset, entry.Size);
+            return new ZLibStream(arc.File.CreateStream(entry.Offset, entry.Size), CompressionMode.Decompress);
+        }
     }
 }

ArcFormats/Malie/ArcLIB.cs

@@ -287,6 +287,8 @@ namespace GameRes.Formats.Malie
                     int offset  = LittleEndian.ToInt32 (m_index, current_offset+0x18);
                     uint size   = LittleEndian.ToUInt32 (m_index, current_offset+0x1c);
                     current_offset += 0x20;
+                    if (name.StartsWith("/"))
+                        name = name.Substring(1);
                     name = Path.Combine (root, name);
                     if (0 == (flags & 0x30000))
                     {

Console/ConsoleBrowser.cs

@@ -67,6 +67,12 @@ namespace GARbro
 */
         }
 
+        ImageFormat FindFormat(string format)
+        {
+            var range = FormatCatalog.Instance.LookupExtension<ImageFormat>(format);
+            return range.FirstOrDefault();
+        }
+
         void Run (string[] args)
         {
             int argn = 0;
@@ -131,7 +137,7 @@ namespace GARbro
                     Console.Error.WriteLine ("{0}: unknown format", m_arc_name);
                     continue;
                 }
-                var arc = (ArchiveFileSystem)VFS.Top;
+                var arc = ((ArchiveFileSystem)VFS.Top).Source;
                 if (args.Length > argn+1)
                 {
                     for (int i = argn+1; i < args.Length; ++i)