major Lizard fixes

- changed to real Lizard code v1.0 (I used LZ5 v2.0)
- add Lizard file handling, so '.liz' files can be used in windows
- changed CompressDialog (Lizard has 4 entries in the methods now)
- added Lizard icon

CPP/7zip/Archive/LizardHandler.cpp

@@ -0,0 +1,366 @@
+// LizardHandler.cpp
+
+#include "StdAfx.h"
+
+#include "../../../C/CpuArch.h"
+#include "../../Common/ComTry.h"
+#include "../../Common/Defs.h"
+
+#include "../Common/ProgressUtils.h"
+#include "../Common/RegisterArc.h"
+#include "../Common/StreamUtils.h"
+
+#include "../Compress/LizardDecoder.h"
+#include "../Compress/LizardEncoder.h"
+#include "../Compress/CopyCoder.h"
+
+#include "Common/DummyOutStream.h"
+#include "Common/HandlerOut.h"
+
+using namespace NWindows;
+
+namespace NArchive {
+namespace NLIZARD {
+
+class CHandler:
+  public IInArchive,
+  public IArchiveOpenSeq,
+  public IOutArchive,
+  public ISetProperties,
+  public CMyUnknownImp
+{
+  CMyComPtr<IInStream> _stream;
+  CMyComPtr<ISequentialInStream> _seqStream;
+
+  bool _isArc;
+  bool _dataAfterEnd;
+  bool _needMoreInput;
+
+  bool _packSize_Defined;
+  bool _unpackSize_Defined;
+
+  UInt64 _packSize;
+  UInt64 _unpackSize;
+  UInt64 _numStreams;
+  UInt64 _numBlocks;
+
+  CSingleMethodProps _props;
+
+public:
+  MY_UNKNOWN_IMP4(
+      IInArchive,
+      IArchiveOpenSeq,
+      IOutArchive,
+      ISetProperties)
+  INTERFACE_IInArchive(;)
+  INTERFACE_IOutArchive(;)
+  STDMETHOD(OpenSeq)(ISequentialInStream *stream);
+  STDMETHOD(SetProperties)(const wchar_t * const *names, const PROPVARIANT *values, UInt32 numProps);
+
+  CHandler() { }
+};
+
+static const Byte kProps[] =
+{
+  kpidSize,
+  kpidPackSize
+};
+
+static const Byte kArcProps[] =
+{
+  kpidNumStreams,
+  kpidNumBlocks
+};
+
+IMP_IInArchive_Props
+IMP_IInArchive_ArcProps
+
+STDMETHODIMP CHandler::GetArchiveProperty(PROPID /*propID*/, PROPVARIANT * /*value*/)
+{
+  return S_OK;
+}
+
+STDMETHODIMP CHandler::GetNumberOfItems(UInt32 *numItems)
+{
+  *numItems = 1;
+  return S_OK;
+}
+
+STDMETHODIMP CHandler::GetProperty(UInt32 /* index */, PROPID propID, PROPVARIANT *value)
+{
+  NCOM::CPropVariant prop;
+  switch (propID)
+  {
+    case kpidPackSize: if (_packSize_Defined) prop = _packSize; break;
+    case kpidSize: if (_unpackSize_Defined) prop = _unpackSize; break;
+  }
+  prop.Detach(value);
+  return S_OK;
+}
+
+static const unsigned kSignatureCheckSize = 4;
+
+API_FUNC_static_IsArc IsArc_lizard(const Byte *p, size_t size)
+{
+  if (size < 4)
+    return k_IsArc_Res_NEED_MORE;
+
+  UInt32 magic = GetUi32(p);
+
+  // skippable frames
+  if (magic >= 0x184D2A50 && magic <= 0x184D2A5F) {
+    if (size < 16)
+      return k_IsArc_Res_NEED_MORE;
+    magic = GetUi32(p+12);
+  }
+
+  // Lizard Magic
+  if (magic == 0x184D2206)
+    return k_IsArc_Res_YES;
+
+  return k_IsArc_Res_NO;
+}
+}
+
+STDMETHODIMP CHandler::Open(IInStream *stream, const UInt64 *, IArchiveOpenCallback *)
+{
+  COM_TRY_BEGIN
+  Close();
+  {
+    Byte buf[kSignatureCheckSize];
+    RINOK(ReadStream_FALSE(stream, buf, kSignatureCheckSize));
+    if (IsArc_lizard(buf, kSignatureCheckSize) == k_IsArc_Res_NO)
+      return S_FALSE;
+    _isArc = true;
+    _stream = stream;
+    _seqStream = stream;
+    RINOK(_stream->Seek(0, STREAM_SEEK_SET, NULL));
+  }
+  return S_OK;
+  COM_TRY_END
+}
+
+STDMETHODIMP CHandler::OpenSeq(ISequentialInStream *stream)
+{
+  Close();
+  _isArc = true;
+  _seqStream = stream;
+  return S_OK;
+}
+
+STDMETHODIMP CHandler::Close()
+{
+  _isArc = false;
+  _dataAfterEnd = false;
+  _needMoreInput = false;
+
+  _packSize_Defined = false;
+  _unpackSize_Defined = false;
+
+  _packSize = 0;
+
+  _seqStream.Release();
+  _stream.Release();
+  return S_OK;
+}
+
+STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems,
+    Int32 testMode, IArchiveExtractCallback *extractCallback)
+{
+  COM_TRY_BEGIN
+  if (numItems == 0)
+    return S_OK;
+  if (numItems != (UInt32)(Int32)-1 && (numItems != 1 || indices[0] != 0))
+    return E_INVALIDARG;
+
+  if (_packSize_Defined)
+    extractCallback->SetTotal(_packSize);
+
+  CMyComPtr<ISequentialOutStream> realOutStream;
+  Int32 askMode = testMode ?
+      NExtract::NAskMode::kTest :
+      NExtract::NAskMode::kExtract;
+  RINOK(extractCallback->GetStream(0, &realOutStream, askMode));
+  if (!testMode && !realOutStream)
+    return S_OK;
+
+  extractCallback->PrepareOperation(askMode);
+
+  Int32 opRes;
+
+  {
+
+  NCompress::NLIZARD::CDecoder *decoderSpec = new NCompress::NLIZARD::CDecoder;
+  CMyComPtr<ICompressCoder> decoder = decoderSpec;
+  decoderSpec->SetInStream(_seqStream);
+
+  CDummyOutStream *outStreamSpec = new CDummyOutStream;
+  CMyComPtr<ISequentialOutStream> outStream(outStreamSpec);
+  outStreamSpec->SetStream(realOutStream);
+  outStreamSpec->Init();
+
+  realOutStream.Release();
+
+  CLocalProgress *lps = new CLocalProgress;
+  CMyComPtr<ICompressProgressInfo> progress = lps;
+  lps->Init(extractCallback, true);
+
+  UInt64 packSize = 0;
+  UInt64 unpackedSize = 0;
+
+  HRESULT result = S_OK;
+
+  for (;;)
+  {
+    lps->InSize = packSize;
+    lps->OutSize = unpackedSize;
+
+    RINOK(lps->SetCur());
+    result = decoderSpec->CodeResume(outStream, &unpackedSize, progress);
+    UInt64 streamSize = decoderSpec->GetInputProcessedSize();
+
+    if (result != S_FALSE && result != S_OK)
+      return result;
+
+    if (unpackedSize == 0)
+      break;
+
+    if (streamSize == packSize)
+    {
+      // no new bytes in input stream, So it's good end of archive.
+      result = S_OK;
+      break;
+    }
+
+    if (packSize > streamSize)
+      return E_FAIL;
+
+    if (result != S_OK)
+      break;
+  }
+
+  decoderSpec->ReleaseInStream();
+  outStream.Release();
+
+  if (!_isArc)
+    opRes = NExtract::NOperationResult::kIsNotArc;
+  else if (_needMoreInput)
+    opRes = NExtract::NOperationResult::kUnexpectedEnd;
+  else if (_dataAfterEnd)
+    opRes = NExtract::NOperationResult::kDataAfterEnd;
+  else if (result == S_FALSE)
+    opRes = NExtract::NOperationResult::kDataError;
+  else if (result == S_OK)
+    opRes = NExtract::NOperationResult::kOK;
+  else
+    return result;
+
+  }
+
+  return extractCallback->SetOperationResult(opRes);
+
+  COM_TRY_END
+}
+
+static HRESULT UpdateArchive(
+    UInt64 unpackSize,
+    ISequentialOutStream *outStream,
+    const CProps &props,
+    IArchiveUpdateCallback *updateCallback)
+{
+  RINOK(updateCallback->SetTotal(unpackSize));
+  CMyComPtr<ISequentialInStream> fileInStream;
+  RINOK(updateCallback->GetStream(0, &fileInStream));
+  CLocalProgress *localProgressSpec = new CLocalProgress;
+  CMyComPtr<ICompressProgressInfo> localProgress = localProgressSpec;
+  localProgressSpec->Init(updateCallback, true);
+  NCompress::NLIZARD::CEncoder *encoderSpec = new NCompress::NLIZARD::CEncoder;
+  CMyComPtr<ICompressCoder> encoder = encoderSpec;
+  RINOK(props.SetCoderProps(encoderSpec, NULL));
+  RINOK(encoder->Code(fileInStream, outStream, NULL, NULL, localProgress));
+  return updateCallback->SetOperationResult(NArchive::NUpdate::NOperationResult::kOK);
+}
+
+STDMETHODIMP CHandler::GetFileTimeType(UInt32 *type)
+{
+  *type = NFileTimeType::kUnix;
+  return S_OK;
+}
+
+STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numItems,
+    IArchiveUpdateCallback *updateCallback)
+{
+  COM_TRY_BEGIN
+
+  if (numItems != 1)
+    return E_INVALIDARG;
+
+  Int32 newData, newProps;
+  UInt32 indexInArchive;
+  if (!updateCallback)
+    return E_FAIL;
+  RINOK(updateCallback->GetUpdateItemInfo(0, &newData, &newProps, &indexInArchive));
+ 
+  if ((newProps))
+  {
+    {
+      NCOM::CPropVariant prop;
+      RINOK(updateCallback->GetProperty(0, kpidIsDir, &prop));
+      if (prop.vt != VT_EMPTY)
+        if (prop.vt != VT_BOOL || prop.boolVal != VARIANT_FALSE)
+          return E_INVALIDARG;
+    }
+  }
+  
+  if ((newData))
+  {
+    UInt64 size;
+    {
+      NCOM::CPropVariant prop;
+      RINOK(updateCallback->GetProperty(0, kpidSize, &prop));
+      if (prop.vt != VT_UI8)
+        return E_INVALIDARG;
+      size = prop.uhVal.QuadPart;
+    }
+    return UpdateArchive(size, outStream, _props, updateCallback);
+  }
+
+  if (indexInArchive != 0)
+    return E_INVALIDARG;
+
+  CLocalProgress *lps = new CLocalProgress;
+  CMyComPtr<ICompressProgressInfo> progress = lps;
+  lps->Init(updateCallback, true);
+
+  CMyComPtr<IArchiveUpdateCallbackFile> opCallback;
+  updateCallback->QueryInterface(IID_IArchiveUpdateCallbackFile, (void **)&opCallback);
+  if (opCallback)
+  {
+    RINOK(opCallback->ReportOperation(
+        NEventIndexType::kInArcIndex, 0,
+        NUpdateNotifyOp::kReplicate))
+  }
+
+  if (_stream)
+    RINOK(_stream->Seek(0, STREAM_SEEK_SET, NULL));
+
+  return NCompress::CopyStream(_stream, outStream, progress);
+
+  COM_TRY_END
+}
+
+STDMETHODIMP CHandler::SetProperties(const wchar_t * const *names, const PROPVARIANT *values, UInt32 numProps)
+{
+  return _props.SetProperties(names, values, numProps);
+}
+
+static const Byte k_Signature[] = "0x184D2206";
+
+REGISTER_ARC_IO(
+  "liz", "liz tliz", "* .tar", 0x11,
+  k_Signature,
+  0,
+  NArcInfoFlags::kKeepName,
+  IsArc_lizard)
+
+}}

CPP/7zip/Archive/Lz4Handler.cpp

@@ -1,4 +1,4 @@
-// ZstdHandler.cpp
+// Lz4Handler.cpp
 
 #include "StdAfx.h"
 

CPP/7zip/Archive/Lz5Handler.cpp

@@ -1,4 +1,4 @@
-// ZstdHandler.cpp
+// Lz5Handler.cpp
 
 #include "StdAfx.h"
 

CPP/7zip/Bundles/Alone/makefile

@@ -260,14 +260,9 @@ BROTLI_OBJS = \
   $O/br_utf8_util.obj \
 
 LIZARD_OBJS = \
-  $O/liz_entropy_common.obj \
-  $O/liz_fse_compress.obj \
-  $O/liz_fse_decompress.obj \
-  $O/liz_huf_compress.obj \
-  $O/liz_huf_decompress.obj \
-  $O/liz_lz5_compress.obj \
-  $O/liz_lz5_decompress.obj \
-  $O/liz_lz5frame.obj \
+  $O/lizard_compress.obj \
+  $O/lizard_decompress.obj \
+  $O/lizard_frame.obj \
 
 LZ4_OBJS = \
   $O\lz4.obj \

CPP/7zip/Bundles/Codec_lizard/makefile

@@ -22,17 +22,18 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \
   $O\LizardRegister.obj \
 
 LIZARD_OBJS = \
-  $O/liz_entropy_common.obj \
-  $O/liz_fse_compress.obj \
-  $O/liz_fse_decompress.obj \
-  $O/liz_huf_compress.obj \
-  $O/liz_huf_decompress.obj \
-  $O/liz_lz5_compress.obj \
-  $O/liz_lz5_decompress.obj \
-  $O/liz_lz5frame.obj \
+  $O/lizard_compress.obj \
+  $O/lizard_decompress.obj \
+  $O/lizard_frame.obj \
 
 ZSTD_OBJS = \
   $O\xxhash.obj \
+  $O\entropy_common.obj \
+  $O\fse_decompress.obj \
+  $O\fse_compress.obj \
+  $O\huf_compress.obj \
+  $O\huf_decompress.obj \
+  $O\error_private.obj \
 
 ZSTDMT_OBJS = \
   $O\threading.obj \

CPP/7zip/Bundles/Codec_lizard/resource.rc

@@ -1,6 +1,6 @@
 #include "../../../../C/7zVersionTr.h"
 #include "../../../../C/7zVersion.rc"
 
-MY_VERSION_INFO_DLL("7-Zip Lizard Plugin v2.0", "Lizard")
+MY_VERSION_INFO_DLL("7-Zip Lizard Plugin v1.0", "Lizard")
 
-101  ICON  "../../Archive/Icons/7z.ico"
+101  ICON  "../../Archive/Icons/liz.ico"

CPP/7zip/Bundles/Codec_lz4/resource.rc

@@ -3,4 +3,4 @@
 
 MY_VERSION_INFO_DLL("7-Zip LZ4 Plugin v1.7.5", "Lz4")
 
-101  ICON  "../../Archive/Icons/7z.ico"
+101  ICON  "../../Archive/Icons/lz5.ico"

CPP/7zip/Bundles/Codec_lz5/resource.rc

@@ -3,4 +3,4 @@
 
 MY_VERSION_INFO_DLL("7-Zip LZ5 Plugin v1.5", "Lz5")
 
-101  ICON  "../../Archive/Icons/7z.ico"
+101  ICON  "../../Archive/Icons/lz5.ico"

CPP/7zip/Bundles/Codec_zstd/resource.rc

@@ -3,4 +3,4 @@
 
 MY_VERSION_INFO_DLL("7-Zip ZStandard Plugin v1.2.0", "zstd")
 
-101  ICON  "../../Archive/Icons/7z.ico"
+101  ICON  "../../Archive/Icons/zstd.ico"

CPP/7zip/Bundles/Codec_zstdF/resource.rc

@@ -3,4 +3,4 @@
 
 MY_VERSION_INFO_DLL("7-Zip ZStandard Plugin v1.2.0", "zstd")
 
-101  ICON  "../../Archive/Icons/7z.ico"
+101  ICON  "../../Archive/Icons/zstd.ico"

CPP/7zip/Bundles/Format7z/makefile

@@ -178,14 +178,9 @@ BROTLI_OBJS = \
   $O/br_utf8_util.obj \
 
 LIZARD_OBJS = \
-  $O/liz_entropy_common.obj \
-  $O/liz_fse_compress.obj \
-  $O/liz_fse_decompress.obj \
-  $O/liz_huf_compress.obj \
-  $O/liz_huf_decompress.obj \
-  $O/liz_lz5_compress.obj \
-  $O/liz_lz5_decompress.obj \
-  $O/liz_lz5frame.obj \
+  $O/lizard_compress.obj \
+  $O/lizard_decompress.obj \
+  $O/lizard_frame.obj \
 
 LZ4_OBJS = \
   $O\lz4.obj \

CPP/7zip/Bundles/Format7zF/Arc.mak

@@ -73,6 +73,7 @@ AR_OBJS = \
   $O\LzHandler.obj \
   $O\Lz4Handler.obj \
   $O\Lz5Handler.obj \
+  $O\LizardHandler.obj \
   $O\LzhHandler.obj \
   $O\LzmaHandler.obj \
   $O\MachoHandler.obj \

CPP/7zip/Bundles/Format7zF/makefile

@@ -58,14 +58,9 @@ BROTLI_OBJS = \
   $O/br_utf8_util.obj \
 
 LIZARD_OBJS = \
-  $O/liz_entropy_common.obj \
-  $O/liz_fse_compress.obj \
-  $O/liz_fse_decompress.obj \
-  $O/liz_huf_compress.obj \
-  $O/liz_huf_decompress.obj \
-  $O/liz_lz5_compress.obj \
-  $O/liz_lz5_decompress.obj \
-  $O/liz_lz5frame.obj \
+  $O/lizard_compress.obj \
+  $O/lizard_decompress.obj \
+  $O/lizard_frame.obj \
 
 LZ4_OBJS = \
   $O\lz4.obj \

CPP/7zip/Bundles/Format7zF/resource.rc

@@ -31,9 +31,10 @@ MY_VERSION_INFO_DLL("7z Plugin" , "7z")
 25  ICON  "../../Archive/Icons/zst.ico"
 26  ICON  "../../Archive/Icons/lz4.ico"
 27  ICON  "../../Archive/Icons/lz5.ico"
+28  ICON  "../../Archive/Icons/liz.ico"
 
 
 STRINGTABLE
 BEGIN
-  100 "7z:0 zip:1 rar:3 001:9 cab:7 iso:8 xz:23 txz:23 lzma:16 tar:13 cpio:12 bz2:2 bzip2:2 tbz2:2 tbz:2 gz:14 gzip:14 tgz:14 tpz:14 z:5 taz:5 lz:16 tlz:16 lz4:26 lz5:27 lzh:6 lha:6 rpm:10 deb:11 arj:4 vhd:20 wim:15 swm:15 fat:21 ntfs:22 dmg:17 hfs:18 xar:19 squashfs:24 zst:25"
+  100 "7z:0 zip:1 rar:3 001:9 cab:7 iso:8 xz:23 txz:23 lzma:16 tar:13 cpio:12 bz2:2 bzip2:2 tbz2:2 tbz:2 gz:14 gzip:14 tgz:14 tpz:14 z:5 taz:5 lz:16 tlz:16 liz:28 lz4:26 lz5:27 lzh:6 lha:6 rpm:10 deb:11 arj:4 vhd:20 wim:15 swm:15 fat:21 ntfs:22 dmg:17 hfs:18 xar:19 squashfs:24 zst:25"
 END

CPP/7zip/Compress/LizardDecoder.h

@@ -3,8 +3,9 @@
 #define LIZARD_STATIC_LINKING_ONLY
 #include "../../../C/Alloc.h"
 #include "../../../C/Threads.h"
-#include "../../../C/lizard/liz_compress.h"
-#include "../../../C/lizard/lizframe.h"
+#include "../../../C/lizard/lizard_compress.h"
+#include "../../../C/lizard/lizard_decompress.h"
+#include "../../../C/lizard/lizard_frame.h"
 #include "../../../C/zstdmt/lizard-mt.h"
 
 #include "../../Windows/System.h"
@@ -37,8 +38,8 @@ struct DProps
   void clear ()
   {
     memset(this, 0, sizeof (*this));
-    _ver_major = LIZ_VERSION_MAJOR;
-    _ver_minor = LIZ_VERSION_MINOR;
+    _ver_major = LIZARD_VERSION_MAJOR;
+    _ver_minor = LIZARD_VERSION_MINOR;
     _level = 1;
   }
 

CPP/7zip/Compress/LizardEncoder.h

@@ -3,8 +3,8 @@
 #define LIZARD_STATIC_LINKING_ONLY
 #include "../../../C/Alloc.h"
 #include "../../../C/Threads.h"
-#include "../../../C/lizard/liz_compress.h"
-#include "../../../C/lizard/lizframe.h"
+#include "../../../C/lizard/lizard_compress.h"
+#include "../../../C/lizard/lizard_frame.h"
 #include "../../../C/zstdmt/lizard-mt.h"
 
 #include "../../Common/Common.h"
@@ -22,8 +22,8 @@ struct CProps
   void clear ()
   {
     memset(this, 0, sizeof (*this));
-    _ver_major = LIZ_VERSION_MAJOR;
-    _ver_minor = LIZ_VERSION_MINOR;
+    _ver_major = LIZARD_VERSION_MAJOR;
+    _ver_minor = LIZARD_VERSION_MINOR;
     _level = 3;
   }
 

CPP/7zip/Guid.txt

@@ -166,6 +166,7 @@ Handler GUIDs:
   0E zstd
   0F lz4
   10 lz5
+  11 liz
 
   C6 Lzip
   C7 Ext

CPP/7zip/UI/GUI/CompressDialog.cpp

@@ -99,9 +99,12 @@ enum EMethodID
   kCopy,
   kZSTD,
   kBROTLI,
-  kLIZARD,
   kLZ4,
   kLZ5,
+  kLIZARD_M1,
+  kLIZARD_M2,
+  kLIZARD_M3,
+  kLIZARD_M4,
   kLZMA,
   kLZMA2,
   kPPMd,
@@ -111,14 +114,37 @@ enum EMethodID
   kPPMdZip
 };
 
+static LPCSTR const kMethodsLongnames[] =
+{
+    "Copy"
+  , "ZStandard"
+  , "Brotli"
+  , "LZ4"
+  , "LZ5"
+  , "Lizard, FastLZ4"
+  , "Lizard, LIZv1"
+  , "Lizard, FastLZ4 + Huffman"
+  , "Lizard, LIZv1 + Huffman"
+  , "LZMA"
+  , "LZMA2"
+  , "PPMd"
+  , "BZip2"
+  , "Deflate"
+  , "Deflate64"
+  , "PPMd"
+};
+
 static LPCSTR const kMethodsNames[] =
 {
     "Copy"
-  , "ZSTD"
-  , "BROTLI"
-  , "LIZARD"
+  , "zstd"
+  , "Brotli"
   , "LZ4"
   , "LZ5"
+  , "Lizard"
+  , "Lizard"
+  , "Lizard"
+  , "Lizard"
   , "LZMA"
   , "LZMA2"
   , "PPMd"
@@ -140,7 +166,10 @@ static const EMethodID g_BrotliMethods[] =
 
 static const EMethodID g_LizardMethods[] =
 {
-  kLIZARD
+  kLIZARD_M1,
+  kLIZARD_M2,
+  kLIZARD_M3,
+  kLIZARD_M4
 };
 
 static const EMethodID g_Lz4Methods[] =
@@ -157,9 +186,12 @@ static const EMethodID g_7zMethods[] =
 {
   kZSTD,
   kBROTLI,
-  kLIZARD,
   kLZ4,
   kLZ5,
+  kLIZARD_M1,
+  kLIZARD_M2,
+  kLIZARD_M3,
+  kLIZARD_M4,
   kLZMA2,
   kLZMA,
   kPPMd,
@@ -269,25 +301,25 @@ static const CFormatInfo g_Formats[] =
     false, false, true, false, false, false
   },
   {
-    "Brotli",
+    "Brotli", /* 7 */
     (1 << 0) | (1 << 1) | (1 << 3) | (1 << 6) | (1 << 9) | (1 << 11),
     METHODS_PAIR(g_BrotliMethods),
     false, false, true, false, false, false
   },
   {
-    "Lizard", /* 10..19 / 20..29 / .... */
+    "Lizard", /* 8 */
     (1 << 10) | (1 << 11) | (1 << 13) | (1 << 15) | (1 << 17) | (1 << 19),
     METHODS_PAIR(g_LizardMethods),
     false, false, true, false, false, false
   },
   {
-    "LZ4",
+    "LZ4", /* 9 */
     (1 << 0) | (1 << 1) | (1 << 3) | (1 << 6) | (1 << 9) | (1 << 12),
     METHODS_PAIR(g_Lz4Methods),
     false, false, true, false, false, false
   },
   {
-    "LZ5",
+    "LZ5", /* 10 */
     (1 << 0) | (1 << 1) | (1 << 3) | (1 << 7) | (1 << 11) | (1 << 15),
     METHODS_PAIR(g_Lz5Methods),
     false, false, true, false, false, false
@@ -1082,6 +1114,7 @@ void CCompressDialog::SetLevel()
   UInt32 level = GetLevel2();
   UInt32 LevelsMask;
   UInt32 LevelsStart = 0;
+  UInt32 LevelsEnd = 22;
   UInt32 langID = 0;
   unsigned i, ir;
 
@@ -1104,9 +1137,22 @@ void CCompressDialog::SetLevel()
     LevelsMask = g_Formats[6].LevelsMask;
   else if (GetMethodID() == kBROTLI)
     LevelsMask = g_Formats[7].LevelsMask;
-  else if (GetMethodID() == kLIZARD) {
+  else if (GetMethodID() == kLIZARD_M1) {
     LevelsMask = g_Formats[8].LevelsMask;
     LevelsStart = 10;
+    LevelsEnd = 19;
+  } else if (GetMethodID() == kLIZARD_M2) {
+    LevelsMask = g_Formats[8].LevelsMask;
+    LevelsStart = 20;
+    LevelsEnd = 29;
+  } else if (GetMethodID() == kLIZARD_M3) {
+    LevelsMask = g_Formats[8].LevelsMask;
+    LevelsStart = 30;
+    LevelsEnd = 39;
+  } else if (GetMethodID() == kLIZARD_M4) {
+    LevelsMask = g_Formats[8].LevelsMask;
+    LevelsStart = 40;
+    LevelsEnd = 49;
   } else if (GetMethodID() == kLZ4)
     LevelsMask = g_Formats[9].LevelsMask;
   else if (GetMethodID() == kLZ5)
@@ -1114,13 +1160,13 @@ void CCompressDialog::SetLevel()
   else
     LevelsMask = g_Formats[GetStaticFormatIndex()].LevelsMask;
 
-  for (i = LevelsStart; i <= 49; i++)
+  for (i = LevelsStart; i <= LevelsEnd; i++)
   {
     TCHAR s[40];
     TCHAR t[50] = { TEXT('L'), TEXT('e'), TEXT('v'), TEXT('e'), TEXT('l'), TEXT(' '), 0 };
 
     // lizard needs extra handling
-    if (GetMethodID() == kLIZARD) {
+    if (GetMethodID() >= kLIZARD_M1 && GetMethodID() <= kLIZARD_M4) {
       ir = i;
       if (ir % 10 == 0) langID = 0;
       while (ir > 19) { ir -= 10; }
@@ -1153,7 +1199,6 @@ void CCompressDialog::SetLevel()
   return;
 }
 
-
 static LRESULT ComboBox_AddStringAscii(NControl::CComboBox &cb, const char *s)
 {
   return cb.AddString((CSysString)s);
@@ -1174,33 +1219,56 @@ void CCompressDialog::SetMethod(int keepMethodId)
   const CArcInfoEx &ai = (*ArcFormats)[GetFormatIndex()];
   int index = FindRegistryFormat(ai.Name);
   UString defaultMethod;
-  if (index >= 0)
-  {
+  int defaultLevel = 5;
+  if (index >= 0) {
     const NCompression::CFormatOptions &fo = m_RegistryInfo.Formats[index];
     defaultMethod = fo.Method;
+    defaultLevel = fo.Level;
   }
+
   bool isSfx = IsSFX();
   bool weUseSameMethod = false;
-  
+
+#if 0
+  {
+  wchar_t buf[2000];
+  wsprintf(buf, L"keep=%d level = %d method=%s", keepMethodId, defaultLevel, (LPCWSTR)defaultMethod);
+  ShowErrorMessage(*this, buf);
+  }
+#endif
+
+
   for (unsigned m = 0; m < fi.NumMethods; m++)
   {
     EMethodID methodID = fi.MathodIDs[m];
     if (isSfx)
       if (!IsMethodSupportedBySfx(methodID))
         continue;
+
+    const char *methodLong = kMethodsLongnames[methodID];
     const char *method = kMethodsNames[methodID];
-    int itemIndex = (int)ComboBox_AddStringAscii(m_Method, method);
+    int itemIndex = (int)ComboBox_AddStringAscii(m_Method, methodLong);
     m_Method.SetItemData(itemIndex, methodID);
-    if (keepMethodId == methodID)
-    {
-      m_Method.SetCurSel(itemIndex);
+
+    if (keepMethodId == methodID) {
       weUseSameMethod = true;
+      m_Method.SetCurSel(itemIndex);
       continue;
     }
-    if ((defaultMethod.IsEqualTo_Ascii_NoCase(method) || m == 0) && !weUseSameMethod)
+
+    // Lizard :/
+    if (defaultMethod.IsEqualTo_Ascii_NoCase("lizard") && keepMethodId == -1) {
+      if (defaultLevel >= 10 && defaultLevel <= 19) m_Method.SetCurSel(kLIZARD_M1 - 1);
+      if (defaultLevel >= 20 && defaultLevel <= 29) m_Method.SetCurSel(kLIZARD_M2 - 1);
+      if (defaultLevel >= 30 && defaultLevel <= 39) m_Method.SetCurSel(kLIZARD_M3 - 1);
+      if (defaultLevel >= 40 && defaultLevel <= 49) m_Method.SetCurSel(kLIZARD_M4 - 1);
+    }
+
+    if ((defaultMethod.IsEqualTo_Ascii_NoCase(method) || m == 0) && !weUseSameMethod) {
       m_Method.SetCurSel(itemIndex);
+    }
   }
-  
+
   if (!weUseSameMethod)
   {
     SetDictionary();
@@ -1672,7 +1740,10 @@ void CCompressDialog::SetNumThreads()
     case kBROTLI: numAlgoThreadsMax = 128; break;
     case kLZ4: numAlgoThreadsMax = 128; break;
     case kLZ5: numAlgoThreadsMax = 128; break;
-    case kLIZARD: numAlgoThreadsMax = 128; break;
+    case kLIZARD_M1: numAlgoThreadsMax = 128; break;
+    case kLIZARD_M2: numAlgoThreadsMax = 128; break;
+    case kLIZARD_M3: numAlgoThreadsMax = 128; break;
+    case kLIZARD_M4: numAlgoThreadsMax = 128; break;
     case kLZMA: numAlgoThreadsMax = 2; break;
     case kLZMA2: numAlgoThreadsMax = 32; break;
     case kBZip2: numAlgoThreadsMax = 32; break;