diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj
index 4e556f3e..eae6a1cc 100644
--- a/ArcFormats/ArcFormats.csproj
+++ b/ArcFormats/ArcFormats.csproj
@@ -175,6 +175,7 @@
+
diff --git a/ArcFormats/ImageGGP.cs b/ArcFormats/ImageGGP.cs
new file mode 100644
index 00000000..14bab042
--- /dev/null
+++ b/ArcFormats/ImageGGP.cs
@@ -0,0 +1,179 @@
+//! \file ImageGGP.cs
+//! \date Sun Jun 14 09:06:26 2015
+//! \brief
+//
+// Copyright (C) 2014-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.ComponentModel.Composition;
+using System.IO;
+using GameRes.Utility;
+
+namespace GameRes.Formats.DRS
+{
+ internal class GgpMetaData : ImageMetaData
+ {
+ public byte[] Key = new byte[8];
+ public uint Offset;
+ public uint Length;
+ }
+
+ [Export(typeof(ImageFormat))]
+ public class GgpFormat : PngFormat
+ {
+ public override string Tag { get { return "GGP"; } }
+ public override string Description { get { return "Digital Romance System encrypted image format"; } }
+ public override uint Signature { get { return 0x46504747u; } } // 'GGPF'
+
+ public override ImageMetaData ReadMetaData (Stream stream)
+ {
+ var header = new byte[0x24];
+ if (header.Length != stream.Read (header, 0, header.Length))
+ return null;
+ if (!Binary.AsciiEqual (header, 0, "GGPFAIKE"))
+ return null;
+ var info = new GgpMetaData
+ {
+ Offset = LittleEndian.ToUInt32 (header, 0x14),
+ Length = LittleEndian.ToUInt32 (header, 0x18),
+ };
+ for (int i = 0; i < 8; ++i)
+ info.Key[i] = (byte)(header[i] ^ header[i+0xC]);
+ stream.Position = info.Offset;
+ using (var png = new EncryptedStream (stream, info.Key, true))
+ {
+ var png_info = base.ReadMetaData (png);
+ info.Width = png_info.Width;
+ info.Height = png_info.Height;
+ info.BPP = png_info.BPP;
+ info.OffsetX = png_info.OffsetX;
+ info.OffsetY = png_info.OffsetY;
+ return info;
+ }
+ }
+
+ public override ImageData Read (Stream file, ImageMetaData info)
+ {
+ var meta = info as GgpMetaData;
+ if (null == meta)
+ throw new ArgumentException ("GgpFormat.Read should be supplied with GgpMetaData", "info");
+ using (var input = new StreamRegion (file, meta.Offset, meta.Length, true))
+ using (var png = new EncryptedStream (input, meta.Key, true))
+ return base.Read (png, info);
+ }
+
+ public override void Write (Stream file, ImageData image)
+ {
+ throw new NotImplementedException ("GgpFormat.Write not implemented");
+ }
+ }
+
+ internal class EncryptedStream : Stream
+ {
+ private Stream m_stream;
+ private byte[] m_key;
+ private long m_position;
+ private bool m_should_dispose;
+
+ public EncryptedStream (Stream main, byte[] key, bool leave_open = false)
+ {
+ if (null == key)
+ throw new ArgumentNullException ("key");
+ if (key.Length < 8)
+ throw new ArgumentException ("key");
+ m_stream = main;
+ m_key = key;
+ m_position = 0;
+ m_should_dispose = !leave_open;
+ }
+
+ public override bool CanRead { get { return m_stream.CanRead; } }
+ public override bool CanSeek { get { return false; } }
+ public override bool CanWrite { get { return false; } }
+ public override long Length { get { throw new NotSupportedException(); } }
+ public override long Position
+ {
+ get { throw new NotSupportedException(); }
+ set { throw new NotSupportedException(); }
+ }
+
+ public override long Seek (long offset, SeekOrigin origin)
+ {
+ throw new NotSupportedException();
+ }
+
+ public override void Flush()
+ {
+ m_stream.Flush();
+ }
+
+ public override int Read (byte[] buffer, int offset, int count)
+ {
+ int read = m_stream.Read (buffer, offset, count);
+ if (read > 0)
+ {
+ for (int i = 0; i < read; ++i)
+ {
+ buffer[offset+i] ^= m_key[m_position++ & 7];
+ }
+ }
+ return read;
+ }
+
+ public override int ReadByte ()
+ {
+ int b = m_stream.ReadByte();
+ if (-1 != b)
+ {
+ b ^= m_key[m_position++ & 7];
+ }
+ return b;
+ }
+
+ public override void SetLength (long length)
+ {
+ throw new NotSupportedException ("EncryptedStream.SetLength method is not supported");
+ }
+
+ public override void Write (byte[] buffer, int offset, int count)
+ {
+ throw new NotSupportedException ("EncryptedStream.Write method is not supported");
+ }
+
+ public override void WriteByte (byte value)
+ {
+ throw new NotSupportedException ("EncryptedStream.WriteByte method is not supported");
+ }
+
+ bool m_disposed = false;
+ protected override void Dispose (bool disposing)
+ {
+ if (!m_disposed)
+ {
+ if (m_should_dispose)
+ m_stream.Dispose();
+ m_disposed = true;
+ base.Dispose (disposing);
+ }
+ }
+ }
+}
diff --git a/supported.html b/supported.html
index 4f637840..29e552e9 100644
--- a/supported.html
+++ b/supported.html
@@ -19,15 +19,17 @@ tr.odd td { background-color: #eee }
| *.bip | - | No |
| data.ami | AMI | Yes | - | Muv-Luv Amaterasu Translation data files |
| *.arc | PackFile | No | BGI/Ethornell | Chou Dengeki Stryker |
-| * | - SM2MPX10 | No | DRS |
+ |
| * | - SM2MPX10 | No | DRS |
Anata no Osanazuma
Ecchi na Bunny-san wa Kirai?
Kana ~Imouto~
+Natsu no Hitoshizuku
Private Nurse
Sensei 2
|
| *.ggd | \xB9\xAA\xB3\xB3 \xAB\xAD\xAA\xBA \xB7\xB6\xB8\xB7 \xCD\xCA\xC9\xB8 | Yes |
-*.gg1 *.gg2 *.gg3 | GGA00000 | No |
+*.gg1 *.gg2 *.gg3 *.gg0 | GGA00000 | No |
+| *.ggp | GGPFAIKE | No |
| *.bin | ACPXPK01 | No | Unison Shift | Wasurenagusa ~Forget-me-Not~ |
| *.gsp | - | No | Black Rainbow | Saimin Gakuen |
| *.bmz | ZLC3 | Yes |
@@ -136,17 +138,20 @@ Nikutai Ten'i
| *.grd | CMP_ | No |
*.dat *.arc | - M2TYPE | No | FFA System/G-SYS |
-Onsen Kankou Yukemuri Chijou
Dokusen Kango
+Inran OL Sawatari Tokiko
+Onsen Kankou Yukemuri Chijou
|
| *.pt1 | - | No |
| *.pak | DataPack5 GsPack4 | No | Root | Para-Sol |
| * | \x00\x00\x04\x00 | No |
-| *.war | WARC 1.7 | No | Shiina Rio |
-Helter Skelter
+ |
| *.war | WARC 1.7 | No | Shiina Rio |
Classmate no Okaa-san
+Helter Skelter
+Mahou Shoujo no Taisetsu na Koto
|
| *.s25 | S25 | No |
+| *.ogv | OGV | No |
| * | ARC2 ARC1 | No | AST | Jokyoushi wo Kurau |
| *.dat | - | No | Ail | Ragna☆彡Science |
| *.lpk | LPK1 | No | Lucifen |
|