xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-09 02:07:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix naming: ZStandard -> Zstandard

Browse Source
This commit is contained in:
Tino Reichardt
2017-08-14 23:38:52 +02:00
parent b786c47d61
commit eaee80be81
29 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
C/Util/7zipInstall/7zipInstall.c
View File

@@ -38,9 +38,9 @@
#define _7ZIP_CUR_VER ((MY_VER_MAJOR << 16) | MY_VER_MINOR)
#define _7ZIP_DLL_VER_COMPAT ((16 << 16) | 3)
static LPCWSTR const k_7zip = L"7-Zip-ZStandard";
static LPCWSTR const k_7zip = L"7-Zip-Zstandard";
static LPCWSTR const k_Reg_Software_7zip = L"Software\\7-Zip-ZStandard";
static LPCWSTR const k_Reg_Software_7zip = L"Software\\7-Zip-Zstandard";
// #define _64BIT_INSTALLER 1
@@ -48,7 +48,7 @@ static LPCWSTR const k_Reg_Software_7zip = L"Software\\7-Zip-ZStandard";
#define _64BIT_INSTALLER 1
#endif
#define k_7zip_with_Ver_base L"7-Zip ZStandard " LLL(MY_VERSION)
#define k_7zip_with_Ver_base L"7-Zip Zstandard " LLL(MY_VERSION)
#ifdef _64BIT_INSTALLER
#define k_7zip_with_Ver k_7zip_with_Ver_base L" (x64)"
@@ -520,9 +520,9 @@ static LPCWSTR FindSubString(LPCWSTR s1, const char *s2)
static void Set7zipPostfix(WCHAR *s)
{
NormalizePrefix(s);
if (FindSubString(s, "7-Zip-ZStandard"))
if (FindSubString(s, "7-Zip-Zstandard"))
return;
wcscat(s, L"7-Zip-ZStandard\\");
wcscat(s, L"7-Zip-Zstandard\\");
}
@@ -805,7 +805,7 @@ static void WriteShellEx()
for (i = 0; i < sizeof(k_ShellEx_Items) / sizeof(k_ShellEx_Items[0]); i++)
{
wcscpy(destPath, k_ShellEx_Items[i]);
wcscat(destPath, L"\\7-Zip-ZStandard");
wcscat(destPath, L"\\7-Zip-Zstandard");
#ifdef _64BIT_INSTALLER
MyRegistry_CreateKeyAndVal_32(HKEY_CLASSES_ROOT, destPath, NULL, k_7zip_CLSID);
@@ -836,7 +836,7 @@ static void WriteShellEx()
{
HKEY destKey = 0;
LONG res = MyRegistry_CreateKey(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\7-Zip-ZStandard", &destKey);
LONG res = MyRegistry_CreateKey(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\7-Zip-Zstandard", &destKey);
if (res == ERROR_SUCCESS)
{
// wcscpy(destPath, path);

4
C/Util/7zipInstall/resource.rc
View File

@@ -6,7 +6,7 @@
#include "../../7zVersion.rc"
#include "resource.h"
MY_VERSION_INFO(MY_VFT_APP, "7-Zip Installer ZStandard", "7zipInstall", "7zipInstall.exe")
MY_VERSION_INFO(MY_VFT_APP, "7-Zip Installer Zstandard", "7zipInstall", "7zipInstall.exe")
1 ICON "7zip.ico"
@@ -28,7 +28,7 @@ MY_VERSION_INFO(MY_VFT_APP, "7-Zip Installer ZStandard", "7zipInstall", "7zipIns
IDD_INSTALL DIALOG 0, 0, xs, ys
STYLE DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
CAPTION "Install 7-Zip ZStandard"
CAPTION "Install 7-Zip Zstandard"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Destination folder:", IDT_EXTRACT_EXTRACT_TO, m, m, xc, 8

12
C/Util/7zipUninstall/7zipUninstall.c
View File

@@ -28,7 +28,7 @@
#define _64BIT_INSTALLER 1
#endif
#define k_7zip_with_Ver_base L"7-Zip ZStandard " LLL(MY_VERSION)
#define k_7zip_with_Ver_base L"7-Zip Zstandard " LLL(MY_VERSION)
#ifdef _64BIT_INSTALLER
#define k_7zip_with_Ver k_7zip_with_Ver_base L" (x64)"
@@ -38,7 +38,7 @@
// static const WCHAR * const k_7zip_with_Ver_str = k_7zip_with_Ver;
static const WCHAR * const k_Reg_Software_7zip = L"Software\\7-Zip-ZStandard";
static const WCHAR * const k_Reg_Software_7zip = L"Software\\7-Zip-Zstandard";
static const WCHAR * const k_Reg_Path = L"Path";
@@ -295,7 +295,7 @@ static void SetShellProgramsGroup(HWND hwndOwner)
continue;
NormalizePrefix(link);
wcscat(link, L"7-Zip-ZStandard\\");
wcscat(link, L"7-Zip-Zstandard\\");
{
const size_t baseLen = wcslen(link);
@@ -344,7 +344,7 @@ static const WCHAR * const k_Shell_Approved = L"Software\\Microsoft\\Windows\\Cu
static const WCHAR * const k_AppPaths_7zFm = L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\7zFM.exe";
#define k_REG_Uninstall L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
static const WCHAR * const k_Uninstall_7zip = k_REG_Uninstall L"7-Zip-ZStandard";
static const WCHAR * const k_Uninstall_7zip = k_REG_Uninstall L"7-Zip-Zstandard";
static Bool AreEqual_Path_PrefixName(const wchar_t *s, const wchar_t *prefix, const wchar_t *name)
@@ -374,7 +374,7 @@ static void WriteCLSID()
{
WCHAR destPath[MAX_PATH];
wcscpy(destPath, k_ShellEx_Items[i]);
wcscat(destPath, L"\\7-Zip-ZStandard");
wcscat(destPath, L"\\7-Zip-Zstandard");
MyRegistry_DeleteKey(HKEY_CLASSES_ROOT, destPath);
}
@@ -411,7 +411,7 @@ static void WriteCLSID()
{
WCHAR destPath[MAX_PATH];
wcscpy(destPath, k_ShellEx_Items[i]);
wcscat(destPath, L"\\7-Zip-ZStandard");
wcscat(destPath, L"\\7-Zip-Zstandard");
MyRegistry_DeleteKey_32(HKEY_CLASSES_ROOT, destPath);
}

4
C/Util/7zipUninstall/resource.rc
View File

@@ -6,7 +6,7 @@
#include "../../7zVersion.rc"
#include "resource.h"
MY_VERSION_INFO(MY_VFT_APP, "7-Zip Uninstaller ZStandard", "Uninstall", "Uninstall.exe")
MY_VERSION_INFO(MY_VFT_APP, "7-Zip Uninstaller Zstandard", "Uninstall", "Uninstall.exe")
1 ICON "7zipUninstall.ico"
@@ -28,7 +28,7 @@ MY_VERSION_INFO(MY_VFT_APP, "7-Zip Uninstaller ZStandard", "Uninstall", "Uninsta
IDD_INSTALL DIALOG 0, 0, xs, ys
STYLE DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
CAPTION "Uninstall 7-Zip ZStandard"
CAPTION "Uninstall 7-Zip Zstandard"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Uninstall from:", IDT_EXTRACT_EXTRACT_TO, m, m, xc, 8