[Scummvm-git-logs] scummvm master -> 7680ac013e6443018381093d8e6a8affaafe2b44
sev-
noreply at scummvm.org
Fri Nov 18 00:23:05 UTC 2022
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c72ddd3ec7 COMMON: Import modified gzio from GRUB
33475787a2 COMMON: Add clickteam installer unpacker
9caa5324bc AGS: Switch from getFSNode to getFile to hide whether file comes from an archive
db09df7d14 AGS: Support files coming from SearchMan
60151528c4 AGS: Open clickteam-compressed files
7680ac013e AGS: Detection entry for Maniac Mansion Deluxe and Zak2 installers
Commit: c72ddd3ec70d2048e2636c9e1495911d0984c06d
https://github.com/scummvm/scummvm/commit/c72ddd3ec70d2048e2636c9e1495911d0984c06d
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-11-18T01:22:59+01:00
Commit Message:
COMMON: Import modified gzio from GRUB
Changed paths:
A common/gzio.cpp
A common/gzio.h
common/module.mk
diff --git a/common/gzio.cpp b/common/gzio.cpp
new file mode 100644
index 00000000000..621afa08473
--- /dev/null
+++ b/common/gzio.cpp
@@ -0,0 +1,1211 @@
+/* gzio.c - decompression support for gzip */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 1999,2005,2006,2007,2009 Free Software Foundation, Inc.
+ *
+ * GRUB is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Most of this file was originally the source file "inflate.c", written
+ * by Mark Adler. It has been very heavily modified. In particular, the
+ * original would run through the whole file at once, and this version can
+ * be stopped and restarted on any boundary during the decompression process.
+ *
+ * The license and header comments that file are included here.
+ */
+
+/* inflate.c -- Not copyrighted 1992 by Mark Adler
+ version c10p1, 10 January 1993 */
+
+/* You can do whatever you like with this source file, though I would
+ prefer that if you modify it and redistribute it that you include
+ comments to that effect with your name and the date. Thank you.
+ */
+
+#include "common/endian.h"
+#include "common/stream.h"
+#include "common/ptr.h"
+#include "common/memstream.h"
+#include "gzio.h"
+
+
+/* Compression methods (see algorithm.doc) */
+#define GRUB_GZ_STORED 0
+#define GRUB_GZ_COMPRESSED 1
+#define GRUB_GZ_PACKED 2
+#define GRUB_GZ_LZHED 3
+/* methods 4 to 7 reserved */
+#define GRUB_GZ_DEFLATED 8
+#define GRUB_GZ_MAX_METHODS 9
+
+/* gzip flag byte */
+#define GRUB_GZ_ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */
+#define GRUB_GZ_CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */
+#define GRUB_GZ_EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
+#define GRUB_GZ_ORIG_NAME 0x08 /* bit 3 set: original file name present */
+#define GRUB_GZ_COMMENT 0x10 /* bit 4 set: file comment present */
+#define GRUB_GZ_ENCRYPTED 0x20 /* bit 5 set: file is encrypted */
+#define GRUB_GZ_RESERVED 0xC0 /* bit 6,7: reserved */
+
+#define GRUB_GZ_UNSUPPORTED_FLAGS (GRUB_GZ_CONTINUATION | GRUB_GZ_ENCRYPTED | GRUB_GZ_RESERVED)
+
+/* inflate block codes */
+#define INFLATE_STORED 0
+#define INFLATE_FIXED 1
+#define INFLATE_DYNAMIC 2
+
+namespace Common {
+
+typedef unsigned char uch;
+typedef unsigned short ush;
+typedef unsigned long ulg;
+
+
+
+/* Huffman code lookup table entry--this entry is four bytes for machines
+ that have 16-bit pointers (e.g. PC's in the small or medium model).
+ Valid extra bits are 0..13. e == 15 is EOB (end of block), e == 16
+ means that v is a literal, 16 < e < 32 means that v is a pointer to
+ the next table, which codes e - 16 bits, and lastly e == 99 indicates
+ an unused code. If a code with e == 99 is looked up, this implies an
+ error in the data. */
+struct huft
+{
+ uch e; /* number of extra bits or operation */
+ uch b; /* number of bits in this code or subcode */
+ union
+ {
+ ush n; /* literal, length base, or distance base */
+ struct huft *t; /* pointer to next level of table */
+ }
+ v;
+};
+
+
+/* The inflate algorithm uses a sliding 32K byte window on the uncompressed
+ stream to find repeated byte strings. This is implemented here as a
+ circular buffer. The index is updated simply by incrementing and then
+ and'ing with 0x7fff (32K-1). */
+/* It is left to other modules to supply the 32K area. It is assumed
+ to be usable as if it were declared "uch slide[32768];" or as just
+ "uch *slide;" and then malloc'ed in the latter case. The definition
+ must be in unzip.h, included above. */
+
+
+/* Tables for deflate from PKZIP's appnote.txt. */
+static unsigned bitorder_zlib[] =
+{ /* Order of the bit length code lengths */
+ 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+};
+
+static unsigned bitorder_clickteam[] =
+{ /* Order of the bit length code lengths */
+ 18, 17, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+};
+
+static ush cplens[] =
+{ /* Copy lengths for literal codes 257..285 */
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+ 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+ /* note: see note #13 above about the 258 in this list. */
+static ush cplext[] =
+{ /* Extra bits for literal codes 257..285 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+ 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99}; /* 99==invalid */
+static ush cpdist[] =
+{ /* Copy offsets for distance codes 0..29 */
+ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+ 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+ 8193, 12289, 16385, 24577};
+static ush cpdext[] =
+{ /* Extra bits for distance codes */
+ 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+ 7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
+ 12, 12, 13, 13};
+
+
+/*
+ Huffman code decoding is performed using a multi-level table lookup.
+ The fastest way to decode is to simply build a lookup table whose
+ size is determined by the longest code. However, the time it takes
+ to build this table can also be a factor if the data being decoded
+ is not very long. The most common codes are necessarily the
+ shortest codes, so those codes dominate the decoding time, and hence
+ the speed. The idea is you can have a shorter table that decodes the
+ shorter, more probable codes, and then point to subsidiary tables for
+ the longer codes. The time it costs to decode the longer codes is
+ then traded against the time it takes to make longer tables.
+
+ This results of this trade are in the variables lbits and dbits
+ below. lbits is the number of bits the first level table for literal/
+ length codes can decode in one step, and dbits is the same thing for
+ the distance codes. Subsequent tables are also less than or equal to
+ those sizes. These values may be adjusted either when all of the
+ codes are shorter than that, in which case the longest code length in
+ bits is used, or when the shortest code is *longer* than the requested
+ table size, in which case the length of the shortest code in bits is
+ used.
+
+ There are two different values for the two tables, since they code a
+ different number of possibilities each. The literal/length table
+ codes 286 possible values, or in a flat code, a little over eight
+ bits. The distance table codes 30 possible values, or a little less
+ than five bits, flat. The optimum values for speed end up being
+ about one bit more than those, so lbits is 8+1 and dbits is 5+1.
+ The optimum values may differ though from machine to machine, and
+ possibly even between compilers. Your mileage may vary.
+ */
+
+
+static int lbits = 9; /* bits in base literal/length lookup table */
+static int dbits = 6; /* bits in base distance lookup table */
+
+
+/* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
+#define BMAX 16 /* maximum bit length of any code (16 for explode) */
+#define N_MAX 288 /* maximum number of codes in any set */
+
+
+/* Macros for inflate() bit peeking and grabbing.
+ The usage is:
+
+ NEEDBITS(j)
+ x = b & mask_bits[j];
+ DUMPBITS(j)
+
+ where NEEDBITS makes sure that b has at least j bits in it, and
+ DUMPBITS removes the bits from b. The macros use the variable k
+ for the number of bits in b. Normally, b and k are register
+ variables for speed, and are initialized at the beginning of a
+ routine that uses these macros from a global bit buffer and count.
+
+ If we assume that EOB will be the longest code, then we will never
+ ask for bits with NEEDBITS that are beyond the end of the stream.
+ So, NEEDBITS should not read any more bytes than are needed to
+ meet the request. Then no bytes need to be "returned" to the buffer
+ at the end of the last block.
+
+ However, this assumption is not true for fixed blocks--the EOB code
+ is 7 bits, but the other literal/length codes can be 8 or 9 bits.
+ (The EOB code is shorter than other codes because fixed blocks are
+ generally short. So, while a block always has an EOB, many other
+ literal/length codes have a significantly lower probability of
+ showing up at all.) However, by making the first table have a
+ lookup of seven bits, the EOB code will be found in that first
+ lookup, and so will not require that too many bits be pulled from
+ the stream.
+ */
+
+static ush mask_bits[] =
+{
+ 0x0000,
+ 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
+ 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
+};
+
+
+#define NEEDBITS(n) do {while(k<(n)){b|=((ulg)parentGetByte())<<k;k+=8;}} while (0)
+#define DUMPBITS(n) do {b>>=(n);k-=(n);} while (0)
+
+byte
+GzioReadStream::parentGetByte ()
+{
+ if (_inbufD >= _inbufSize)
+ {
+ _inbufD = 0;
+ _inbufSize = _input->read(_inbuf, INBUFSIZ);
+ if (_inbufSize <= 0) {
+ _inbufSize = 0;
+ return 0;
+ }
+ }
+
+ return _inbuf[_inbufD++];
+}
+
+void
+GzioReadStream::parentSeek(int64 off)
+{
+ _inbufSize = 0;
+ _inbufD = 0;
+ _input->seek(off);
+}
+
+/* more function prototypes */
+static int huft_build (unsigned *, unsigned, unsigned, ush *, ush *,
+ struct huft **, int *);
+static int huft_free (struct huft *);
+
+
+/* Given a list of code lengths and a maximum table size, make a set of
+ tables to decode that set of codes. Return zero on success, one if
+ the given code set is incomplete (the tables are still built in this
+ case), two if the input is invalid (all zero length codes or an
+ oversubscribed set of lengths), and three if not enough memory. */
+
+static int
+huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */
+ unsigned n, /* number of codes (assumed <= N_MAX) */
+ unsigned s, /* number of simple-valued codes (0..s-1) */
+ ush * d, /* list of base values for non-simple codes */
+ ush * e, /* list of extra bits for non-simple codes */
+ struct huft **t, /* result: starting table */
+ int *m) /* maximum lookup bits, returns actual */
+{
+ unsigned a; /* counter for codes of length k */
+ unsigned c[BMAX + 1]; /* bit length count table */
+ unsigned f; /* i repeats in table every f entries */
+ int g; /* maximum code length */
+ int h; /* table level */
+ register unsigned i; /* counter, current code */
+ register unsigned j; /* counter */
+ register int k; /* number of bits in current code */
+ int l; /* bits per table (returned in m) */
+ register unsigned *p; /* pointer into c[], b[], or v[] */
+ register struct huft *q; /* points to current table */
+ struct huft r = {0, 0, {0}}; /* table entry for structure assignment */
+ struct huft *u[BMAX]; /* table stack */
+ unsigned v[N_MAX]; /* values in order of bit length */
+ register int w; /* bits before this table == (l * h) */
+ unsigned x[BMAX + 1]; /* bit offsets, then code stack */
+ unsigned *xp; /* pointer into x */
+ int y; /* number of dummy codes added */
+ unsigned z; /* number of entries in current table */
+
+ /* Generate counts for each bit length */
+ memset ((char *) c, 0, sizeof (c));
+ p = b;
+ i = n;
+ do
+ {
+ c[*p]++; /* assume all entries <= BMAX */
+ p++; /* Can't combine with above line (Solaris bug) */
+ }
+ while (--i);
+ if (c[0] == n) /* null input--all zero length codes */
+ {
+ *t = (struct huft *) NULL;
+ *m = 0;
+ return 0;
+ }
+
+ /* Find minimum and maximum length, bound *m by those */
+ l = *m;
+ for (j = 1; j <= BMAX; j++)
+ if (c[j])
+ break;
+ k = j; /* minimum code length */
+ if ((unsigned) l < j)
+ l = j;
+ for (i = BMAX; i; i--)
+ if (c[i])
+ break;
+ g = i; /* maximum code length */
+ if ((unsigned) l > i)
+ l = i;
+ *m = l;
+
+ /* Adjust last length count to fill out codes, if needed */
+ for (y = 1 << j; j < i; j++, y <<= 1)
+ if ((y -= c[j]) < 0)
+ return 2; /* bad input: more codes than bits */
+ if ((y -= c[i]) < 0)
+ return 2;
+ c[i] += y;
+
+ /* Generate starting offsets into the value table for each length */
+ x[1] = j = 0;
+ p = c + 1;
+ xp = x + 2;
+ while (--i)
+ { /* note that i == g from above */
+ *xp++ = (j += *p++);
+ }
+
+ /* Make a table of values in order of bit lengths */
+ for (i = 0; i < N_MAX; i++)
+ v[i] = N_MAX;
+ p = b;
+ i = 0;
+ do
+ {
+ if ((j = *p++) != 0)
+ v[x[j]++] = i;
+ }
+ while (++i < n);
+
+ /* Generate the Huffman codes and for each, make the table entries */
+ x[0] = i = 0; /* first Huffman code is zero */
+ p = v; /* grab values in bit order */
+ h = -1; /* no tables yet--level -1 */
+ w = -l; /* bits decoded == (l * h) */
+ u[0] = (struct huft *) NULL; /* just to keep compilers happy */
+ q = (struct huft *) NULL; /* ditto */
+ z = 0; /* ditto */
+
+ /* go through the bit lengths (k already is bits in shortest code) */
+ for (; k <= g; k++)
+ {
+ a = c[k];
+ while (a--)
+ {
+ /* here i is the Huffman code of length k bits for value *p */
+ /* make tables up to required level */
+ while (k > w + l)
+ {
+ h++;
+ w += l; /* previous table always l bits */
+
+ /* compute minimum size table less than or equal to l bits */
+ z = (z = (unsigned) (g - w)) > (unsigned) l ? (unsigned) l : z; /* upper limit on table size */
+ if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */
+ { /* too few codes for k-w bit table */
+ f -= a + 1; /* deduct codes from patterns left */
+ xp = c + k;
+ while (++j < z) /* try smaller tables up to z bits */
+ {
+ if ((f <<= 1) <= *++xp)
+ break; /* enough codes to use up j bits */
+ f -= *xp; /* else deduct codes from patterns */
+ }
+ }
+ z = 1 << j; /* table entries for j-bit table */
+
+ /* allocate and link in new table */
+ q = (struct huft *) calloc (z + 1, sizeof (struct huft));
+ if (! q)
+ {
+ if (h)
+ huft_free (u[0]);
+ return 3;
+ }
+
+ *t = q + 1; /* link to list for huft_free() */
+ *(t = &(q->v.t)) = (struct huft *) NULL;
+ u[h] = ++q; /* table starts after link */
+
+ /* connect to last table, if there is one */
+ if (h)
+ {
+ x[h] = i; /* save pattern for backing up */
+ r.b = (uch) l; /* bits to dump before this table */
+ r.e = (uch) (16 + j); /* bits in this table */
+ r.v.t = q; /* pointer to this table */
+ j = i >> (w - l); /* (get around Turbo C bug) */
+ u[h - 1][j] = r; /* connect to last table */
+ }
+ }
+
+ /* set up table entry in r */
+ r.b = (uch) (k - w);
+ if (p >= v + n)
+ r.e = 99; /* out of values--invalid code */
+ else if (*p < s)
+ {
+ r.e = (uch) (*p < 256 ? 16 : 15); /* 256 is end-of-block code */
+ r.v.n = (ush) (*p); /* simple code is just the value */
+ p++; /* one compiler does not like *p++ */
+ }
+ else if (*p < N_MAX)
+ {
+ r.e = (uch) e[*p - s]; /* non-simple--look up in lists */
+ r.v.n = d[*p++ - s];
+ }
+ else
+ {
+ if (h >= 0)
+ huft_free (u[0]);
+ return 2;
+ }
+
+ /* fill code-like entries with r */
+ f = 1 << (k - w);
+ for (j = i >> w; j < z; j += f)
+ q[j] = r;
+
+ /* backwards increment the k-bit code i */
+ for (j = 1 << (k - 1); i & j; j >>= 1)
+ i ^= j;
+ i ^= j;
+
+ /* backup over finished tables */
+ while ((i & ((1 << w) - 1)) != x[h])
+ {
+ h--; /* don't need to update q */
+ w -= l;
+ }
+ }
+ }
+
+ /* Return true (1) if we were given an incomplete table */
+ return y != 0 && g != 1;
+}
+
+
+/* Free the malloc'ed tables built by huft_build(), which makes a linked
+ list of the tables it made, with the links in a dummy first entry of
+ each table. */
+static int
+huft_free (struct huft *t)
+{
+ register struct huft *p, *q;
+
+
+ /* Go through linked list, freeing from the malloced (t[-1]) address. */
+ p = t;
+ while (p != (struct huft *) NULL)
+ {
+ q = (--p)->v.t;
+ free ((char *) p);
+ p = q;
+ }
+ return 0;
+}
+
+
+/*
+ * inflate (decompress) the codes in a deflated (compressed) block.
+ * Return an error code or zero if it all goes ok.
+ */
+
+int
+GzioReadStream::inflate_codes_in_window()
+{
+ register unsigned e; /* table entry flag/number of extra bits */
+ unsigned n, d; /* length and index for copy */
+ unsigned w; /* current window position */
+ struct huft *t; /* pointer to table entry */
+ unsigned ml, md; /* masks for bl and bd bits */
+ register ulg b; /* bit buffer */
+ register unsigned k; /* number of bits in bit buffer */
+
+ /* make local copies of globals */
+ d = _inflateD;
+ n = _inflateN;
+ b = _bb; /* initialize bit buffer */
+ k = _bk;
+ w = _wp; /* initialize window position */
+
+ /* inflate the coded data */
+ ml = mask_bits[_bl]; /* precompute masks for speed */
+ md = mask_bits[_bd];
+ for (;;) /* do until end of block */
+ {
+ if (! _codeState)
+ {
+ if (_tl == NULL)
+ {
+ _err = true;
+ return 1;
+ }
+
+ NEEDBITS ((unsigned) _bl);
+ if ((e = (t = _tl + ((unsigned) b & ml))->e) > 16)
+ do
+ {
+ if (e == 99)
+ {
+ _err = true;
+ return 1;
+ }
+ DUMPBITS (t->b);
+ e -= 16;
+ NEEDBITS (e);
+ }
+ while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
+ DUMPBITS (t->b);
+
+ if (e == 16) /* then it's a literal */
+ {
+ _slide[w++] = (uch) t->v.n;
+ if (w == WSIZE)
+ break;
+ }
+ else
+ /* it's an EOB or a length */
+ {
+ /* exit if end of block */
+ if (e == 15)
+ {
+ _blockLen = 0;
+ break;
+ }
+
+ /* get length of block to copy */
+ NEEDBITS (e);
+ n = t->v.n + ((unsigned) b & mask_bits[e]);
+ DUMPBITS (e);
+
+ if (_td == NULL)
+ {
+ _err = true;
+ return 1;
+ }
+
+ /* decode distance of block to copy */
+ NEEDBITS ((unsigned) _bd);
+ if ((e = (t = _td + ((unsigned) b & md))->e) > 16)
+ do
+ {
+ if (e == 99)
+ {
+ _err = true;
+ return 1;
+ }
+ DUMPBITS (t->b);
+ e -= 16;
+ NEEDBITS (e);
+ }
+ while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e)
+ > 16);
+ DUMPBITS (t->b);
+ NEEDBITS (e);
+ d = w - t->v.n - ((unsigned) b & mask_bits[e]);
+ DUMPBITS (e);
+ _codeState++;
+ }
+ }
+
+ if (_codeState)
+ {
+ /* do the copy */
+ do
+ {
+ n -= (e = (e = WSIZE - ((d &= WSIZE - 1) > w ? d : w)) > n ? n
+ : e);
+
+ if (w - d >= e)
+ {
+ memmove (_slide + w, _slide + d, e);
+ w += e;
+ d += e;
+ }
+ else
+ /* purposefully use the overlap for extra copies here!! */
+ {
+ while (e--)
+ _slide[w++] = _slide[d++];
+ }
+
+ if (w == WSIZE)
+ break;
+ }
+ while (n);
+
+ if (! n)
+ _codeState--;
+
+ /* did we break from the loop too soon? */
+ if (w == WSIZE)
+ break;
+ }
+ }
+
+ /* restore the globals from the locals */
+ _inflateD = d;
+ _inflateN = n;
+ _wp = w; /* restore global window pointer */
+ _bb = b; /* restore global bit buffer */
+ _bk = k;
+
+ return ! _blockLen;
+}
+
+
+/* get header for an inflated type 0 (stored) block. */
+
+void
+GzioReadStream::init_stored_block ()
+{
+ register ulg b; /* bit buffer */
+ register unsigned k; /* number of bits in bit buffer */
+
+ /* make local copies of globals */
+ b = _bb; /* initialize bit buffer */
+ k = _bk;
+
+ /* go to byte boundary */
+ DUMPBITS (k & 7);
+
+ /* get the length and its complement */
+ NEEDBITS (16);
+ _blockLen = ((unsigned) b & 0xffff);
+ DUMPBITS (16);
+ if (_mode != GzioReadStream::Mode::CLICKTEAM) {
+ NEEDBITS (16);
+ if (_blockLen != (int) ((~b) & 0xffff))
+ _err = true;
+ DUMPBITS (16);
+ }
+
+ /* restore global variables */
+ _bb = b;
+ _bk = k;
+}
+
+
+/* get header for an inflated type 1 (fixed Huffman codes) block. We should
+ either replace this with a custom decoder, or at least precompute the
+ Huffman tables. */
+
+void
+GzioReadStream::init_fixed_block ()
+{
+ int i; /* temporary variable */
+ unsigned l[288]; /* length list for huft_build */
+
+ /* set up literal table */
+ for (i = 0; i < 144; i++)
+ l[i] = 8;
+ for (; i < 256; i++)
+ l[i] = 9;
+ for (; i < 280; i++)
+ l[i] = 7;
+ for (; i < 288; i++) /* make a complete, but wrong code set */
+ l[i] = 8;
+ _bl = 7;
+ if (huft_build (l, 288, 257, cplens, cplext, &_tl, &_bl) != 0)
+ {
+ _err = true;
+ return;
+ }
+
+ /* set up distance table */
+ for (i = 0; i < 30; i++) /* make an incomplete code set */
+ l[i] = 5;
+ _bd = 5;
+ if (huft_build (l, 30, 0, cpdist, cpdext, &_td, &_bd) > 1)
+ {
+ _err = true;
+ huft_free (_tl);
+ _tl = 0;
+ return;
+ }
+
+ /* indicate we're now working on a block */
+ _codeState = 0;
+ _blockLen++;
+}
+
+
+/* get header for an inflated type 2 (dynamic Huffman codes) block. */
+
+void
+GzioReadStream::init_dynamic_block ()
+{
+ int i; /* temporary variables */
+ unsigned j;
+ unsigned l; /* last length */
+ unsigned m; /* mask for bit lengths table */
+ unsigned n; /* number of lengths to get */
+ unsigned nb; /* number of bit length codes */
+ unsigned nl; /* number of literal/length codes */
+ unsigned nd; /* number of distance codes */
+ unsigned ll[286 + 30]; /* literal/length and distance code lengths */
+ register ulg b; /* bit buffer */
+ register unsigned k; /* number of bits in bit buffer */
+ unsigned *bitorder = (_mode == GzioReadStream::Mode::CLICKTEAM) ? bitorder_clickteam : bitorder_zlib;
+
+ /* make local bit buffer */
+ b = _bb;
+ k = _bk;
+
+ /* read in table lengths */
+ NEEDBITS (5);
+ nl = 257 + ((unsigned) b & 0x1f); /* number of literal/length codes */
+ DUMPBITS (5);
+ NEEDBITS (5);
+ nd = 1 + ((unsigned) b & 0x1f); /* number of distance codes */
+ DUMPBITS (5);
+ NEEDBITS (4);
+ nb = 4 + ((unsigned) b & 0xf); /* number of bit length codes */
+ DUMPBITS (4);
+ if (nl > 286 || nd > 30)
+ {
+ _err = true;
+ return;
+ }
+
+ /* read in bit-length-code lengths */
+ for (j = 0; j < nb; j++)
+ {
+ NEEDBITS (3);
+ ll[bitorder[j]] = (unsigned) b & 7;
+ DUMPBITS (3);
+ }
+ for (; j < 19; j++)
+ ll[bitorder[j]] = 0;
+
+ /* build decoding table for trees--single level, 7 bit lookup */
+ _bl = 7;
+ if (huft_build (ll, 19, 19, NULL, NULL, &_tl, &_bl) != 0)
+ {
+ _err = true;
+ return;
+ }
+
+ /* read in literal and distance code lengths */
+ n = nl + nd;
+ m = mask_bits[_bl];
+ i = l = 0;
+
+ if (_tl == NULL)
+ {
+ _err = true;
+ return;
+ }
+
+ while ((unsigned) i < n)
+ {
+ NEEDBITS ((unsigned) _bl);
+ j = (_td = _tl + ((unsigned) b & m))->b;
+ DUMPBITS (j);
+ j = _td->v.n;
+ if (j < 16) /* length of code in bits (0..15) */
+ ll[i++] = l = j; /* save last length in l */
+ else if (j == 16) /* repeat last length 3 to 6 times */
+ {
+ NEEDBITS (2);
+ j = 3 + ((unsigned) b & 3);
+ DUMPBITS (2);
+ if ((unsigned) i + j > n)
+ {
+ _err = true;
+ goto fail;
+ }
+ while (j--)
+ ll[i++] = l;
+ }
+ else if (j == 17) /* 3 to 10 zero length codes */
+ {
+ NEEDBITS (3);
+ j = 3 + ((unsigned) b & 7);
+ DUMPBITS (3);
+ if ((unsigned) i + j > n)
+ {
+ _err = true;
+ goto fail;
+ }
+ while (j--)
+ ll[i++] = 0;
+ l = 0;
+ }
+ else
+ /* j == 18: 11 to 138 zero length codes */
+ {
+ NEEDBITS (7);
+ j = 11 + ((unsigned) b & 0x7f);
+ DUMPBITS (7);
+ if ((unsigned) i + j > n)
+ {
+ _err = true;
+ goto fail;
+ }
+ while (j--)
+ ll[i++] = 0;
+ l = 0;
+ }
+ }
+
+ /* free decoding table for trees */
+ huft_free (_tl);
+ _td = 0;
+ _tl = 0;
+
+ /* restore the global bit buffer */
+ _bb = b;
+ _bk = k;
+
+ /* build the decoding tables for literal/length and distance codes */
+ _bl = lbits;
+ if (huft_build (ll, nl, 257, cplens, cplext, &_tl, &_bl) != 0)
+ {
+ _err = true;
+ _tl = 0;
+ return;
+ }
+ _bd = dbits;
+ if (huft_build (ll + nl, nd, 0, cpdist, cpdext, &_td, &_bd) != 0)
+ {
+ huft_free (_tl);
+ _tl = 0;
+ _td = 0;
+ _err = true;
+ return;
+ }
+
+ /* indicate we're now working on a block */
+ _codeState = 0;
+ _blockLen++;
+ return;
+
+ fail:
+ huft_free (_tl);
+ _td = NULL;
+ _tl = NULL;
+}
+
+
+void
+GzioReadStream::get_new_block()
+{
+ register ulg b; /* bit buffer */
+ register unsigned k; /* number of bits in bit buffer */
+
+ /* make local bit buffer */
+ b = _bb;
+ k = _bk;
+
+ if (_mode == GzioReadStream::Mode::CLICKTEAM) {
+ /* read in block type */
+ NEEDBITS (3);
+ switch ((unsigned) b & 7) {
+ case 5:
+ _blockType = INFLATE_FIXED;
+ break;
+ case 6:
+ _blockType = INFLATE_DYNAMIC;
+ break;
+ case 7:
+ _blockType = INFLATE_STORED;
+ break;
+ }
+ DUMPBITS (3);
+
+ /* read in last block bit */
+ NEEDBITS (1);
+ _lastBlock = (int) b & 1;
+ DUMPBITS (1);
+ } else {
+ /* read in last block bit */
+ NEEDBITS (1);
+ _lastBlock = (int) b & 1;
+ DUMPBITS (1);
+
+ /* read in block type */
+ NEEDBITS (2);
+ _blockType = (unsigned) b & 3;
+ DUMPBITS (2);
+ }
+
+ /* restore the global bit buffer */
+ _bb = b;
+ _bk = k;
+
+ switch (_blockType)
+ {
+ case INFLATE_STORED:
+ init_stored_block ();
+ break;
+ case INFLATE_FIXED:
+ init_fixed_block ();
+ break;
+ case INFLATE_DYNAMIC:
+ init_dynamic_block ();
+ break;
+ default:
+ break;
+ }
+}
+
+
+void
+GzioReadStream::inflate_window ()
+{
+ /* initialize window */
+ _wp = 0;
+
+ /*
+ * Main decompression loop.
+ */
+
+ while (_wp < WSIZE && !_err)
+ {
+ if (! _blockLen)
+ {
+ if (_lastBlock)
+ break;
+
+ get_new_block ();
+ }
+
+ if (_blockType > INFLATE_DYNAMIC)
+ _err = true;
+
+ if (_err)
+ return;
+
+ /*
+ * Expand stored block here.
+ */
+ if (_blockType == INFLATE_STORED)
+ {
+ int w = _wp;
+
+ /*
+ * This is basically a glorified pass-through
+ */
+
+ while (_blockLen && w < WSIZE && !_err)
+ {
+ _slide[w++] = parentGetByte ();
+ _blockLen--;
+ }
+
+ _wp = w;
+
+ continue;
+ }
+
+ /*
+ * Expand other kind of block.
+ */
+
+ if (inflate_codes_in_window ())
+ {
+ huft_free (_tl);
+ huft_free (_td);
+ _tl = 0;
+ _td = 0;
+ }
+ }
+
+ _savedOffset += _wp;
+}
+
+
+void
+GzioReadStream::initialize_tables()
+{
+ _savedOffset = 0;
+ parentSeek (_dataOffset);
+
+ /* Initialize the bit buffer. */
+ _bk = 0;
+ _bb = 0;
+
+ /* Reset partial decompression code. */
+ _lastBlock = 0;
+ _blockLen = 0;
+
+ /* Reset memory allocation stuff. */
+ huft_free (_tl);
+ huft_free (_td);
+ _tl = NULL;
+ _td = NULL;
+}
+
+
+static uint8
+mod_31 (uint16 v)
+{
+ /* At most 2 iterations for any number that
+ we can get here.
+ In any case faster than real division. */
+ while (v > 0x1f)
+ v = (v & 0x1f) + (v >> 5);
+ if (v == 0x1f)
+ return 0;
+ return v;
+}
+
+bool
+GzioReadStream::test_zlib_header ()
+{
+ uint8 cmf, flg;
+
+ cmf = parentGetByte ();
+ flg = parentGetByte ();
+
+ /* Check that compression method is DEFLATE. */
+ if ((cmf & 0xf) != GRUB_GZ_DEFLATED)
+ {
+ return false;
+ }
+
+ /* Usually it would be: (cmf * 256 + flg) % 31 != 0. */
+ /* But 256 == 8 (31). */
+ /* By multiplying by 4 and using 32 == 1 (31). We get our formula. */
+ if (mod_31 (cmf + flg * 4) != 0)
+ {
+ return false;
+ }
+
+ /* Dictionary isn't supported. */
+ if (flg & 0x20)
+ {
+ return false;
+ }
+
+ _dataOffset = 2;
+
+ return true;
+}
+
+int32
+GzioReadStream::readAtOffset (int64 offset, byte *buf, uint32 len)
+{
+ int32 ret = 0;
+
+ /* Do we reset decompression to the beginning of the file? */
+ if (_savedOffset > offset + WSIZE)
+ initialize_tables ();
+
+ /*
+ * This loop operates upon uncompressed data only. The only
+ * special thing it does is to make sure the decompression
+ * window is within the range of data it needs.
+ */
+
+ while (len > 0 && !_err)
+ {
+ register uint32 size;
+ register char *srcaddr;
+
+ while (offset >= _savedOffset)
+ {
+ inflate_window ();
+ if (_wp == 0)
+ goto out;
+ }
+
+ if (_wp == 0)
+ goto out;
+
+ srcaddr = (char *) ((offset & (WSIZE - 1)) + _slide);
+ size = _savedOffset - offset;
+ if (size > len)
+ size = len;
+
+ memmove (buf, srcaddr, size);
+
+ buf += size;
+ len -= size;
+ ret += size;
+ offset += size;
+ }
+
+ out:
+ if (_err)
+ ret = -1;
+ return ret;
+}
+
+uint32 GzioReadStream::read(void *dataPtr, uint32 dataSize) {
+ bool maybeEos = false;
+ // Read at most as many bytes as are still available...
+ if (dataSize > _uncompressedSize - _streamPos) {
+ dataSize = _uncompressedSize - _streamPos;
+ maybeEos = true;
+ }
+
+ int32 actualRead = readAtOffset(_streamPos, (byte *)dataPtr, dataSize);
+ if (actualRead < 0) {
+ return -1;
+ }
+
+ _streamPos += actualRead;
+
+ if (maybeEos && actualRead == dataSize)
+ _eos = true;
+
+ return actualRead;
+}
+
+bool GzioReadStream::seek(int64 offs, int whence) {
+ // Pre-Condition
+ assert(_streamPos <= _uncompressedSize);
+ switch (whence) {
+ case SEEK_END:
+ _streamPos = _uncompressedSize + offs;
+ break;
+ case SEEK_SET:
+ default:
+ _streamPos = offs;
+ break;
+
+ case SEEK_CUR:
+ _streamPos += offs;
+ break;
+ }
+ // Post-Condition
+ assert(_streamPos <= _uncompressedSize);
+
+ // Reset end-of-stream flag on a successful seek
+ _eos = false;
+ return true;
+}
+
+GzioReadStream* GzioReadStream::openDeflate(Common::SeekableReadStream *parent, uint64 uncompressed_size, DisposeAfterUse::Flag disposeParent)
+{
+ GzioReadStream *gzio = new GzioReadStream(parent, disposeParent, uncompressed_size, GzioReadStream::Mode::ZLIB);
+
+ gzio->initialize_tables ();
+
+ return gzio;
+}
+
+GzioReadStream* GzioReadStream::openClickteam(Common::SeekableReadStream *parent, uint64 uncompressed_size, DisposeAfterUse::Flag disposeParent)
+{
+ GzioReadStream *gzio = new GzioReadStream(parent, disposeParent, uncompressed_size, GzioReadStream::Mode::CLICKTEAM);
+
+ gzio->initialize_tables ();
+
+ return gzio;
+}
+
+GzioReadStream* GzioReadStream::openZlib(Common::SeekableReadStream *parent, uint64 uncompressed_size, DisposeAfterUse::Flag disposeParent)
+{
+ GzioReadStream* gzio = new GzioReadStream(parent, disposeParent, uncompressed_size, GzioReadStream::Mode::ZLIB);
+
+ if (!gzio->test_zlib_header())
+ {
+ delete gzio;
+ return nullptr;
+ }
+
+ gzio->initialize_tables();
+
+ return gzio;
+}
+
+int32
+GzioReadStream::clickteamDecompress (byte *outbuf, uint32 outsize, byte *inbuf, uint32 insize, int64 off)
+{
+ Common::ScopedPtr<GzioReadStream> gzio(GzioReadStream::openClickteam(new Common::MemoryReadStream(inbuf, insize, DisposeAfterUse::NO), outsize + off, DisposeAfterUse::YES));
+ if (!gzio)
+ return -1;
+ return gzio->readAtOffset(off, outbuf, outsize);
+}
+
+int32
+GzioReadStream::deflateDecompress (byte *outbuf, uint32 outsize, byte *inbuf, uint32 insize, int64 off)
+{
+ Common::ScopedPtr<GzioReadStream> gzio(GzioReadStream::openDeflate(new Common::MemoryReadStream(inbuf, insize, DisposeAfterUse::NO), outsize + off, DisposeAfterUse::YES));
+ if (!gzio)
+ return -1;
+ return gzio->readAtOffset(off, outbuf, outsize);
+}
+
+int32
+GzioReadStream::zlibDecompress (byte *outbuf, uint32 outsize, byte *inbuf, uint32 insize, int64 off)
+{
+ Common::ScopedPtr<GzioReadStream> gzio(GzioReadStream::openZlib(new Common::MemoryReadStream(inbuf, insize, DisposeAfterUse::NO), outsize + off, DisposeAfterUse::YES));
+ if (!gzio)
+ return -1;
+ return gzio->readAtOffset(off, outbuf, outsize);
+}
+
+}
diff --git a/common/gzio.h b/common/gzio.h
new file mode 100644
index 00000000000..320f6e6be1e
--- /dev/null
+++ b/common/gzio.h
@@ -0,0 +1,143 @@
+/* gzio.c - decompression support for gzip */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 1999,2005,2006,2007,2009 Free Software Foundation, Inc.
+ *
+ * GRUB is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Most of this file was originally the source file "inflate.c", written
+ * by Mark Adler. It has been very heavily modified. In particular, the
+ * original would run through the whole file at once, and this version can
+ * be stopped and restarted on any boundary during the decompression process.
+ *
+ * The license and header comments that file are included here.
+ */
+
+/* inflate.c -- Not copyrighted 1992 by Mark Adler
+ version c10p1, 10 January 1993 */
+
+/* You can do whatever you like with this source file, though I would
+ prefer that if you modify it and redistribute it that you include
+ comments to that effect with your name and the date. Thank you.
+ */
+
+#include "common/scummsys.h"
+#include "common/stream.h"
+#include "common/ptr.h"
+
+namespace Common {
+
+/* The state stored in filesystem-specific data. */
+class GzioReadStream : public Common::SeekableReadStream
+{
+public:
+ static GzioReadStream* openClickteam(Common::SeekableReadStream *parent, uint64 uncompressed_size, DisposeAfterUse::Flag disposeParent = DisposeAfterUse::NO);
+ static GzioReadStream* openDeflate(Common::SeekableReadStream *parent, uint64 uncompressed_size, DisposeAfterUse::Flag disposeParent = DisposeAfterUse::NO);
+ static GzioReadStream* openZlib(Common::SeekableReadStream *parent, uint64 uncompressed_size, DisposeAfterUse::Flag disposeParent = DisposeAfterUse::NO);
+ static int32 clickteamDecompress (byte *outbuf, uint32 outsize, byte *inbuf, uint32 insize, int64 off = 0);
+ static int32 deflateDecompress (byte *outbuf, uint32 outsize, byte *inbuf, uint32 insize, int64 off = 0);
+ static int32 zlibDecompress (byte *outbuf, uint32 outsize, byte *inbuf, uint32 insize, int64 off = 0);
+ int32 readAtOffset(int64 offset, byte *buf, uint32 len);
+
+ uint32 read(void *dataPtr, uint32 dataSize) override;
+
+ bool eos() const { return _eos; }
+ bool err() const override { return _err; }
+ void clearErr() override { _eos = false; _err = false; }
+
+ int64 pos() const override { return _streamPos; }
+ int64 size() const override { return _uncompressedSize; }
+
+ bool seek(int64 offs, int whence = SEEK_SET) override;
+
+private:
+ /*
+ * Window Size
+ *
+ * This must be a power of two, and at least 32K for zip's deflate method
+ */
+
+ static const int WSIZE = 0x8000;
+ static const int INBUFSIZ = 0x2000;
+
+ /* If input is in memory following fields are used instead of file. */
+ Common::DisposablePtr<Common::SeekableReadStream> _input;
+ /* The offset at which the data starts in the underlying file. */
+ int64 _dataOffset;
+ /* The type of current block. */
+ int _blockType;
+ /* The length of current block. */
+ int _blockLen;
+ /* The flag of the last block. */
+ int _lastBlock;
+ /* The flag of codes. */
+ int _codeState;
+ /* The length of a copy. */
+ unsigned _inflateN;
+ /* The index of a copy. */
+ unsigned _inflateD;
+ /* The bit buffer. */
+ unsigned long _bb;
+ /* The bits in the bit buffer. */
+ unsigned _bk;
+ /* The sliding window in uncompressed data. */
+ uint8 _slide[WSIZE];
+ /* Current position in the slide. */
+ unsigned _wp;
+ /* The literal/length code table. */
+ struct huft *_tl;
+ /* The distance code table. */
+ struct huft *_td;
+ /* The lookup bits for the literal/length code table. */
+ int _bl;
+ /* The lookup bits for the distance code table. */
+ int _bd;
+ /* The original offset value. */
+ int64 _savedOffset;
+
+ bool _err;
+
+ /* The input buffer. */
+ byte _inbuf[INBUFSIZ];
+ int _inbufD;
+ int _inbufSize;
+ uint64 _uncompressedSize;
+ uint64 _streamPos;
+ bool _eos;
+
+ enum class Mode { ZLIB, CLICKTEAM } _mode;
+
+ GzioReadStream(Common::SeekableReadStream *parent, DisposeAfterUse::Flag disposeParent, uint64 uncompressedSize, Mode mode) :
+ _dataOffset(0), _blockType(0), _blockLen(0),
+ _lastBlock(0), _codeState (0), _inflateN(0),
+ _inflateD(0), _bb(0), _bk(0), _wp(0), _tl(nullptr),
+ _td(nullptr), _bl(0),
+ _bd(0), _savedOffset(0), _err(false), _mode(mode), _input(parent, disposeParent),
+ _inbufD(0), _inbufSize(0), _uncompressedSize(uncompressedSize), _streamPos(0), _eos(false) {}
+
+ void inflate_window();
+ void initialize_tables();
+ bool test_zlib_header();
+ void get_new_block();
+ byte parentGetByte();
+ void parentSeek(int64 off);
+ void init_fixed_block();
+ int inflate_codes_in_window();
+ void init_dynamic_block ();
+ void init_stored_block ();
+};
+
+}
diff --git a/common/module.mk b/common/module.mk
index 7045ff87edf..621e5076e10 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -13,6 +13,7 @@ MODULE_OBJS := \
file.o \
fs.o \
gui_options.o \
+ gzio.o \
hashmap.o \
iff_container.o \
ini-file.o \
Commit: 33475787a29865d714d0cf08ba97a89e19b34fbd
https://github.com/scummvm/scummvm/commit/33475787a29865d714d0cf08ba97a89e19b34fbd
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-11-18T01:22:59+01:00
Commit Message:
COMMON: Add clickteam installer unpacker
Changed paths:
A common/clickteam.cpp
A common/clickteam.h
common/module.mk
diff --git a/common/clickteam.cpp b/common/clickteam.cpp
new file mode 100644
index 00000000000..022522afde4
--- /dev/null
+++ b/common/clickteam.cpp
@@ -0,0 +1,293 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "common/array.h"
+#include "common/clickteam.h"
+#include "common/gzio.h"
+#include "common/debug.h"
+#include "common/ptr.h"
+#include "common/substream.h"
+#include "common/memstream.h"
+
+#define STUB_SIZE 0x16000
+#define FLAG_COMPRESSED 1
+
+namespace Common {
+
+ClickteamInstaller::ClickteamFileDescriptor::ClickteamFileDescriptor(const ClickteamTag& contentsTag, uint32 off)
+ : _fileDataOffset(0), _fileDescriptorOffset(0), _compressedSize(0), _uncompressedSize(0) {
+ uint32 stringsOffset = 36;
+ byte *tag = contentsTag._contents + off;
+ uint32 lmax = contentsTag._size - off;
+ if (lmax < 0x24)
+ return;
+ uint16 ls = READ_LE_UINT32(tag), l;
+ if (ls < 0x24)
+ return;
+
+ l = MIN((uint32)ls, lmax);
+
+ uint16 flags = READ_LE_UINT32(tag+22);
+ if (flags & 6)
+ stringsOffset += 0x12;
+ if (flags & 8)
+ stringsOffset += 0x18;
+ if (stringsOffset >= l) {
+ return;
+ }
+ _fileDataOffset = READ_LE_UINT32(tag + 6);
+ _compressedSize = READ_LE_UINT32(tag + 10);
+ _uncompressedSize = READ_LE_UINT32(tag + 14);
+ _expectedCRC = READ_LE_UINT32(tag + 18);
+ char *strings = (char *)tag + stringsOffset;
+ char *p;
+ for (p = strings; p < (char*)tag + lmax && *p; p++);
+ _fileName = Common::String(strings, p - strings);
+ _fileDescriptorOffset = off;
+}
+
+ClickteamInstaller::ClickteamTag* ClickteamInstaller::getTag(ClickteamTagId tagId) const {
+ return _tags.getValOrDefault((uint16) tagId).get();
+}
+
+static uint32 computeCRC(byte *buf, uint32 sz, uint32 previous) {
+ uint32 cur = previous;
+ byte *ptr = buf;
+ uint32 i;
+
+ for (i = 0; i < (sz & ~3); i += 4, ptr += 4)
+ cur = READ_LE_UINT32(ptr) + (cur >> 31) + (cur << 1);
+
+ for (; i < sz; i++, ptr++)
+ cur = (*ptr) + (cur >> 31) + (cur << 1);
+
+ return cur;
+}
+
+bool checkStubAndComputeCRC1(Common::SeekableReadStream *stream, uint32 &crc) {
+ if (stream->size() <= STUB_SIZE) {
+ return false;
+ }
+
+ byte *stub = new byte[STUB_SIZE];
+ static const byte BLOCK1_MAGIC_START[] = { 0x77, 0x77, 0x49, 0x4e, 0x53, 0x53 };
+ static const byte BLOCK1_MAGIC_END[] = { 0x77, 0x77, 0x49, 0x4e, 0x53, 0x45 };
+
+ stream->seek(0);
+ stream->read(stub, STUB_SIZE);
+
+ byte *ptr;
+
+ for (ptr = stub; ptr < stub + STUB_SIZE - sizeof(BLOCK1_MAGIC_START); ptr++) {
+ if (memcmp(ptr, BLOCK1_MAGIC_START, sizeof(BLOCK1_MAGIC_START)) == 0)
+ break;
+ }
+
+ if (ptr == stub + STUB_SIZE - sizeof(BLOCK1_MAGIC_START)) {
+ delete[] stub;
+ return false;
+ }
+
+ byte *block1start = ptr;
+ ptr += sizeof(BLOCK1_MAGIC_START);
+
+ for (; ptr < stub + STUB_SIZE - sizeof(BLOCK1_MAGIC_END); ptr++) {
+ if (memcmp(ptr, BLOCK1_MAGIC_END, sizeof(BLOCK1_MAGIC_END)) == 0)
+ break;
+ }
+
+ if (ptr == stub + STUB_SIZE - sizeof(BLOCK1_MAGIC_END)) {
+ delete[] stub;
+ return false;
+ }
+
+ byte *block1end = ptr;
+ crc = computeCRC(block1start, block1end - block1start, 0);
+ delete[] stub;
+ return true;
+}
+
+struct TagHead {
+ uint16 id;
+ uint16 flags;
+ uint32 compressedLen;
+};
+
+ClickteamInstaller* ClickteamInstaller::open(Common::SeekableReadStream *stream, DisposeAfterUse::Flag dispose) {
+ Common::HashMap<Common::String, ClickteamFileDescriptor, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> files;
+ HashMap<uint16, Common::SharedPtr<ClickteamTag>> tags;
+ uint32 crc_xor;
+
+ if (!checkStubAndComputeCRC1(stream, crc_xor))
+ return nullptr;
+
+ int64 block3_offset = -1, block3_len = 0;
+
+ while (!stream->eos()) {
+ TagHead tagHead;
+ stream->read(&tagHead, sizeof(tagHead));
+ uint16 tagId = FROM_LE_16(tagHead.id);
+ uint16 flags = FROM_LE_16(tagHead.flags);
+ uint32 compressedPayloadLen = FROM_LE_32(tagHead.compressedLen);
+ if (tagId == 0x7f7f) {
+ stream->skip(4);
+ block3_offset = stream->pos();
+ block3_len = stream->readUint32LE();
+ break;
+ }
+ if (compressedPayloadLen == 0) {
+ break;
+ }
+ byte *compressedPayload = new byte[compressedPayloadLen];
+ stream->read(compressedPayload, compressedPayloadLen);
+
+ ClickteamTag *tag;
+
+ if (flags & FLAG_COMPRESSED) {
+ if (compressedPayloadLen < 4) {
+ delete[] compressedPayload;
+ continue;
+ }
+ uint32 uncompressedPayloadLen = READ_LE_UINT32(compressedPayload);
+ byte *uncompressedPayload = new byte[uncompressedPayloadLen];
+ int32 ret = Common::GzioReadStream::clickteamDecompress(uncompressedPayload,
+ uncompressedPayloadLen,
+ compressedPayload + 4,
+ compressedPayloadLen - 4);
+ delete[] compressedPayload;
+ if (ret < 0) {
+ debug ("Decompression error");
+ continue;
+ }
+ tag = new ClickteamTag(tagId, uncompressedPayload, uncompressedPayloadLen);
+ } else {
+ tag = new ClickteamTag(tagId, compressedPayload, compressedPayloadLen);
+ }
+ tags[tagId].reset(tag);
+ switch (tag->_tagId) {
+ case (uint16) ClickteamTagId::FILE_LIST: {
+ if (tag->_size < 4) {
+ return nullptr;
+ }
+ uint32 count = READ_LE_UINT32(tag->_contents);
+ uint32 off = 4;
+ for (unsigned i = 0; i < count && off + 0x24 < tag->_size; i++) {
+ uint16 l = READ_LE_UINT16(tag->_contents + off);
+ if (l < 0x24)
+ break;
+ ClickteamFileDescriptor desc(*tag, off);
+ files[desc._fileName] = desc;
+ off += l;
+ }
+ break;
+ }
+ case 0x1237: {
+ byte *p;
+ for (p = tag->_contents; p < tag->_contents + tag->_size; p++)
+ if (!*p)
+ break;
+ crc_xor = computeCRC(tag->_contents, p - tag->_contents, crc_xor);
+ break;
+ }
+ }
+ }
+
+ if (block3_offset <= 0 || block3_len <= 0)
+ return nullptr;
+
+ return new ClickteamInstaller(files, tags, crc_xor, block3_offset, block3_len, stream, dispose);
+}
+
+static Common::String translateName(const Path &path) {
+ return Common::normalizePath(path.toString('\\'), '\\');
+}
+
+bool ClickteamInstaller::hasFile(const Path &path) const {
+ return _files.contains(translateName(path));
+}
+
+int ClickteamInstaller::listMembers(ArchiveMemberList &list) const {
+ int members = 0;
+
+ for (Common::HashMap<Common::String, ClickteamFileDescriptor, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo>::const_iterator i = _files.begin(), end = _files.end();
+ i != end; ++i) {
+ list.push_back(ArchiveMemberList::value_type(new GenericArchiveMember(i->_key, this)));
+ ++members;
+ }
+
+ return members;
+}
+
+const ArchiveMemberPtr ClickteamInstaller::getMember(const Path &path) const {
+ Common::String translated = translateName(path);
+ if (!_files.contains(translated))
+ return nullptr;
+
+ return Common::SharedPtr<Common::ArchiveMember>(new GenericArchiveMember(_files.getVal(translated)._fileName, this));
+}
+
+// TODO: Make streams stay valid after destructing of archive
+SeekableReadStream *ClickteamInstaller::createReadStreamForMember(const Path &path) const {
+ Common::String translated = translateName(path);
+ if (!_files.contains(translated))
+ return nullptr;
+ ClickteamFileDescriptor desc = _files.getVal(translated);
+ if (_cache.contains(desc._fileName)) {
+ return new Common::MemoryReadStream(_cache[desc._fileName].get(), desc._uncompressedSize, DisposeAfterUse::NO);
+ }
+ Common::SeekableReadStream *subStream = new Common::SeekableSubReadStream(_stream.get(), _block3Offset + desc._fileDataOffset,
+ _block3Offset + desc._fileDataOffset + desc._compressedSize);
+ if (!subStream) {
+ debug("Decompression error");
+ return nullptr;
+ }
+ Common::ScopedPtr<Common::SeekableReadStream> uncStream(GzioReadStream::openClickteam(subStream, desc._uncompressedSize, DisposeAfterUse::YES));
+ if (!uncStream) {
+ debug("Decompression error");
+ return nullptr;
+ }
+
+ byte *uncompressedBuffer = new byte[desc._uncompressedSize];
+
+ int64 ret = uncStream->read(uncompressedBuffer, desc._uncompressedSize);
+ if (ret < 0 || ret < desc._uncompressedSize) {
+ debug ("Decompression error");
+ delete[] uncompressedBuffer;
+ return nullptr;
+ }
+
+ if (desc._expectedCRC != 0 || !desc._fileName.equalsIgnoreCase("Uninstal.exe")) {
+ uint32 expectedCrc = desc._expectedCRC ^ _crcXor;
+ uint32 actualCrc = computeCRC(uncompressedBuffer, desc._uncompressedSize, 0);
+
+ if (actualCrc != expectedCrc) {
+ debug("CRC mismatch for %s: expected=%08x (obfuscated %08x), actual=%08x", desc._fileName.c_str(), expectedCrc, desc._expectedCRC, actualCrc);
+ delete[] uncompressedBuffer;
+ return nullptr;
+ }
+ }
+
+ _cache[desc._fileName].reset(uncompressedBuffer);
+ // TODO: Make it configurable to use a uncompressing substream instead
+ return new Common::MemoryReadStream(uncompressedBuffer, desc._uncompressedSize, DisposeAfterUse::NO);
+}
+
+}
diff --git a/common/clickteam.h b/common/clickteam.h
new file mode 100644
index 00000000000..f9dba586bdc
--- /dev/null
+++ b/common/clickteam.h
@@ -0,0 +1,98 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef COMMON_CLICKTEAM_H
+#define COMMON_CLICKTEAM_H
+
+#include "common/archive.h"
+#include "common/ptr.h"
+#include "common/stream.h"
+#include "common/hashmap.h"
+#include "common/hash-str.h"
+
+namespace Common {
+class ClickteamInstaller : public Archive {
+public:
+ enum class ClickteamTagId : uint16 {
+ BANNER_IMAGE = 0x1235,
+ FILE_LIST = 0x123a,
+ STRINGS = 0x123e,
+ UNINSTALLER = 0x123f
+ };
+
+ class ClickteamTag : Common::NonCopyable {
+ protected:
+ ClickteamTag(uint16 tagId, byte *contents, uint32 size) : _tagId(tagId), _contents(contents), _size(size) {
+ }
+ friend class ClickteamInstaller;
+ public:
+ uint16 _tagId;
+ byte *_contents;
+ uint32 _size;
+
+ ~ClickteamTag() {
+ delete _contents;
+ }
+ };
+
+ bool hasFile(const Path &path) const override;
+ int listMembers(Common::ArchiveMemberList&) const override;
+ const ArchiveMemberPtr getMember(const Path &path) const override;
+ SeekableReadStream *createReadStreamForMember(const Path &path) const override;
+
+ ClickteamTag* getTag(ClickteamTagId tagId) const;
+
+ static ClickteamInstaller* open(Common::SeekableReadStream *stream, DisposeAfterUse::Flag dispose = DisposeAfterUse::NO);
+
+private:
+ class ClickteamFileDescriptor {
+ private:
+ Common::String _fileName;
+
+ // Offset of the file contents relative to the beginning of block3
+ uint32 _fileDataOffset;
+ // Offset of file descriptor
+ uint32 _fileDescriptorOffset;
+ uint32 _compressedSize;
+ uint32 _uncompressedSize;
+ uint32 _expectedCRC;
+
+ ClickteamFileDescriptor(const ClickteamTag& contentsTag, uint32 off);
+ friend class ClickteamInstaller;
+ public:
+ // It's public for hashmap
+ ClickteamFileDescriptor() : _fileDataOffset(0), _fileDescriptorOffset(0), _compressedSize(0), _uncompressedSize(0) {}
+ };
+
+ ClickteamInstaller(Common::HashMap<Common::String, ClickteamFileDescriptor, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> files,
+ Common::HashMap<uint16, Common::SharedPtr<ClickteamTag>> tags,
+ uint32 crcXor, uint32 block3Offset, uint32 block3Size, Common::SeekableReadStream *stream, DisposeAfterUse::Flag dispose)
+ : _files(files), _tags(tags), _crcXor(crcXor), _block3Offset(block3Offset), _block3Size(block3Size), _stream(stream, dispose) {
+ }
+
+ Common::HashMap<Common::String, ClickteamFileDescriptor, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _files;
+ Common::HashMap<uint16, Common::SharedPtr<ClickteamTag>> _tags;
+ Common::DisposablePtr<Common::SeekableReadStream> _stream;
+ mutable Common::HashMap<Common::String, Common::ScopedPtr<byte, Common::ArrayDeleter<byte>>, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _cache;
+ uint32 _crcXor, _block3Offset, _block3Size;
+};
+}
+#endif
diff --git a/common/module.mk b/common/module.mk
index 621e5076e10..857bdf304f0 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -4,6 +4,7 @@ MODULE_OBJS := \
achievements.o \
archive.o \
base-str.o \
+ clickteam.o \
config-manager.o \
coroutines.o \
dcl.o \
Commit: 9caa5324bc24aca8f3258e07cba36ffba06f62c3
https://github.com/scummvm/scummvm/commit/9caa5324bc24aca8f3258e07cba36ffba06f62c3
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-11-18T01:22:59+01:00
Commit Message:
AGS: Switch from getFSNode to getFile to hide whether file comes from an archive
Changed paths:
engines/ags/shared/util/file_stream.cpp
engines/ags/shared/util/stdio_compat.cpp
engines/ags/shared/util/stdio_compat.h
diff --git a/engines/ags/shared/util/file_stream.cpp b/engines/ags/shared/util/file_stream.cpp
index d5b1262b45d..7e38e21869f 100644
--- a/engines/ags/shared/util/file_stream.cpp
+++ b/engines/ags/shared/util/file_stream.cpp
@@ -163,15 +163,8 @@ void FileStream::Open(const String &file_name, FileOpenMode open_mode, FileWorkM
} else {
// First try to open file in game folder
- Common::File *f = new Common::File();
- Common::FSNode fsNode = getFSNode(file_name.GetCStr());
-
- if (fsNode.exists() && f->open(fsNode)) {
- _file = f;
- } else {
- delete f;
- _file = nullptr;
- }
+ Common::ArchiveMemberPtr desc = getFile(file_name.GetCStr());
+ _file = desc ? desc->createReadStream() : nullptr;
}
} else {
diff --git a/engines/ags/shared/util/stdio_compat.cpp b/engines/ags/shared/util/stdio_compat.cpp
index ad3999c9c75..0f0d4fcb5e1 100644
--- a/engines/ags/shared/util/stdio_compat.cpp
+++ b/engines/ags/shared/util/stdio_compat.cpp
@@ -50,7 +50,7 @@ file_off_t ags_ftell(Common::Stream *stream) {
return rs ? rs->pos() : ws->pos();
}
-Common::FSNode getFSNode(const char *path) {
+static Common::FSNode getFSNode(const char *path) {
Common::FSNode node;
Common::String filePath(path);
if (filePath.empty() || filePath == "." || filePath == "./")
@@ -100,6 +100,16 @@ Common::FSNode getFSNode(const char *path) {
return dir->getFSNode().getChild(filePath);
}
+Common::ArchiveMemberPtr getFile(const char *path) {
+ Common::ArchiveMemberPtr archMember = SearchMan.getMember(path);
+ if (archMember)
+ return archMember;
+ Common::FSNode node(getFSNode(path));
+ if (!node.exists())
+ return Common::ArchiveMemberPtr();
+ return Common::ArchiveMemberPtr(new Common::FSNode(node));
+}
+
int ags_file_exists(const char *path) {
Common::String sPath(path);
diff --git a/engines/ags/shared/util/stdio_compat.h b/engines/ags/shared/util/stdio_compat.h
index a3766a7f862..c2507cc7bb2 100644
--- a/engines/ags/shared/util/stdio_compat.h
+++ b/engines/ags/shared/util/stdio_compat.h
@@ -32,7 +32,7 @@ typedef int64 file_off_t;
// Size of the buffer enough to accommodate a UTF-8 path
const size_t MAX_PATH_SZ = 1024;
-extern Common::FSNode getFSNode(const char *path);
+extern Common::ArchiveMemberPtr getFile(const char *path);
extern int ags_fseek(Common::Stream *stream, file_off_t offset, int whence);
extern file_off_t ags_ftell(Common::Stream *stream);
Commit: db09df7d14ad1f0d4d8249c994b0372eaeef53e5
https://github.com/scummvm/scummvm/commit/db09df7d14ad1f0d4d8249c994b0372eaeef53e5
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-11-18T01:22:59+01:00
Commit Message:
AGS: Support files coming from SearchMan
Changed paths:
engines/ags/shared/util/stdio_compat.cpp
diff --git a/engines/ags/shared/util/stdio_compat.cpp b/engines/ags/shared/util/stdio_compat.cpp
index 0f0d4fcb5e1..b90f298f15a 100644
--- a/engines/ags/shared/util/stdio_compat.cpp
+++ b/engines/ags/shared/util/stdio_compat.cpp
@@ -121,6 +121,8 @@ int ags_file_exists(const char *path) {
return result ? 1 : 0;
} else {
+ if (SearchMan.hasFile(path))
+ return 1;
Common::FSNode node = getFSNode(path);
return node.exists() && !node.isDirectory() ? 1 : 0;
}
@@ -132,15 +134,17 @@ int ags_directory_exists(const char *path) {
}
int ags_path_exists(const char *path) {
+ if (SearchMan.hasFile(path))
+ return 1;
Common::FSNode node = getFSNode(path);
return node.exists() ? 1 : 0;
}
file_off_t ags_file_size(const char *path) {
- Common::FSNode node = getFSNode(path);
- Common::File f;
+ Common::ArchiveMemberPtr file(getFile(path));
+ Common::ScopedPtr<Common::SeekableReadStream> stream(file->createReadStream());
- return f.open(node) ? f.size() : (file_off_t)-1;
+ return stream ? stream->size() : (file_off_t)-1;
}
} // namespace AGS3
Commit: 60151528c405b43114423db998e79dad4f5d5fc1
https://github.com/scummvm/scummvm/commit/60151528c405b43114423db998e79dad4f5d5fc1
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-11-18T01:22:59+01:00
Commit Message:
AGS: Open clickteam-compressed files
Changed paths:
engines/ags/ags.cpp
engines/ags/detection.h
engines/ags/detection_tables.h
diff --git a/engines/ags/ags.cpp b/engines/ags/ags.cpp
index 30b79d049f1..4bfa3e23a86 100644
--- a/engines/ags/ags.cpp
+++ b/engines/ags/ags.cpp
@@ -27,6 +27,7 @@
#include "ags/console.h"
#include "common/scummsys.h"
#include "common/config-manager.h"
+#include "common/clickteam.h"
#include "common/debug-channels.h"
#include "common/events.h"
#include "common/file.h"
@@ -152,6 +153,12 @@ Common::Error AGSEngine::run() {
setDebugger(new AGSConsole(this));
const char *filename = _gameDescription->desc.filesDescriptions[0].fileName;
+ if (_gameDescription->desc.flags & GAMEFLAG_INSTALLER) {
+ Common::File *f = new Common::File();
+ f->open(filename);
+ SearchMan.add("installer", Common::ClickteamInstaller::open(f, DisposeAfterUse::YES));
+ filename = _gameDescription->_mainNameInsideInstaller;
+ }
const char *ARGV[] = { "scummvm.exe", filename };
const int ARGC = 2;
AGS3::main_init(ARGC, ARGV);
diff --git a/engines/ags/detection.h b/engines/ags/detection.h
index ea283c0d60b..77e596ba5bf 100644
--- a/engines/ags/detection.h
+++ b/engines/ags/detection.h
@@ -35,7 +35,8 @@ enum AGSDebugChannels {
};
enum GameFlag {
- GAMEFLAG_FORCE_AA = 1
+ GAMEFLAG_FORCE_AA = 1,
+ GAMEFLAG_INSTALLER = 2,
};
struct PluginVersion {
@@ -46,6 +47,7 @@ struct PluginVersion {
struct AGSGameDescription {
ADGameDescription desc;
const PluginVersion *_plugins;
+ const char *_mainNameInsideInstaller;
};
extern const PlainGameDescriptor GAME_NAMES[];
diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index 889423155b9..617ed77582a 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -3073,11 +3073,18 @@ const char *const PRE_25 = "Pre 2.5";
#define DETECTION_ENTRY_GUIO(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, GUIO, PLUGIN_ARR, FLAGS) \
{{ ID, PLATFORM, AD_ENTRY1s(FILENAME, MD5, SIZE), LANG, \
- Common::kPlatformUnknown, FLAGS, GUIO }, PLUGIN_ARR }
+ Common::kPlatformUnknown, FLAGS, GUIO }, PLUGIN_ARR, nullptr }
+
+#define DETECTION_ENTRY_GUIO_INSTALLER(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, GUIO, PLUGIN_ARR, FLAGS, MAIN_FILENAME) \
+ {{ ID, PLATFORM, AD_ENTRY1s(FILENAME, MD5, SIZE), LANG, \
+ Common::kPlatformUnknown, FLAGS, GUIO }, PLUGIN_ARR, MAIN_FILENAME }
#define DETECTION_ENTRY(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, PLUGIN_ARR, FLAGS) \
DETECTION_ENTRY_GUIO(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, GUIO1(GUIO_NOLANG), PLUGIN_ARR, FLAGS)
+#define DETECTION_ENTRY_INSTALLER(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, PLUGIN_ARR, FLAGS, MAIN_FILENAME) \
+ DETECTION_ENTRY_GUIO_INSTALLER(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, GUIO1(GUIO_NOLANG), PLUGIN_ARR, FLAGS, MAIN_FILENAME)
+
#define PRE_25_ENTRY(ID, FILENAME, MD5, SIZE) \
DETECTION_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, "Pre 2.5", nullptr, ADGF_UNSTABLE)
@@ -3106,6 +3113,9 @@ const char *const PRE_25 = "Pre 2.5";
#define UNSUPPORTED_GAME_ENTRY(ID, FILENAME, MD5, SIZE) \
UNSUPPORTED_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, nullptr)
+#define UNSUPPORTED_INSTALLER_ENTRY(ID, FILENAME, MAIN_FILENAME, MD5, SIZE) \
+ DETECTION_ENTRY_INSTALLER(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, nullptr, nullptr, ADGF_UNSTABLE | GAMEFLAG_INSTALLER, MAIN_FILENAME)
+
#define TESTING_ENTRY(ID, FILENAME, MD5, SIZE, LANG, PLATFORM) \
DETECTION_ENTRY(ID, FILENAME, MD5, SIZE, LANG, PLATFORM, nullptr, ADGF_TESTING)
@@ -3125,6 +3135,9 @@ const char *const PRE_25 = "Pre 2.5";
#define GAME_ENTRY(ID, FILENAME, MD5, SIZE) \
STABLE_ENTRY(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, nullptr)
+#define INSTALLER_ENTRY(ID, FILENAME, MAIN_FILENAME, MD5, SIZE) \
+ DETECTION_ENTRY_INSTALLER(ID, FILENAME, MD5, SIZE, Common::UNK_LANG, nullptr, nullptr, GAMEFLAG_INSTALLER, MAIN_FILENAME)
+
#define GAME_ENTRY_EN(ID, FILENAME, MD5, SIZE) \
STABLE_ENTRY(ID, FILENAME, MD5, SIZE, Common::EN_ANY, nullptr)
@@ -7403,7 +7416,7 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
GAME_ENTRY_LANG("prisonersofice", "newyearq.exe", "b26aa198e5175000f037b84d8a4038f5", 84723231, Common::RU_RUS),
- { AD_TABLE_END_MARKER, nullptr }
+ { AD_TABLE_END_MARKER, nullptr, nullptr }
};
/**
@@ -7419,6 +7432,7 @@ static AGSGameDescription g_fallbackDesc = {
ADGF_NO_FLAGS,
GUIO1(GUIO_NOLANG)
},
+ nullptr,
nullptr
};
Commit: 7680ac013e6443018381093d8e6a8affaafe2b44
https://github.com/scummvm/scummvm/commit/7680ac013e6443018381093d8e6a8affaafe2b44
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-11-18T01:22:59+01:00
Commit Message:
AGS: Detection entry for Maniac Mansion Deluxe and Zak2 installers
I could locate one version of zak2 installer and 2 versions of mmd installer.
Zak2 is still unsupported due to the problems mentioned in the comment
Changed paths:
engines/ags/detection_tables.h
diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index 617ed77582a..a6c4ffcd047 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -3458,6 +3458,7 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
// hacked to specify plugin, errors on loading room107 saying that
// "room animations are no longer supported"
UNSUPPORTED_GAME_ENTRY("zak2", "Zak2.exe", "e88fd6a23a5e498d7b0d50e3bb914085", 8686711),
+ UNSUPPORTED_INSTALLER_ENTRY("zak2", "fanadv_zak2.exe", "Zak2.exe", "329ff478ffc1a3bd0dc941d5212aa602", 7165704),
UNSUPPORTED_GAME_ENTRY("zak2", "Zak2.exe", "0b7529a76f38283d6e850b8d56526fc1", 9205143),
// Commercial games
@@ -5748,8 +5749,10 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
GAME_ENTRY_EN("maniacland", "AliceInManiacland.ags", "00596e8a9f0bd774528fb8c7225bed0d", 4082163), // Linux
GAME_ENTRY("maniacland", "AliceInManiacland.exe", "d37a4f06126fc1f3bb7e5c31bd58a014", 8015351), // Windows (newer) En-Es-It
GAME_ENTRY("maniacmansiondeluxe", "Maniac.exe", "3128b9f90e2f954ba704414ae854d10b", 9395050), // v1.05 Multi
+ INSTALLER_ENTRY("maniacmansiondeluxe", "manicmdsetup.exe", "Maniac.exe", "329ff478ffc1a3bd0dc941d5212aa602", 5826271), // v1.05 Multi
GAME_ENTRY("maniacmansiondeluxe", "Maniac.exe", "465f972675db2da6040518221af5b0ba", 10181366), // v1.3 "
GAME_ENTRY("maniacmansiondeluxe", "Maniac.exe", "465f972675db2da6040518221af5b0ba", 10409172), // v1.4 "
+ INSTALLER_ENTRY("maniacmansiondeluxe", "Maniac-Mansion-Deluxe_Win_EN-FR-ES-DE-IT.exe", "Maniac.exe", "329ff478ffc1a3bd0dc941d5212aa602", 6598337), // v1.4
GAME_ENTRY("maniacmetalheadmania", "Maniac Metalhead Mania.exe", "d4dbb53d3617dcbb56251eb4a332fddd", 11785951), //En-De
GAME_ENTRY("maniacmetalheadmania2", "Maniac Metalhead Mania II.exe", "be3275347f23aadb6d13aa75f70fcb99", 14997025), //En-De
GAME_ENTRY_EN("manvsfish", "ManVsFish.exe", "06a03fe35791b0578068ab1873455463", 1875086),
More information about the Scummvm-git-logs
mailing list