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

Fix selectable uppercase / lowercase hash formatting

Browse Source 
- the last fix was not done correctly
- issue #177 is solved really now

Signed-off-by: Tino Reichardt <milky-7zip@mcmilk.de>
This commit is contained in:
Tino Reichardt
2023-02-18 19:11:16 +01:00
parent f0954038bc
commit 4fae369d2d
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
C/7zVersion.h
View File

@@ -1,7 +1,7 @@
#define MY_VER_MAJOR 22 #define MY_VER_MAJOR 22
#define MY_VER_MINOR 01 #define MY_VER_MINOR 01
#define MY_VER_BUILD 0 #define MY_VER_BUILD 02
#define MY_VERSION_NUMBERS "22.01 ZS v1.5.4 R1" #define MY_VERSION_NUMBERS "22.01 ZS v1.5.4 R2"
#define MY_VERSION MY_VERSION_NUMBERS #define MY_VERSION MY_VERSION_NUMBERS
#ifdef MY_CPU_NAME #ifdef MY_CPU_NAME
@@ -10,7 +10,7 @@
#define MY_VERSION_CPU MY_VERSION #define MY_VERSION_CPU MY_VERSION
#endif #endif
#define MY_DATE "2023-02-12" #define MY_DATE "2023-02-18"
#undef MY_COPYRIGHT #undef MY_COPYRIGHT
#undef MY_VERSION_COPYRIGHT_DATE #undef MY_VERSION_COPYRIGHT_DATE
#define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt" #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt"

10
CPP/7zip/UI/Common/HashCalc.cpp
View File

@@ -21,10 +21,6 @@
#include "../FileManager/RegistryUtils.h" #include "../FileManager/RegistryUtils.h"
#endif #endif
#ifdef WANT_OPTIONAL_LOWERCASE
#include "../FileManager/RegistryUtils.h"
#endif
#include "EnumDirItems.h" #include "EnumDirItems.h"
#include "HashCalc.h" #include "HashCalc.h"
@@ -657,15 +653,17 @@ static inline char GetHex_Upper(unsigned v)
{ {
#ifdef WANT_OPTIONAL_LOWERCASE #ifdef WANT_OPTIONAL_LOWERCASE
if (WantLowercaseHashes()) if (WantLowercaseHashes())
{
return (char)((v < 10) ? ('0' + v) : ('a' + (v - 10))); return (char)((v < 10) ? ('0' + v) : ('a' + (v - 10)));
}
#endif #endif
return (char)((v < 10) ? ('0' + v) : ('A' + (v - 10))); return (char)((v < 10) ? ('0' + v) : ('A' + (v - 10)));
} }
static inline char GetHex_Lower(unsigned v) static inline char GetHex_Lower(unsigned v)
{ {
#ifdef WANT_OPTIONAL_LOWERCASE
if (!WantLowercaseHashes())
return (char)((v < 10) ? ('0' + v) : ('A' + (v - 10)));
#endif
return (char)((v < 10) ? ('0' + v) : ('a' + (v - 10))); return (char)((v < 10) ? ('0' + v) : ('a' + (v - 10)));
} }

2
CPP/7zip/UI/Explorer/ContextMenu.cpp
View File

@@ -883,7 +883,7 @@ STDMETHODIMP CZipContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu,
CMenu menu; CMenu menu;
menu.Attach(hMenu); menu.Attach(hMenu);
menuDestroyer.Disable(); menuDestroyer.Disable();
MyAddSubMenu(_commandMap, kMainVerb, menu, indexMenu++, currentCommandID++, (UString)"7-Zip ZS", MyAddSubMenu(_commandMap, kCheckSumCascadedVerb, menu, indexMenu++, currentCommandID++, (UString)"7-Zip ZS",
popupMenu, // popupMenu.Detach(), popupMenu, // popupMenu.Detach(),
bitmap); bitmap);
} }

2
README.md
View File

@@ -297,7 +297,7 @@ You find this project useful, maybe you consider a donation ;-)
- [Zstandard] Version 1.5.4 - [Zstandard] Version 1.5.4
- [BLAKE3] Version 0.3.7 - [BLAKE3] Version 0.3.7
/TR 2023-02-12 /TR 2023-02-18
## Notes ## Notes