Make 7-Zip ZS binary compatible with 7-Zip Standard

- you can use codec extensions for 7-zip now ;) - remove builds for: Format7zFO, Format7zUSB - also change build scripts and version numbers
mcmilk · Nov 27, 2018 · bc77601 · bc77601
1 parent f98edef
commit bc77601
Show file tree

Hide file tree

Showing 35 changed files with 33 additions and 3,935 deletions.
diff --git a/C/7zVersion.h b/C/7zVersion.h
@@ -10,7 +10,7 @@
   #define MY_VERSION_CPU MY_VERSION
 #endif
 
-#define MY_DATE "2018-11-25"
+#define MY_DATE "2018-11-27"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt"

diff --git a/C/Util/7zipInstall/7zipInstall.c b/C/Util/7zipInstall/7zipInstall.c
@@ -82,7 +82,7 @@ static LPCWSTR const k_Reg_Path32 = L"Path"
   #define k_Reg_WOW_Flag_32 0
 #endif
 
-#define k_7zip_CLSID L"{23170F69-0803-278A-1000-000100020001}"
+#define k_7zip_CLSID L"{23170F69-20BB-278A-1000-000100020000}"
 
 static LPCWSTR const k_Reg_CLSID_7zip = L"CLSID\\" k_7zip_CLSID;
 static LPCWSTR const k_Reg_CLSID_7zip_Inproc = L"CLSID\\" k_7zip_CLSID L"\\InprocServer32";

diff --git a/C/Util/7zipUninstall/7zipUninstall.c b/C/Util/7zipUninstall/7zipUninstall.c
@@ -62,7 +62,7 @@ static const WCHAR * const k_Reg_Path32 = L"Path"
   #define k_Reg_WOW_Flag_32 0
 #endif
 
-#define k_7zip_CLSID L"{23170F69-0803-278A-1000-000100020001}"
+#define k_7zip_CLSID L"{23170F69-20BB-278A-1000-000100020000}"
 
 static const WCHAR * const k_Reg_CLSID_7zip = L"CLSID\\" k_7zip_CLSID;
 static const WCHAR * const k_Reg_CLSID_7zip_Inproc = L"CLSID\\" k_7zip_CLSID L"\\InprocServer32";

diff --git a/CPP/7zip/Bundles/Codec_brotli/makefile b/CPP/7zip/Bundles/Codec_brotli/makefile
@@ -1,6 +1,6 @@
 PROG = brotli.dll
 DEF_FILE = ../../Compress/Codec.def
-CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
+CFLAGS = $(CFLAGS)
 
 7ZIP_COMMON_OBJS = \
   $O\StreamUtils.obj \

diff --git a/CPP/7zip/Bundles/Codec_flzma2/makefile b/CPP/7zip/Bundles/Codec_flzma2/makefile
@@ -1,6 +1,6 @@
 PROG = flzma2.dll
 DEF_FILE = ../../Compress/Codec.def
-CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DNO_XXHASH
+CFLAGS = $(CFLAGS) -DNO_XXHASH
 
 7ZIP_COMMON_OBJS = \
   $O\CWrappers.obj \

diff --git a/CPP/7zip/Bundles/Codec_lizard/makefile b/CPP/7zip/Bundles/Codec_lizard/makefile
@@ -1,6 +1,6 @@
 PROG = lizard.dll
 DEF_FILE = ../../Compress/Codec.def
-CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
+CFLAGS = $(CFLAGS)
 
 7ZIP_COMMON_OBJS = \
   $O\StreamUtils.obj \

diff --git a/CPP/7zip/Bundles/Codec_lz4/makefile b/CPP/7zip/Bundles/Codec_lz4/makefile
@@ -1,6 +1,6 @@
 PROG = lz4.dll
 DEF_FILE = ../../Compress/Codec.def
-CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
+CFLAGS = $(CFLAGS)
 
 7ZIP_COMMON_OBJS = \
   $O\StreamUtils.obj \

diff --git a/CPP/7zip/Bundles/Codec_lz5/makefile b/CPP/7zip/Bundles/Codec_lz5/makefile
@@ -1,6 +1,6 @@
 PROG = lz5.dll
 DEF_FILE = ../../Compress/Codec.def
-CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
+CFLAGS = $(CFLAGS)
 
 7ZIP_COMMON_OBJS = \
   $O\StreamUtils.obj \

diff --git a/CPP/7zip/Bundles/Codec_zstd/makefile b/CPP/7zip/Bundles/Codec_zstd/makefile
@@ -1,6 +1,6 @@
-PROG = zstd-min.dll
+PROG = zstd.dll
 DEF_FILE = ../../Compress/Codec.def
-CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DZSTD_MULTITHREAD
+CFLAGS = $(CFLAGS) -DZSTD_LEGACY_SUPPORT -DZSTD_MULTITHREAD
 
 7ZIP_COMMON_OBJS = \
   $O\StreamUtils.obj \
@@ -42,6 +42,13 @@ ZSTD_OBJS = \
   $O\zstd_ldm.obj \
   $O\zstdmt_compress.obj \
   $O\zstd_opt.obj \
+  $O\zstd_v01.obj \
+  $O\zstd_v02.obj \
+  $O\zstd_v03.obj \
+  $O\zstd_v04.obj \
+  $O\zstd_v05.obj \
+  $O\zstd_v06.obj \
+  $O\zstd_v07.obj \
 
 ZSTDMT_OBJS = \
   $O\zstd-mt_threading.obj \

diff --git a/CPP/7zip/Bundles/Codec_zstdF/StdAfx.cpp b/CPP/7zip/Bundles/Codec_zstdF/StdAfx.cpp
diff --git a/CPP/7zip/Bundles/Codec_zstdF/StdAfx.h b/CPP/7zip/Bundles/Codec_zstdF/StdAfx.h
diff --git a/CPP/7zip/Bundles/Codec_zstdF/makefile b/CPP/7zip/Bundles/Codec_zstdF/makefile
diff --git a/CPP/7zip/Bundles/Codec_zstdF/resource.rc b/CPP/7zip/Bundles/Codec_zstdF/resource.rc
diff --git a/CPP/7zip/Bundles/Format7zExtract/makefile b/CPP/7zip/Bundles/Format7zExtract/makefile
@@ -1,8 +1,6 @@
 PROG = 7zxa.dll
 DEF_FILE = ../../Archive/Archive2.def
-CFLAGS = $(CFLAGS) \
-  -DNEED_7ZIP_GUID \
-  -DEXTRACT_ONLY \
+CFLAGS = $(CFLAGS) -DEXTRACT_ONLY \
 
 COMMON_OBJS = \
   $O\CRC.obj \