From 16b470c1486df8c9573f557015fa9a824245538b Mon Sep 17 00:00:00 2001
From: Tino Reichardt <milky-7zip@mcmilk.de>
Date: Thu, 29 Sep 2016 20:46:05 +0200
Subject: [PATCH] fixed codec ddl files, they should work again with 7-Zip
 Standard

---
 CPP/7zip/Bundles/Codec_zstd/makefile        | 4 ++--
 CPP/7zip/Bundles/Codec_zstdF/makefile       | 6 +++++-
 CPP/7zip/Bundles/Format7zF/makefile         | 4 ++++
 CPP/7zip/IDecl.h                            | 5 +++++
 CPP/7zip/UI/Explorer/DllExportsExplorer.cpp | 6 +++++-
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CPP/7zip/Bundles/Codec_zstd/makefile b/CPP/7zip/Bundles/Codec_zstd/makefile
index 3b6f6daf..49bd46dc 100644
--- a/CPP/7zip/Bundles/Codec_zstd/makefile
+++ b/CPP/7zip/Bundles/Codec_zstd/makefile
@@ -1,6 +1,6 @@
-PROG = zstd.dll
+PROG = zstd-min.dll
 DEF_FILE = ../../Compress/Codec.def
-CFLAGS = $(CFLAGS)
+CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
 
 7ZIP_COMMON_OBJS = \
   $O\StreamUtils.obj \
diff --git a/CPP/7zip/Bundles/Codec_zstdF/makefile b/CPP/7zip/Bundles/Codec_zstdF/makefile
index f4453fd2..e3aa9667 100644
--- a/CPP/7zip/Bundles/Codec_zstdF/makefile
+++ b/CPP/7zip/Bundles/Codec_zstdF/makefile
@@ -1,6 +1,6 @@
 PROG = zstd.dll
 DEF_FILE = ../../Compress/Codec.def
-CFLAGS = $(CFLAGS) -DZSTD_LEGACY_SUPPORT
+CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DZSTD_LEGACY_SUPPORT
 
 7ZIP_COMMON_OBJS = \
   $O\StreamUtils.obj \
@@ -17,6 +17,10 @@ ZSTD_OBJS = $(ZSTD_OBJS) \
   $O\fse_compress.obj \
   $O\huf_compress.obj \
   $O\zstd_compress.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 \
diff --git a/CPP/7zip/Bundles/Format7zF/makefile b/CPP/7zip/Bundles/Format7zF/makefile
index bca7884b..7d0ad987 100644
--- a/CPP/7zip/Bundles/Format7zF/makefile
+++ b/CPP/7zip/Bundles/Format7zF/makefile
@@ -22,6 +22,10 @@ ZSTD_OBJS = $(ZSTD_OBJS) \
   $O\fse_compress.obj \
   $O\huf_compress.obj \
   $O\zstd_compress.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 \
diff --git a/CPP/7zip/IDecl.h b/CPP/7zip/IDecl.h
index d8e585ca..41037dd8 100644
--- a/CPP/7zip/IDecl.h
+++ b/CPP/7zip/IDecl.h
@@ -6,7 +6,12 @@
 #include "../Common/MyUnknown.h"
 
 #define k_7zip_GUID_Data1 0x23170F69
+
+#ifdef NEED_7ZIP_GUID
+#define k_7zip_GUID_Data2 0x40C1
+#else
 #define k_7zip_GUID_Data2 0x0803
+#endif
 
 #define k_7zip_GUID_Data3_Common  0x278A
 
diff --git a/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp b/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
index e6121fe0..6e718b4b 100644
--- a/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
+++ b/CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
@@ -28,8 +28,12 @@
 static LPCTSTR k_ShellExtName = TEXT("7-Zip-ZStandard Shell Extension");
 static LPCTSTR k_Approved = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved");
 
-// {23170F69-0803-278A-1000-000100020000}
+// {23170F69-40C1-278A-1000-000100020000}
+#ifdef NEED_7ZIP_GUID
+static LPCTSTR k_Clsid = TEXT("{23170F69-40C1-278A-1000-000100020001}");
+#else
 static LPCTSTR k_Clsid = TEXT("{23170F69-0803-278A-1000-000100020001}");
+#endif
 
 DEFINE_GUID(CLSID_CZipContextMenu,
     k_7zip_GUID_Data1,