From b401d31c413bff0969e0cbaa21afe7c0144696fd Mon Sep 17 00:00:00 2001
From: Tino Reichardt <milky-7zip@mcmilk.de>
Date: Thu, 18 May 2017 11:36:45 +0200
Subject: [PATCH] change Registry Usage nearly complete to 7-Zip-ZStandard key

---
 C/zstdmt/list.h                                  | 2 +-
 CPP/7zip/UI/Common/ArchiveCommandLine.cpp        | 2 +-
 CPP/7zip/UI/Common/CompressCall.cpp              | 2 +-
 CPP/7zip/UI/Common/CompressCall2.cpp             | 2 +-
 CPP/7zip/UI/Common/ZipRegistry.cpp               | 2 +-
 CPP/7zip/UI/FileManager/RegistryAssociations.cpp | 2 +-
 CPP/7zip/UI/FileManager/RegistryUtils.cpp        | 2 +-
 CPP/7zip/UI/GUI/BenchmarkDialog.h                | 2 +-
 CPP/7zip/UI/GUI/CompressDialog.cpp               | 2 +-
 CPP/7zip/UI/GUI/GUI.cpp                          | 4 ++--
 CPP/7zip/UI/GUI/HashGUI.cpp                      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/C/zstdmt/list.h b/C/zstdmt/list.h
index 7ecbce99..64475984 100644
--- a/C/zstdmt/list.h
+++ b/C/zstdmt/list.h
@@ -39,7 +39,7 @@
 extern "C" {
 #endif
 
-#include "mem.h"
+#include "memmt.h"
 
 struct list_head {
 	struct list_head *prev;
diff --git a/CPP/7zip/UI/Common/ArchiveCommandLine.cpp b/CPP/7zip/UI/Common/ArchiveCommandLine.cpp
index 26e8e67b..bdf3ebcf 100644
--- a/CPP/7zip/UI/Common/ArchiveCommandLine.cpp
+++ b/CPP/7zip/UI/Common/ArchiveCommandLine.cpp
@@ -533,7 +533,7 @@ static const char *ParseMapWithPaths(
     wchar_t c = p[i];
     if (c == 0)
     {
-      // MessageBoxW(0, name, L"7-Zip", 0);
+      // MessageBoxW(0, name, L"7-Zip ZS", 0);
       AddNameToCensor(censor, name, include, commonRecursedType, wildcardMatching);
       name.Empty();
     }
diff --git a/CPP/7zip/UI/Common/CompressCall.cpp b/CPP/7zip/UI/Common/CompressCall.cpp
index eebcee17..7e898b60 100644
--- a/CPP/7zip/UI/Common/CompressCall.cpp
+++ b/CPP/7zip/UI/Common/CompressCall.cpp
@@ -53,7 +53,7 @@ UString GetQuotedString(const UString &s)
 
 static void ErrorMessage(LPCWSTR message)
 {
-  MessageBoxW(g_HWND, message, L"7-Zip", MB_ICONERROR | MB_OK);
+  MessageBoxW(g_HWND, message, L"7-Zip ZS", MB_ICONERROR | MB_OK);
 }
 
 static void ErrorMessageHRESULT(HRESULT res, LPCWSTR s = NULL)
diff --git a/CPP/7zip/UI/Common/CompressCall2.cpp b/CPP/7zip/UI/Common/CompressCall2.cpp
index 973c18e1..0a469673 100644
--- a/CPP/7zip/UI/Common/CompressCall2.cpp
+++ b/CPP/7zip/UI/Common/CompressCall2.cpp
@@ -67,7 +67,7 @@ UString GetQuotedString(const UString &s)
 
 static void ErrorMessage(LPCWSTR message)
 {
-  MessageBoxW(g_HWND, message, L"7-Zip", MB_ICONERROR);
+  MessageBoxW(g_HWND, message, L"7-Zip ZS", MB_ICONERROR);
 }
 
 static void ErrorMessageHRESULT(HRESULT res)
diff --git a/CPP/7zip/UI/Common/ZipRegistry.cpp b/CPP/7zip/UI/Common/ZipRegistry.cpp
index e8f83ed3..901ed481 100644
--- a/CPP/7zip/UI/Common/ZipRegistry.cpp
+++ b/CPP/7zip/UI/Common/ZipRegistry.cpp
@@ -16,7 +16,7 @@ using namespace NRegistry;
 static NSynchronization::CCriticalSection g_CS;
 #define CS_LOCK NSynchronization::CCriticalSectionLock lock(g_CS);
 
-static LPCTSTR const kCuPrefix = TEXT("Software") TEXT(STRING_PATH_SEPARATOR) TEXT("7-Zip") TEXT(STRING_PATH_SEPARATOR);
+static LPCTSTR const kCuPrefix = TEXT("Software") TEXT(STRING_PATH_SEPARATOR) TEXT("7-Zip-ZStandard") TEXT(STRING_PATH_SEPARATOR);
 
 static CSysString GetKeyPath(LPCTSTR path) { return kCuPrefix + (CSysString)path; }
 
diff --git a/CPP/7zip/UI/FileManager/RegistryAssociations.cpp b/CPP/7zip/UI/FileManager/RegistryAssociations.cpp
index d88f24bc..54e142f7 100644
--- a/CPP/7zip/UI/FileManager/RegistryAssociations.cpp
+++ b/CPP/7zip/UI/FileManager/RegistryAssociations.cpp
@@ -24,7 +24,7 @@ static const TCHAR * const kDefaultIconKeyName = TEXT("DefaultIcon");
 static const TCHAR * const kShellKeyName = TEXT("shell");
 static const TCHAR * const kOpenKeyName = TEXT("open");
 static const TCHAR * const kCommandKeyName = TEXT("command");
-static const char * const k7zipPrefix = "7-Zip.";
+static const char * const k7zipPrefix = "7-Zip-ZStandard.";
 
 static CSysString GetExtProgramKeyName(const CSysString &ext)
 {
diff --git a/CPP/7zip/UI/FileManager/RegistryUtils.cpp b/CPP/7zip/UI/FileManager/RegistryUtils.cpp
index 42a2ac29..b2e21bfa 100644
--- a/CPP/7zip/UI/FileManager/RegistryUtils.cpp
+++ b/CPP/7zip/UI/FileManager/RegistryUtils.cpp
@@ -11,7 +11,7 @@
 using namespace NWindows;
 using namespace NRegistry;
 
-#define REG_PATH_7Z TEXT("Software") TEXT(STRING_PATH_SEPARATOR) TEXT("7-Zip")
+#define REG_PATH_7Z TEXT("Software") TEXT(STRING_PATH_SEPARATOR) TEXT("7-Zip-ZStandard")
 
 static LPCTSTR const kCUBasePath = REG_PATH_7Z;
 static LPCTSTR const kCU_FMPath = REG_PATH_7Z TEXT(STRING_PATH_SEPARATOR) TEXT("FM");
diff --git a/CPP/7zip/UI/GUI/BenchmarkDialog.h b/CPP/7zip/UI/GUI/BenchmarkDialog.h
index b8dd4d50..3f79b1ad 100644
--- a/CPP/7zip/UI/GUI/BenchmarkDialog.h
+++ b/CPP/7zip/UI/GUI/BenchmarkDialog.h
@@ -181,7 +181,7 @@ public:
   }
   void MessageBoxError(LPCWSTR message)
   {
-    MessageBoxW(*this, message, L"7-Zip", MB_ICONERROR);
+    MessageBoxW(*this, message, L"7-Zip ZS", MB_ICONERROR);
   }
 };
 
diff --git a/CPP/7zip/UI/GUI/CompressDialog.cpp b/CPP/7zip/UI/GUI/CompressDialog.cpp
index 209b9cd6..d11a8fca 100644
--- a/CPP/7zip/UI/GUI/CompressDialog.cpp
+++ b/CPP/7zip/UI/GUI/CompressDialog.cpp
@@ -828,7 +828,7 @@ void CCompressDialog::OnOK()
         wchar_t s[32];
         ConvertUInt64ToString(volumeSize, s);
         if (::MessageBoxW(*this, MyFormatNew(IDS_SPLIT_CONFIRM, s),
-            L"7-Zip", MB_YESNOCANCEL | MB_ICONQUESTION) != IDYES)
+            L"7-Zip ZS", MB_YESNOCANCEL | MB_ICONQUESTION) != IDYES)
           return;
       }
     }
diff --git a/CPP/7zip/UI/GUI/GUI.cpp b/CPP/7zip/UI/GUI/GUI.cpp
index 71966ab3..54924026 100644
--- a/CPP/7zip/UI/GUI/GUI.cpp
+++ b/CPP/7zip/UI/GUI/GUI.cpp
@@ -70,7 +70,7 @@ bool g_LVN_ITEMACTIVATE_Support = true;
 
 static void ErrorMessage(LPCWSTR message)
 {
-  MessageBoxW(NULL, message, L"7-Zip", MB_ICONERROR | MB_OK);
+  MessageBoxW(NULL, message, L"7-Zip ZS", MB_ICONERROR | MB_OK);
 }
 
 static void ErrorMessage(const char *s)
@@ -116,7 +116,7 @@ static int Main2()
   #endif
   if (commandStrings.Size() == 0)
   {
-    MessageBoxW(0, L"Specify command", L"7-Zip", 0);
+    MessageBoxW(0, L"Specify command", L"7-Zip ZS", 0);
     return 0;
   }
 
diff --git a/CPP/7zip/UI/GUI/HashGUI.cpp b/CPP/7zip/UI/GUI/HashGUI.cpp
index 72598c05..621bd0ab 100644
--- a/CPP/7zip/UI/GUI/HashGUI.cpp
+++ b/CPP/7zip/UI/GUI/HashGUI.cpp
@@ -272,7 +272,7 @@ HRESULT HashCalcGUI(
 
   const UString title = LangString(IDS_CHECKSUM_CALCULATING);
 
-  t.ProgressDialog.MainTitle = "7-Zip"; // LangString(IDS_APP_TITLE);
+  t.ProgressDialog.MainTitle = "7-Zip ZS"; // LangString(IDS_APP_TITLE);
   t.ProgressDialog.MainAddTitle = title;
   t.ProgressDialog.MainAddTitle.Add_Space();