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

First Steps for own Install Path @ Setup

Browse Source
This commit is contained in:
Tino Reichardt
2016-09-04 14:48:17 +02:00
parent 2512b6593c
commit 0b3f10720c
8 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
C/7zVersion.rc
View File

@@ -40,7 +40,7 @@ BEGIN \
VALUE "InternalName", intName \
VALUE "LegalCopyright", MY_COPYRIGHT \
VALUE "OriginalFilename", origName \
VALUE "ProductName", "7-Zip Zstd" \
VALUE "ProductName", "7-Zip ZStandard" \
VALUE "ProductVersion", MY_VERSION \
END \
END \

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

@@ -24,9 +24,9 @@
#include "resource.h"
static const WCHAR *k_7zip = L"7-Zip";
static const WCHAR *k_7zip = L"7-Zip-ZStandard";
static const WCHAR *k_Reg_Software_7zip = L"Software\\7-Zip";
static const WCHAR *k_Reg_Software_7zip = L"Software\\7-Zip-ZStandard";
// #define _64BIT_INSTALLER 1
@@ -68,7 +68,7 @@ static const WCHAR *k_Reg_Path32 = L"Path"
#define k_Reg_WOW_Flag_32 0
#endif
#define k_7zip_CLSID L"{23170F69-40C1-278A-1000-000100020000}"
#define k_7zip_CLSID L"{23170F69-40C1-0803-0409-000100020000}"
static const WCHAR *k_Reg_CLSID_7zip = L"CLSID\\" k_7zip_CLSID;
static const WCHAR *k_Reg_CLSID_7zip_Inproc = L"CLSID\\" k_7zip_CLSID L"\\InprocServer32";
@@ -478,9 +478,9 @@ static const WCHAR *FindSubString(const WCHAR *s1, const char *s2)
static void Set7zipPostfix(WCHAR *s)
{
NormalizePrefix(s);
if (FindSubString(s, "7-Zip"))
if (FindSubString(s, "7-Zip-ZStandard"))
return;
wcscat(s, L"7-Zip\\");
wcscat(s, L"7-Zip-ZStandard\\");
}
@@ -763,7 +763,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");
wcscat(destPath, L"\\7-Zip-ZStandard");
#ifdef _64BIT_INSTALLER
MyRegistry_CreateKeyAndVal_32(HKEY_CLASSES_ROOT, destPath, NULL, k_7zip_CLSID);
@@ -794,7 +794,7 @@ static void WriteShellEx()
{
HKEY destKey = 0;
LONG res = MyRegistry_CreateKey(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\7-Zip", &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);

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

@@ -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 ZStd"
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

@@ -38,7 +38,7 @@
// static const WCHAR *k_7zip_with_Ver_str = k_7zip_with_Ver;
static const WCHAR *k_Reg_Software_7zip = L"Software\\7-Zip";
static const WCHAR *k_Reg_Software_7zip = L"Software\\7-Zip-ZStandard";
static const WCHAR *k_Reg_Path = L"Path";
@@ -62,7 +62,7 @@ static const WCHAR *k_Reg_Path32 = L"Path"
#define k_Reg_WOW_Flag_32 0
#endif
#define k_7zip_CLSID L"{23170F69-40C1-278A-1000-000100020000}"
#define k_7zip_CLSID L"{23170F69-40C1-0803-0409-000100020000}"
static const WCHAR *k_Reg_CLSID_7zip = L"CLSID\\" k_7zip_CLSID;
static const WCHAR *k_Reg_CLSID_7zip_Inproc = L"CLSID\\" k_7zip_CLSID L"\\InprocServer32";
@@ -295,7 +295,7 @@ static void SetShellProgramsGroup(HWND hwndOwner)
continue;
NormalizePrefix(link);
wcscat(link, L"7-Zip\\");
wcscat(link, L"7-Zip-ZStandard\\");
{
const size_t baseLen = wcslen(link);
@@ -344,7 +344,7 @@ static const WCHAR *k_Shell_Approved = L"Software\\Microsoft\\Windows\\CurrentVe
static const WCHAR *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 *k_Uninstall_7zip = k_REG_Uninstall L"7-Zip";
static const WCHAR *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");
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");
wcscat(destPath, L"\\7-Zip-ZStandard");
MyRegistry_DeleteKey_32(HKEY_CLASSES_ROOT, destPath);
}

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

@@ -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"
CAPTION "Uninstall 7-Zip ZStandard"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Uninstall from:", IDT_EXTRACT_EXTRACT_TO, m, m, xc, 8

4
CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
View File

@@ -28,8 +28,8 @@
static LPCTSTR k_ShellExtName = TEXT("7-Zip Shell Extension");
static LPCTSTR k_Approved = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved");
// {23170F69-40C1-278A-1000-000100020000}
static LPCTSTR k_Clsid = TEXT("{23170F69-40C1-278A-1000-000100020000}");
// {23170F69-40C1-0803-0409-000100020000}
static LPCTSTR k_Clsid = TEXT("{23170F69-40C1-0803-0409-000100020000}");
DEFINE_GUID(CLSID_CZipContextMenu,
k_7zip_GUID_Data1,

10
CPP/build-x32.cmd
View File

@@ -1,6 +1,6 @@
@echo on
set ROOT=Z:\projekte\7zip-ZStd\git\CPP\7zip
set ROOT=Z:\projekte\7zip-zstd\7-Zip-zstd\CPP\7zip
set OUTDIR=%ROOT%\bin32
mkdir %OUTDIR%
@@ -23,17 +23,21 @@ cd %ROOT%\UI\GUI
nmake %OPTS%
copy O\7zG.exe %OUTDIR%\7zG.exe
cd %ROOT%\UI\Explorer
nmake %OPTS%
copy AMD64\7-zip.dll %OUTDIR%\7-zip.dll
cd %ROOT%\Bundles\SFXWin
nmake %OPTS%
copy O\7z.sfx %OUTDIR%\7z.sfx
cd %ROOT%\Bundles\Codec_zstd
nmake %OPTS%
copy O\zstd.dll %OUTDIR%\zstd-x32.dll
copy O\zstd.dll %OUTDIR%\zstd-x32min.dll
cd %ROOT%\Bundles\Codec_zstdF
nmake %OPTS%
copy O\zstd.dll %OUTDIR%\zstd-x32big.dll
copy O\zstd.dll %OUTDIR%\zstd-x32.dll
cd %ROOT%\..\..\C\Util\7zipInstall
nmake %OPTS%

10
CPP/build-x64.cmd
View File

@@ -1,6 +1,6 @@
@echo on
set ROOT=Z:\projekte\7zip-ZStd\git\CPP\7zip
set ROOT=Z:\projekte\7zip-zstd\7-Zip-zstd\CPP\7zip
set OUTDIR=%ROOT%\bin64
mkdir %OUTDIR%
@@ -23,17 +23,21 @@ cd %ROOT%\UI\GUI
nmake %OPTS%
copy AMD64\7zG.exe %OUTDIR%\7zG.exe
cd %ROOT%\UI\Explorer
nmake %OPTS%
copy AMD64\7-zip.dll %OUTDIR%\7-zip.dll
cd %ROOT%\Bundles\SFXWin
nmake %OPTS%
copy AMD64\7z.sfx %OUTDIR%\7z.sfx
cd %ROOT%\Bundles\Codec_zstd
nmake %OPTS%
copy AMD64\zstd.dll %OUTDIR%\zstd-x64.dll
copy AMD64\zstd.dll %OUTDIR%\zstd-x64min.dll
cd %ROOT%\Bundles\Codec_zstdf
nmake %OPTS%
copy AMD64\zstd.dll %OUTDIR%\zstd-x64big.dll
copy AMD64\zstd.dll %OUTDIR%\zstd-x64.dll
cd %ROOT%\..\..\C\Util\7zipInstall
nmake %OPTS%