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

apply James Hoo 's other original mod

Browse Source
This commit is contained in:
shunf4
2024-04-20 19:09:23 +08:00
parent d5255dec84
commit b085993aae
10 changed files with 86 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
CPP/7zip/UI/Common/ZipRegistry.cpp
View File

@@ -21,8 +21,10 @@ 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 kCuFMPrefix = TEXT("Software") TEXT(STRING_PATH_SEPARATOR) TEXT("7-Zip") TEXT(STRING_PATH_SEPARATOR) TEXT("FM");
static CSysString GetKeyPath(LPCTSTR path) { return kCuPrefix + (CSysString)path; }
static CSysString GetFMKeyPath() { return kCuFMPrefix; }
static LONG OpenMainKey(CKey &key, LPCTSTR keyName)
{
@@ -34,6 +36,16 @@ static LONG CreateMainKey(CKey &key, LPCTSTR keyName)
return key.Create(HKEY_CURRENT_USER, GetKeyPath(keyName));
}
static LONG OpenFMKey(CKey &key)
{
return key.Open(HKEY_CURRENT_USER, GetFMKeyPath(), KEY_READ);
}
static LONG CreateFMKey(CKey &key)
{
return key.Create(HKEY_CURRENT_USER, GetFMKeyPath());
}
static void Key_Set_UInt32(CKey &key, LPCTSTR name, UInt32 value)
{
if (value == (UInt32)(Int32)-1)
@@ -99,6 +111,8 @@ static LPCTSTR const kElimDup = TEXT("ElimDup");
// static LPCTSTR const kAltStreams = TEXT("AltStreams");
static LPCTSTR const kNtSecur = TEXT("Security");
static LPCTSTR const kFMCopyHistoryValueName = TEXT("CopyHistory");
void CInfo::Save() const
{
CS_LOCK
@@ -116,8 +130,15 @@ void CInfo::Save() const
Key_Set_BoolPair(key, kNtSecur, NtSecurity);
Key_Set_BoolPair(key, kShowPassword, ShowPassword);
key.RecurseDeleteKey(kPathHistory);
key.SetValue_Strings(kPathHistory, Paths);
// key.RecurseDeleteKey(kPathHistory);
// key.SetValue_Strings(kPathHistory, Paths);
key.Close();
if (CreateFMKey(key) == ERROR_SUCCESS)
{
key.SetValue_Strings(kFMCopyHistoryValueName, Paths);
key.Close();
}
}
void Save_ShowPassword(bool showPassword)
@@ -141,28 +162,37 @@ void CInfo::Load()
CS_LOCK
CKey key;
if (OpenMainKey(key, kKeyName) != ERROR_SUCCESS)
return;
// if (OpenMainKey(key, kKeyName) != ERROR_SUCCESS)
// return;
key.GetValue_Strings(kPathHistory, Paths);
UInt32 v;
if (key.QueryValue(kExtractMode, v) == ERROR_SUCCESS && v <= NPathMode::kAbsPaths)
if (OpenMainKey(key, kKeyName) == ERROR_SUCCESS)
{
PathMode = (NPathMode::EEnum)v;
PathMode_Force = true;
// key.GetValue_Strings(kPathHistory, Paths);
UInt32 v;
if (key.QueryValue(kExtractMode, v) == ERROR_SUCCESS && v <= NPathMode::kAbsPaths)
{
PathMode = (NPathMode::EEnum)v;
PathMode_Force = true;
}
if (key.QueryValue(kOverwriteMode, v) == ERROR_SUCCESS && v <= NOverwriteMode::kRenameExisting)
{
OverwriteMode = (NOverwriteMode::EEnum)v;
OverwriteMode_Force = true;
}
Key_Get_BoolPair_true(key, kSplitDest, SplitDest);
Key_Get_BoolPair(key, kElimDup, ElimDup);
// Key_Get_BoolPair(key, kAltStreams, AltStreams);
Key_Get_BoolPair(key, kNtSecur, NtSecurity);
Key_Get_BoolPair(key, kShowPassword, ShowPassword);
key.Close();
}
if (key.QueryValue(kOverwriteMode, v) == ERROR_SUCCESS && v <= NOverwriteMode::kRenameExisting)
if (OpenFMKey(key) == ERROR_SUCCESS)
{
OverwriteMode = (NOverwriteMode::EEnum)v;
OverwriteMode_Force = true;
key.GetValue_Strings(kFMCopyHistoryValueName, Paths);
key.Close();
}
Key_Get_BoolPair_true(key, kSplitDest, SplitDest);
Key_Get_BoolPair(key, kElimDup, ElimDup);
// Key_Get_BoolPair(key, kAltStreams, AltStreams);
Key_Get_BoolPair(key, kNtSecur, NtSecurity);
Key_Get_BoolPair(key, kShowPassword, ShowPassword);
}
bool Read_ShowPassword()
@@ -542,11 +572,11 @@ void CContextMenuInfo::Save() const
void CContextMenuInfo::Load()
{
Cascaded.Val = true;
Cascaded.Val = false;
Cascaded.Def = false;
MenuIcons.Val = false;
MenuIcons.Def = false;
MenuIcons.Val = true;
MenuIcons.Def = true;
ElimDup.Val = true;
ElimDup.Def = false;

3
CPP/7zip/UI/Common/ZipRegistry.h
View File

@@ -43,6 +43,9 @@ namespace NExtract
void Save_ShowPassword(bool showPassword);
bool Read_ShowPassword();
void SaveOptShowPassword(bool bShow);
bool ReadOptShowPassword();
}
namespace NCompression