Added support for TeleDisk images with advanced compression format

(aka LZH). Fixes #66
This commit is contained in:
2017-09-27 14:54:27 +01:00
parent fbf260d6e3
commit 01ae954d48
2 changed files with 1334 additions and 874 deletions

View File

@@ -28,6 +28,11 @@
// //
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Copyright © 2011-2017 Natalia Portillo // Copyright © 2011-2017 Natalia Portillo
// For Advanced Compression support (aka LZH):
// Copyright © 2017 Miodrag Milanovic
// Copyright © 1988 Haruhiko OKUMURA
// Copyright © 1988 Haruyasu YOSHIZAKI
// Copyright © 1988 Kenji RIKITAKE
// ****************************************************************************/ // ****************************************************************************/
using System; using System;
@@ -196,6 +201,7 @@ namespace DiscImageChef.ImagePlugins
List<ulong> SectorsWhereCRCHasFailed; List<ulong> SectorsWhereCRCHasFailed;
// Cylinder by head, sector data matrix // Cylinder by head, sector data matrix
byte[][][][] sectorsData; byte[][][][] sectorsData;
Stream inStream;
#endregion #endregion
@@ -290,10 +296,12 @@ namespace DiscImageChef.ImagePlugins
{ {
header = new TD0Header(); header = new TD0Header();
byte[] headerBytes = new byte[12]; byte[] headerBytes = new byte[12];
Stream stream = imageFilter.GetDataForkStream(); inStream = imageFilter.GetDataForkStream();
stream.Seek(0, SeekOrigin.Begin); MemoryStream stream = new MemoryStream();
inStream.Seek(0, SeekOrigin.Begin);
stream.Read(headerBytes, 0, 12); inStream.Read(headerBytes, 0, 12);
stream.Write(headerBytes, 0, 12);
header.signature = BitConverter.ToUInt16(headerBytes, 0); header.signature = BitConverter.ToUInt16(headerBytes, 0);
@@ -351,7 +359,30 @@ namespace DiscImageChef.ImagePlugins
return false; return false;
if(header.signature == tdAdvCompMagic) if(header.signature == tdAdvCompMagic)
throw new NotImplementedException("TeleDisk Advanced Compression support not yet implemented"); {
int rd;
byte[] obuf = new byte[BUFSZ];
inStream.Seek(12, SeekOrigin.Begin);
stream.Seek(12, SeekOrigin.Begin);
init_Decode();
do
{
if((rd = Decode(out obuf, BUFSZ)) > 0)
stream.Write(obuf, 0, rd);
} while(rd == BUFSZ);
}
else
{
// Not using Stream.CopyTo() because it's failing with LZIP
byte[] copybuf = new byte[inStream.Length];
inStream.Seek(0, SeekOrigin.Begin);
inStream.Read(copybuf, 0, copybuf.Length);
stream.Seek(0, SeekOrigin.Begin);
stream.Write(copybuf, 0, copybuf.Length);
copybuf = null;
}
stream.Seek(12, SeekOrigin.Begin);
ImageInfo.imageCreationTime = DateTime.MinValue; ImageInfo.imageCreationTime = DateTime.MinValue;
@@ -632,6 +663,9 @@ namespace DiscImageChef.ImagePlugins
if(!string.IsNullOrEmpty(ImageInfo.imageComments)) if(!string.IsNullOrEmpty(ImageInfo.imageComments))
DicConsole.VerboseWriteLine("TeleDisk comments: {0}", ImageInfo.imageComments); DicConsole.VerboseWriteLine("TeleDisk comments: {0}", ImageInfo.imageComments);
inStream.Dispose();
stream.Dispose();
return true; return true;
} }
@@ -1229,6 +1263,432 @@ namespace DiscImageChef.ImagePlugins
} }
#endregion Unsupported features #endregion Unsupported features
#region LZH decompression from MAME
/* This region is under following license:
* Copyright © 2017 Miodrag Milanovic
* Adapted to C#, Copyright © 2017 Natalia Portillo
*
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
* Based on Japanese version 29-NOV-1988
* LZSS coded by Haruhiko OKUMURA
* Adaptive Huffman Coding coded by Haruyasu YOSHIZAKI
* Edited and translated to English by Kenji RIKITAKE
*/
const int BUFSZ = 512;
/* LZSS Parameters */
const int N = 4096; /* Size of string buffer */
const int F = 60; /* Size of look-ahead buffer */
const int THRESHOLD = 2;
const int NIL = N; /* End of tree's node */
/* Huffman coding parameters */
const int N_CHAR = (256 - THRESHOLD + F);
/* character code (= 0..N_CHAR-1) */
const int T = (N_CHAR * 2 - 1); /* Size of table */
const int R = (T - 1); /* root position */
const int MAX_FREQ = 0x8000;
/* update when cumulative frequency */
/* reaches to this value */
struct tdlzhuf
{
public ushort r,
bufcnt, bufndx, bufpos, // string buffer
// the following to allow block reads from input in next_word()
ibufcnt, ibufndx; // input buffer counters
public byte[] inbuf; // input buffer
};
tdlzhuf tdctl;
byte[] text_buf = new byte[N + F - 1];
ushort[] freq = new ushort[T + 1]; /* cumulative freq table */
/*
* pointing parent nodes.
* area [T..(T + N_CHAR - 1)] are pointers for leaves
*/
short[] prnt = new short[T + N_CHAR];
/* pointing children nodes (son[], son[] + 1)*/
short[] son = new short[T];
ushort getbuf;
byte getlen;
long data_read(out byte[] buf, long size)
{
if(size > inStream.Length - inStream.Position)
size = inStream.Length - inStream.Position;
buf = new byte[size];
inStream.Read(buf, 0, (int)size);
return size;
}
/*
* Tables for encoding/decoding upper 6 bits of
* sliding dictionary pointer
*/
/* decoder table */
readonly byte[] d_code = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B,
0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D,
0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F,
0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11,
0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13,
0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15,
0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17,
0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B,
0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F,
0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23,
0x24, 0x24, 0x25, 0x25, 0x26, 0x26, 0x27, 0x27,
0x28, 0x28, 0x29, 0x29, 0x2A, 0x2A, 0x2B, 0x2B,
0x2C, 0x2C, 0x2D, 0x2D, 0x2E, 0x2E, 0x2F, 0x2F,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
};
readonly byte[] d_len = {
0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
};
int next_word()
{
if(tdctl.ibufndx >= tdctl.ibufcnt)
{
tdctl.ibufndx = 0;
tdctl.ibufcnt = (ushort)data_read(out tdctl.inbuf, BUFSZ);
if(tdctl.ibufcnt <= 0)
return (-1);
}
while(getlen <= 8)
{ // typically reads a word at a time
getbuf |= (ushort)(tdctl.inbuf[tdctl.ibufndx++] << (8 - getlen));
getlen += 8;
}
return (0);
}
int GetBit() /* get one bit */
{
short i;
if(next_word() < 0)
return (-1);
i = (short)getbuf;
getbuf <<= 1;
getlen--;
if(i < 0)
return (1);
else
return (0);
}
int GetByte() /* get a byte */
{
ushort i;
if(next_word() != 0)
return (-1);
i = getbuf;
getbuf <<= 8;
getlen -= 8;
i = (ushort)(i >> 8);
return ((int)i);
}
/* initialize freq tree */
void StartHuff()
{
int i, j;
for(i = 0; i < N_CHAR; i++)
{
freq[i] = 1;
son[i] = (short)(i + T);
prnt[i + T] = (short)i;
}
i = 0; j = N_CHAR;
while(j <= R)
{
freq[j] = (ushort)(freq[i] + freq[i + 1]);
son[j] = (short)i;
prnt[i] = prnt[i + 1] = (short)j;
i += 2; j++;
}
freq[T] = 0xffff;
prnt[R] = 0;
}
/* reconstruct freq tree */
void reconst()
{
short i, j, k;
ushort f, l;
/* halven cumulative freq for leaf nodes */
j = 0;
for(i = 0; i < T; i++)
{
if(son[i] >= T)
{
freq[j] = (ushort)((freq[i] + 1) / 2);
son[j] = son[i];
j++;
}
}
/* make a tree : first, connect children nodes */
for(i = 0, j = N_CHAR; j < T; i += 2, j++)
{
k = (short)(i + 1);
f = freq[j] = (ushort)(freq[i] + freq[k]);
for(k = (short)(j - 1); f < freq[k]; k--) { };
k++;
l = (ushort)((j - k) * 2);
Array.ConstrainedCopy(freq, k, freq, k + 1, l);
freq[k] = f;
Array.ConstrainedCopy(son, k, son, k + 1, l);
son[k] = i;
}
/* connect parent nodes */
for(i = 0; i < T; i++)
{
if((k = son[i]) >= T)
{
prnt[k] = i;
}
else
{
prnt[k] = prnt[k + 1] = i;
}
}
}
/* update freq tree */
void update(int c)
{
int i, j, k, l;
if(freq[R] == MAX_FREQ)
{
reconst();
}
c = prnt[c + T];
do
{
k = ++freq[c];
/* swap nodes to keep the tree freq-ordered */
if(k > freq[l = c + 1])
{
while(k > freq[++l]) { };
l--;
freq[c] = freq[l];
freq[l] = (ushort)k;
i = son[c];
prnt[i] = (short)l;
if(i < T) prnt[i + 1] = (short)l;
j = son[l];
son[l] = (short)i;
prnt[j] = (short)c;
if(j < T) prnt[j + 1] = (short)c;
son[c] = (short)j;
c = l;
}
} while((c = prnt[c]) != 0); /* do it until reaching the root */
}
short DecodeChar()
{
int ret;
ushort c;
c = (ushort)son[R];
/*
* start searching tree from the root to leaves.
* choose node #(son[]) if input bit == 0
* else choose #(son[]+1) (input bit == 1)
*/
while(c < T)
{
if((ret = GetBit()) < 0)
return (-1);
c += (ushort)ret;
c = (ushort)son[c];
}
c -= T;
update(c);
return (short)c;
}
short DecodePosition()
{
short bit;
ushort i, j, c;
/* decode upper 6 bits from given table */
if((bit = (short)GetByte()) < 0)
return (-1);
i = (ushort)bit;
c = (ushort)(d_code[i] << 6);
j = d_len[i];
/* input lower 6 bits directly */
j -= 2;
while(j-- > 0)
{
if((bit = (short)GetBit()) < 0)
return (-1);
i = (ushort)((i << 1) + bit);
}
return (short)(c | (i & 0x3f));
}
/* DeCompression
split out initialization code to init_Decode()
*/
void init_Decode()
{
int i;
getbuf = 0;
getlen = 0;
tdctl = new tdlzhuf();
tdctl.ibufcnt = tdctl.ibufndx = 0; // input buffer is empty
tdctl.bufcnt = 0;
StartHuff();
for(i = 0; i < N - F; i++)
text_buf[i] = 0x20;
tdctl.r = N - F;
}
int Decode(out byte[] buf, int len) /* Decoding/Uncompressing */
{
short c, pos;
buf = new byte[len];
int count; // was an unsigned long, seems unnecessary
for(count = 0; count < len;)
{
if(tdctl.bufcnt == 0)
{
if((c = DecodeChar()) < 0)
return (count); // fatal error
if(c < 256)
{
buf[count] = (byte)c;
text_buf[tdctl.r++] = (byte)c;
tdctl.r &= (N - 1);
count++;
}
else
{
if((pos = DecodePosition()) < 0)
return (count); // fatal error
tdctl.bufpos = (ushort)((tdctl.r - pos - 1) & (N - 1));
tdctl.bufcnt = (ushort)(c - 255 + THRESHOLD);
tdctl.bufndx = 0;
}
}
else
{ // still chars from last string
while(tdctl.bufndx < tdctl.bufcnt && count < len)
{
c = text_buf[(tdctl.bufpos + tdctl.bufndx) & (N - 1)];
buf[count] = (byte)c;
tdctl.bufndx++;
text_buf[tdctl.r++] = (byte)c;
tdctl.r &= (N - 1);
count++;
}
// reset bufcnt after copy string from text_buf[]
if(tdctl.bufndx >= tdctl.bufcnt)
tdctl.bufndx = tdctl.bufcnt = 0;
}
}
return (count); // count == len, success
}
#endregion LZH decompression from MAME
} }
} }

View File

@@ -74,7 +74,7 @@ Supported disk image formats
* Spectrum floppy disk image (.FDI) * Spectrum floppy disk image (.FDI)
* T98 hard disk images (.THD) * T98 hard disk images (.THD)
* T98-Next hard disk images (.NHD) * T98-Next hard disk images (.NHD)
* TeleDisk (without compression) * TeleDisk
* VMware VMDK and COWD images * VMware VMDK and COWD images
* Virtual98 disk images * Virtual98 disk images
* Virtual PC fixed size, dynamic size and differencing (undo) disk images * Virtual PC fixed size, dynamic size and differencing (undo) disk images