FileManager: normalize menu "CRC" in file list and inside of the archive, same hashes like in menu "7-Zip ZS Hash" (also added SHA3-items, menu "CRC" missed them completely)

Author: sebres

CPP/7zip/UI/FileManager/MyLoadMenu.cpp

@@ -769,11 +769,14 @@ bool ExecuteFileCommand(unsigned id)
     case IDM_MD4:   g_App.CalculateCrc("MD4"); break;
     case IDM_MD5:   g_App.CalculateCrc("MD5"); break;
     case IDM_SHA1:  g_App.CalculateCrc("SHA1"); break;
-    case IDM_SHA256: g_App.CalculateCrc("SHA256"); break;
-    case IDM_SHA384: g_App.CalculateCrc("SHA384"); break;
-    case IDM_SHA512: g_App.CalculateCrc("SHA512"); break;
+    case IDM_SHA2_256: g_App.CalculateCrc("SHA256"); break;
+    case IDM_SHA2_384: g_App.CalculateCrc("SHA384"); break;
+    case IDM_SHA2_512: g_App.CalculateCrc("SHA512"); break;
     case IDM_BLAKE2sp: g_App.CalculateCrc("BLAKE2sp"); break;
     case IDM_BLAKE3: g_App.CalculateCrc("BLAKE3"); break;
+    case IDM_SHA3_256: g_App.CalculateCrc("SHA3-256"); break;
+    case IDM_SHA3_384: g_App.CalculateCrc("SHA3-384"); break;
+    case IDM_SHA3_512: g_App.CalculateCrc("SHA3-512"); break;
 
     case IDM_DIFF: g_App.DiffFiles(); break;
 

CPP/7zip/UI/FileManager/resource.h

@@ -29,11 +29,14 @@
 #define IDM_MD4                  107
 #define IDM_MD5                  108
 #define IDM_SHA1                 109
-#define IDM_SHA256               110
-#define IDM_SHA384               111
-#define IDM_SHA512               112
+#define IDM_SHA2_256             110
+#define IDM_SHA2_384             111
+#define IDM_SHA2_512             112
 #define IDM_BLAKE2sp             113
 #define IDM_BLAKE3               114
+#define IDM_SHA3_256             115
+#define IDM_SHA3_384             116
+#define IDM_SHA3_512             117
 
 #define IDM_FILE                 500
 #define IDM_EDIT                 501

CPP/7zip/UI/FileManager/resource.rc

@@ -57,17 +57,20 @@ BEGIN
     BEGIN
       MENUITEM "CRC-32",                    IDM_CRC32
       MENUITEM "CRC-64",                    IDM_CRC64
-      MENUITEM "xxHash-32",                 IDM_XXH32
-      MENUITEM "xxHash-64",                 IDM_XXH64
+      MENUITEM "XXH-32",                    IDM_XXH32
+      MENUITEM "XXH-64",                    IDM_XXH64
       MENUITEM "MD2",                       IDM_MD2
       MENUITEM "MD4",                       IDM_MD4
       MENUITEM "MD5",                       IDM_MD5
       MENUITEM "SHA-1",                     IDM_SHA1
-      MENUITEM "SHA-256",                   IDM_SHA256
-      MENUITEM "SHA-384",                   IDM_SHA384
-      MENUITEM "SHA-512",                   IDM_SHA512
-      MENUITEM "Blake2sp",                  IDM_BLAKE2sp
-      MENUITEM "Blake3",                    IDM_BLAKE3
+      MENUITEM "SHA2-256",                  IDM_SHA2_256
+      MENUITEM "SHA2-384",                  IDM_SHA2_384
+      MENUITEM "SHA2-512",                  IDM_SHA2_512
+      MENUITEM "BLAKE2sp",                  IDM_BLAKE2sp
+      MENUITEM "BLAKE3",                    IDM_BLAKE3
+      MENUITEM "SHA3-256",                  IDM_SHA3_256
+      MENUITEM "SHA3-384",                  IDM_SHA3_384
+      MENUITEM "SHA3-512",                  IDM_SHA3_512
       MENUITEM "*",                         IDM_HASH_ALL
     END
     MENUITEM "Di&ff",                       IDM_DIFF