change Registry Usage nearly complete to 7-Zip-ZStandard key

This commit is contained in:
Tino Reichardt
2017-05-18 11:36:45 +02:00
parent 95e71d900b
commit b401d31c41
11 changed files with 12 additions and 12 deletions

View File

@@ -39,7 +39,7 @@
extern "C" { extern "C" {
#endif #endif
#include "mem.h" #include "memmt.h"
struct list_head { struct list_head {
struct list_head *prev; struct list_head *prev;

View File

@@ -533,7 +533,7 @@ static const char *ParseMapWithPaths(
wchar_t c = p[i]; wchar_t c = p[i];
if (c == 0) if (c == 0)
{ {
// MessageBoxW(0, name, L"7-Zip", 0); // MessageBoxW(0, name, L"7-Zip ZS", 0);
AddNameToCensor(censor, name, include, commonRecursedType, wildcardMatching); AddNameToCensor(censor, name, include, commonRecursedType, wildcardMatching);
name.Empty(); name.Empty();
} }

View File

@@ -53,7 +53,7 @@ UString GetQuotedString(const UString &s)
static void ErrorMessage(LPCWSTR message) 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) static void ErrorMessageHRESULT(HRESULT res, LPCWSTR s = NULL)

View File

@@ -67,7 +67,7 @@ UString GetQuotedString(const UString &s)
static void ErrorMessage(LPCWSTR message) 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) static void ErrorMessageHRESULT(HRESULT res)

View File

@@ -16,7 +16,7 @@ using namespace NRegistry;
static NSynchronization::CCriticalSection g_CS; static NSynchronization::CCriticalSection g_CS;
#define CS_LOCK NSynchronization::CCriticalSectionLock lock(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; } static CSysString GetKeyPath(LPCTSTR path) { return kCuPrefix + (CSysString)path; }

View File

@@ -24,7 +24,7 @@ static const TCHAR * const kDefaultIconKeyName = TEXT("DefaultIcon");
static const TCHAR * const kShellKeyName = TEXT("shell"); static const TCHAR * const kShellKeyName = TEXT("shell");
static const TCHAR * const kOpenKeyName = TEXT("open"); static const TCHAR * const kOpenKeyName = TEXT("open");
static const TCHAR * const kCommandKeyName = TEXT("command"); 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) static CSysString GetExtProgramKeyName(const CSysString &ext)
{ {

View File

@@ -11,7 +11,7 @@
using namespace NWindows; using namespace NWindows;
using namespace NRegistry; 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 kCUBasePath = REG_PATH_7Z;
static LPCTSTR const kCU_FMPath = REG_PATH_7Z TEXT(STRING_PATH_SEPARATOR) TEXT("FM"); static LPCTSTR const kCU_FMPath = REG_PATH_7Z TEXT(STRING_PATH_SEPARATOR) TEXT("FM");

View File

@@ -181,7 +181,7 @@ public:
} }
void MessageBoxError(LPCWSTR message) void MessageBoxError(LPCWSTR message)
{ {
MessageBoxW(*this, message, L"7-Zip", MB_ICONERROR); MessageBoxW(*this, message, L"7-Zip ZS", MB_ICONERROR);
} }
}; };

View File

@@ -828,7 +828,7 @@ void CCompressDialog::OnOK()
wchar_t s[32]; wchar_t s[32];
ConvertUInt64ToString(volumeSize, s); ConvertUInt64ToString(volumeSize, s);
if (::MessageBoxW(*this, MyFormatNew(IDS_SPLIT_CONFIRM, 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; return;
} }
} }

View File

@@ -70,7 +70,7 @@ bool g_LVN_ITEMACTIVATE_Support = true;
static void ErrorMessage(LPCWSTR message) 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) static void ErrorMessage(const char *s)
@@ -116,7 +116,7 @@ static int Main2()
#endif #endif
if (commandStrings.Size() == 0) 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; return 0;
} }

View File

@@ -272,7 +272,7 @@ HRESULT HashCalcGUI(
const UString title = LangString(IDS_CHECKSUM_CALCULATING); 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 = title;
t.ProgressDialog.MainAddTitle.Add_Space(); t.ProgressDialog.MainAddTitle.Add_Space();