Update to 7-Zip Version 21.07

See: https://sourceforge.net/p/sevenzip/discussion/45797/thread/0a7b47970b/

CPP/7zip/Bundles/Alone7z/Alone.dsp

@@ -1942,10 +1942,6 @@ SOURCE=..\..\..\..\C\Threads.c
 
 SOURCE=..\..\..\..\C\Threads.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\Types.h
-# End Source File
 # End Group
 # Begin Group "Crypto"
 

CPP/7zip/Bundles/Fm/resource.rc

@@ -3,5 +3,5 @@
 
 STRINGTABLE
 BEGIN
-  100 "7z zip rar 001 cab iso xz txz lzma tar cpio bz2 bzip2 tbz2 tbz gz gzip tgz tpz z taz lz tlz lz4 tlz4 lz5 tlz5 lzh lha rpm deb arj vhd wim swm esd fat ntfs dmg hfs xar squashfs zst"
+  100 "7z zip rar 001 cab iso xz txz lzma tar cpio bz2 bzip2 tbz2 tbz gz gzip tgz tpz z taz lz tlz lz4 tlz4 lz5 tlz5 lzh lha rpm deb arj vhd vhdx wim swm esd fat ntfs dmg hfs xar squashfs zst"
 END

CPP/7zip/Bundles/Format7zF/Arc.mak

@@ -101,6 +101,7 @@ AR_OBJS = \
   $O\UefiHandler.obj \
   $O\VdiHandler.obj \
   $O\VhdHandler.obj \
+  $O\VhdxHandler.obj \
   $O\VmdkHandler.obj \
   $O\XarHandler.obj \
   $O\XzHandler.obj \

CPP/7zip/Bundles/Format7zF/Arc_gcc.mak

@@ -118,6 +118,7 @@ AR_OBJS = \
   $O/UefiHandler.o \
   $O/VdiHandler.o \
   $O/VhdHandler.o \
+  $O/VhdxHandler.o \
   $O/VmdkHandler.o \
   $O/XarHandler.o \
   $O/XzHandler.o \
@@ -175,10 +176,14 @@ NSIS_OBJS = \
   $O/NsisIn.o \
   $O/NsisRegister.o \
 
+ifndef DISABLE_RAR
 RAR_OBJS = \
   $O/RarHandler.o \
   $O/Rar5Handler.o \
 
+endif
+
+
 TAR_OBJS = \
   $O/TarHandler.o \
   $O/TarHandlerOut.o \
@@ -245,12 +250,6 @@ COMPRESS_OBJS = \
   $O/PpmdRegister.o \
   $O/PpmdZip.o \
   $O/QuantumDecoder.o \
-  $O/Rar1Decoder.o \
-  $O/Rar2Decoder.o \
-  $O/Rar3Decoder.o \
-  $O/Rar3Vm.o \
-  $O/Rar5Decoder.o \
-  $O/RarCodecsRegister.o \
   $O/ShrinkDecoder.o \
   $O/XpressDecoder.o \
   $O/XzDecoder.o \
@@ -259,6 +258,20 @@ COMPRESS_OBJS = \
   $O/ZlibEncoder.o \
   $O/ZDecoder.o \
 
+ifdef DISABLE_RAR
+DISABLE_RAR_COMPRESS=1
+endif
+
+ifndef DISABLE_RAR_COMPRESS
+COMPRESS_OBJS += \
+  $O/Rar1Decoder.o \
+  $O/Rar2Decoder.o \
+  $O/Rar3Decoder.o \
+  $O/Rar3Vm.o \
+  $O/Rar5Decoder.o \
+  $O/RarCodecsRegister.o \
+
+endif
 
 CRYPTO_OBJS = \
   $O/7zAes.o \
@@ -269,13 +282,18 @@ CRYPTO_OBJS = \
   $O/MyAesReg.o \
   $O/Pbkdf2HmacSha1.o \
   $O/RandGen.o \
-  $O/Rar20Crypto.o \
-  $O/Rar5Aes.o \
-  $O/RarAes.o \
   $O/WzAes.o \
   $O/ZipCrypto.o \
   $O/ZipStrong.o \
 
+ifndef DISABLE_RAR
+CRYPTO_OBJS += \
+  $O/Rar20Crypto.o \
+  $O/Rar5Aes.o \
+  $O/RarAes.o \
+
+endif
+
 
 C_OBJS = \
   $O/7zBuf2.o \
@@ -323,7 +341,7 @@ C_OBJS = \
   $O/Sha1Opt.o \
 
 ARC_OBJS = \
-	$(LZMA_DEC_OPT_OBJS) \
+  $(LZMA_DEC_OPT_OBJS) \
   $(C_OBJS) \
   $(MT_OBJS) \
   $(COMMON_OBJS) \

CPP/7zip/Bundles/Format7zF/Format7z.dsp

@@ -2929,6 +2929,10 @@ SOURCE=..\..\Archive\VhdHandler.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Archive\VhdxHandler.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Archive\VmdkHandler.cpp
 # End Source File
 # Begin Source File

CPP/7zip/Bundles/Format7zF/resource.rc

@@ -36,5 +36,5 @@ MY_VERSION_INFO_DLL("7z Plugin" , "7z")
 
 STRINGTABLE
 BEGIN
-  100 "7z:0 zip:1 rar:3 001:9 cab:7 iso:8 xz:23 txz:23 lzma:16 tar:13 cpio:12 bz2:2 bzip2:2 tbz2:2 tbz:2 gz:14 gzip:14 tgz:14 tpz:14 z:5 taz:5 lz:16 tlz:16 liz:28 lz4:26 lz5:27 lzh:6 lha:6 rpm:10 deb:11 arj:4 vhd:20 wim:15 swm:15 esd:15 fat:21 ntfs:22 dmg:17 hfs:18 xar:19 squashfs:24 zst:25"
+  100 "7z:0 zip:1 rar:3 001:9 cab:7 iso:8 xz:23 txz:23 lzma:16 tar:13 cpio:12 bz2:2 bzip2:2 tbz2:2 tbz:2 gz:14 gzip:14 tgz:14 tpz:14 z:5 taz:5 lz:16 tlz:16 liz:28 lz4:26 lz5:27 lzh:6 lha:6 rpm:10 deb:11 arj:4 vhd:20 vhdx:20 wim:15 swm:15 esd:15 fat:21 ntfs:22 dmg:17 hfs:18 xar:19 squashfs:24 zst:25"
 END

CPP/7zip/Bundles/SFXCon/SfxCon.cpp

@@ -208,7 +208,7 @@ static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor,
   if (!IsWildcardFilePathLegal(name))
     return false;
   */
-  bool isWildcard = DoesNameContainWildcard(name);
+  const bool isWildcard = DoesNameContainWildcard(name);
   bool recursed = false;
 
   switch (type)
@@ -223,7 +223,10 @@ static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor,
       recursed = false;
       break;
   }
-  wildcardCensor.AddPreItem(include, name, recursed, true);
+
+  NWildcard::CCensorPathProps props;
+  props.Recursive = recursed;
+  wildcardCensor.AddPreItem(include, name, props);
   return true;
 }
 

CPP/7zip/Bundles/SFXWin/SfxWin.cpp

@@ -178,7 +178,7 @@ static int APIENTRY WinMain2()
   v1.Add(fs2us(fullPath));
   v2.Add(fs2us(fullPath));
   NWildcard::CCensorNode wildcardCensor;
-  wildcardCensor.AddItem(true, L"*", true, true, true, true);
+  wildcardCensor.Add_Wildcard();
 
   bool messageWasDisplayed = false;
   result = ExtractGUI(codecs,