Update to 7-Zip Version 21.02

This commit is contained in:
Tino Reichardt
2021-05-13 16:39:14 +02:00
parent 3724ecfedc
commit 48fa49f76c
620 changed files with 35032 additions and 10925 deletions

View File

@@ -63,6 +63,7 @@ AR_OBJS = \
$O\ApmHandler.obj \
$O\ArHandler.obj \
$O\ArjHandler.obj \
$O\Base64Handler.obj \
$O\Bz2Handler.obj \
$O\ComHandler.obj \
$O\CpioHandler.obj \
@@ -289,12 +290,11 @@ C_OBJS = \
$O\MtDec.obj \
$O\Ppmd7.obj \
$O\Ppmd7Dec.obj \
$O\Ppmd7aDec.obj \
$O\Ppmd7Enc.obj \
$O\Ppmd8.obj \
$O\Ppmd8Dec.obj \
$O\Ppmd8Enc.obj \
$O\Sha1.obj \
$O\Sha256.obj \
$O\Sort.obj \
$O\Threads.obj \
$O\Xz.obj \
@@ -306,3 +306,5 @@ C_OBJS = \
!include "../../Crc.mak"
!include "../../Crc64.mak"
!include "../../LzmaDec.mak"
!include "../../Sha1.mak"
!include "../../Sha256.mak"

View File

@@ -0,0 +1,345 @@
include ../../LzmaDec_gcc.mak
LOCAL_FLAGS_ST =
MT_OBJS =
ifdef ST_MODE
LOCAL_FLAGS_ST = -D_7ZIP_ST
ifdef SystemDrive
MT_OBJS = \
$O/Threads.o \
endif
else
MT_OBJS = \
$O/LzFindMt.o \
$O/StreamBinder.o \
$O/Synchronization.o \
$O/VirtThread.o \
$O/MemBlocks.o \
$O/OutMemStream.o \
$O/ProgressMt.o \
$O/Threads.o \
endif
COMMON_OBJS = \
$O/CRC.o \
$O/CrcReg.o \
$O/DynLimBuf.o \
$O/IntToString.o \
$O/MyMap.o \
$O/MyString.o \
$O/MyVector.o \
$O/MyXml.o \
$O/NewHandler.o \
$O/Sha1Prepare.o \
$O/Sha1Reg.o \
$O/Sha256Prepare.o \
$O/Sha256Reg.o \
$O/StringConvert.o \
$O/StringToInt.o \
$O/UTFConvert.o \
$O/Wildcard.o \
$O/XzCrc64Init.o \
$O/XzCrc64Reg.o \
WIN_OBJS = \
$O/FileDir.o \
$O/FileFind.o \
$O/FileIO.o \
$O/FileName.o \
$O/PropVariant.o \
$O/PropVariantUtils.o \
$O/System.o \
$O/TimeUtils.o \
7ZIP_COMMON_OBJS = \
$O/CreateCoder.o \
$O/CWrappers.o \
$O/InBuffer.o \
$O/InOutTempBuffer.o \
$O/FilterCoder.o \
$O/LimitedStreams.o \
$O/LockedStream.o \
$O/MethodId.o \
$O/MethodProps.o \
$O/OffsetStream.o \
$O/OutBuffer.o \
$O/ProgressUtils.o \
$O/PropId.o \
$O/StreamObjects.o \
$O/StreamUtils.o \
$O/UniqBlocks.o \
AR_OBJS = \
$O/ApmHandler.o \
$O/ArHandler.o \
$O/ArjHandler.o \
$O/Base64Handler.o \
$O/Bz2Handler.o \
$O/ComHandler.o \
$O/CpioHandler.o \
$O/CramfsHandler.o \
$O/DeflateProps.o \
$O/DmgHandler.o \
$O/ElfHandler.o \
$O/ExtHandler.o \
$O/FatHandler.o \
$O/FlvHandler.o \
$O/GzHandler.o \
$O/GptHandler.o \
$O/HandlerCont.o \
$O/HfsHandler.o \
$O/IhexHandler.o \
$O/LzhHandler.o \
$O/LzmaHandler.o \
$O/MachoHandler.o \
$O/MbrHandler.o \
$O/MslzHandler.o \
$O/MubHandler.o \
$O/NtfsHandler.o \
$O/PeHandler.o \
$O/PpmdHandler.o \
$O/QcowHandler.o \
$O/RpmHandler.o \
$O/SplitHandler.o \
$O/SquashfsHandler.o \
$O/SwfHandler.o \
$O/UefiHandler.o \
$O/VdiHandler.o \
$O/VhdHandler.o \
$O/VmdkHandler.o \
$O/XarHandler.o \
$O/XzHandler.o \
$O/ZHandler.o \
AR_COMMON_OBJS = \
$O/CoderMixer2.o \
$O/DummyOutStream.o \
$O/FindSignature.o \
$O/InStreamWithCRC.o \
$O/ItemNameUtils.o \
$O/MultiStream.o \
$O/OutStreamWithCRC.o \
$O/OutStreamWithSha1.o \
$O/HandlerOut.o \
$O/ParseProperties.o \
7Z_OBJS = \
$O/7zCompressionMode.o \
$O/7zDecode.o \
$O/7zEncode.o \
$O/7zExtract.o \
$O/7zFolderInStream.o \
$O/7zHandler.o \
$O/7zHandlerOut.o \
$O/7zHeader.o \
$O/7zIn.o \
$O/7zOut.o \
$O/7zProperties.o \
$O/7zSpecStream.o \
$O/7zUpdate.o \
$O/7zRegister.o \
CAB_OBJS = \
$O/CabBlockInStream.o \
$O/CabHandler.o \
$O/CabHeader.o \
$O/CabIn.o \
$O/CabRegister.o \
CHM_OBJS = \
$O/ChmHandler.o \
$O/ChmIn.o \
ISO_OBJS = \
$O/IsoHandler.o \
$O/IsoHeader.o \
$O/IsoIn.o \
$O/IsoRegister.o \
NSIS_OBJS = \
$O/NsisDecode.o \
$O/NsisHandler.o \
$O/NsisIn.o \
$O/NsisRegister.o \
RAR_OBJS = \
$O/RarHandler.o \
$O/Rar5Handler.o \
TAR_OBJS = \
$O/TarHandler.o \
$O/TarHandlerOut.o \
$O/TarHeader.o \
$O/TarIn.o \
$O/TarOut.o \
$O/TarUpdate.o \
$O/TarRegister.o \
UDF_OBJS = \
$O/UdfHandler.o \
$O/UdfIn.o \
WIM_OBJS = \
$O/WimHandler.o \
$O/WimHandlerOut.o \
$O/WimIn.o \
$O/WimRegister.o \
ZIP_OBJS = \
$O/ZipAddCommon.o \
$O/ZipHandler.o \
$O/ZipHandlerOut.o \
$O/ZipIn.o \
$O/ZipItem.o \
$O/ZipOut.o \
$O/ZipUpdate.o \
$O/ZipRegister.o \
COMPRESS_OBJS = \
$O/Bcj2Coder.o \
$O/Bcj2Register.o \
$O/BcjCoder.o \
$O/BcjRegister.o \
$O/BitlDecoder.o \
$O/BranchMisc.o \
$O/BranchRegister.o \
$O/ByteSwap.o \
$O/BZip2Crc.o \
$O/BZip2Decoder.o \
$O/BZip2Encoder.o \
$O/BZip2Register.o \
$O/CopyCoder.o \
$O/CopyRegister.o \
$O/Deflate64Register.o \
$O/DeflateDecoder.o \
$O/DeflateEncoder.o \
$O/DeflateRegister.o \
$O/DeltaFilter.o \
$O/ImplodeDecoder.o \
$O/LzfseDecoder.o \
$O/LzhDecoder.o \
$O/Lzma2Decoder.o \
$O/Lzma2Encoder.o \
$O/Lzma2Register.o \
$O/LzmaDecoder.o \
$O/LzmaEncoder.o \
$O/LzmaRegister.o \
$O/LzmsDecoder.o \
$O/LzOutWindow.o \
$O/LzxDecoder.o \
$O/PpmdDecoder.o \
$O/PpmdEncoder.o \
$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 \
$O/XzEncoder.o \
$O/ZlibDecoder.o \
$O/ZlibEncoder.o \
$O/ZDecoder.o \
CRYPTO_OBJS = \
$O/7zAes.o \
$O/7zAesRegister.o \
$O/HmacSha1.o \
$O/HmacSha256.o \
$O/MyAes.o \
$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 \
C_OBJS = \
$O/7zBuf2.o \
$O/7zStream.o \
$O/Alloc.o \
$O/Bcj2.o \
$O/Bcj2Enc.o \
$O/Blake2s.o \
$O/Bra.o \
$O/Bra86.o \
$O/BraIA64.o \
$O/BwtSort.o \
$O/CpuArch.o \
$O/Delta.o \
$O/HuffEnc.o \
$O/LzFind.o \
$O/Lzma2Dec.o \
$O/Lzma2DecMt.o \
$O/Lzma2Enc.o \
$O/LzmaDec.o \
$O/LzmaEnc.o \
$O/MtCoder.o \
$O/MtDec.o \
$O/Ppmd7.o \
$O/Ppmd7Dec.o \
$O/Ppmd7aDec.o \
$O/Ppmd7Enc.o \
$O/Ppmd8.o \
$O/Ppmd8Dec.o \
$O/Ppmd8Enc.o \
$O/Sort.o \
$O/Xz.o \
$O/XzDec.o \
$O/XzEnc.o \
$O/XzIn.o \
$O/XzCrc64.o \
$O/XzCrc64Opt.o \
$O/7zCrc.o \
$O/7zCrcOpt.o \
$O/Aes.o \
$O/AesOpt.o \
$O/Sha256.o \
$O/Sha256Opt.o \
$O/Sha1.o \
$O/Sha1Opt.o \
ARC_OBJS = \
$(LZMA_DEC_OPT_OBJS) \
$(C_OBJS) \
$(MT_OBJS) \
$(COMMON_OBJS) \
$(WIN_OBJS) \
$(AR_OBJS) \
$(AR_COMMON_OBJS) \
$(7Z_OBJS) \
$(CAB_OBJS) \
$(CHM_OBJS) \
$(COM_OBJS) \
$(ISO_OBJS) \
$(NSIS_OBJS) \
$(RAR_OBJS) \
$(TAR_OBJS) \
$(UDF_OBJS) \
$(WIM_OBJS) \
$(ZIP_OBJS) \
$(COMPRESS_OBJS) \
$(CRYPTO_OBJS) \
$(7ZIP_COMMON_OBJS) \

View File

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"C:\Program Files\7-Zip\7z.dll" /opt:NOWIN98
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"C:\Util\7z.dll" /opt:NOWIN98
# SUBTRACT LINK32 /pdb:none /debug
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\7-Zip\7z.dll" /pdbtype:sept /ignore:4033
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"C:\Util\7z.dll" /pdbtype:sept /ignore:4033
# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -347,10 +347,18 @@ SOURCE=..\..\..\Common\NewHandler.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Common\Sha1Prepare.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\Common\Sha1Reg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\Common\Sha256Prepare.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\Common\Sha256Reg.cpp
# End Source File
# Begin Source File
@@ -1060,6 +1068,16 @@ SOURCE=..\..\Compress\ZDecoder.h
# Begin Source File
SOURCE=..\..\Crypto\7zAes.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
@@ -1068,6 +1086,16 @@ SOURCE=..\..\Crypto\7zAes.h
# Begin Source File
SOURCE=..\..\Crypto\7zAesRegister.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
@@ -1090,6 +1118,16 @@ SOURCE=..\..\Crypto\HmacSha1.h
# Begin Source File
SOURCE=..\..\Crypto\HmacSha256.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
@@ -1098,6 +1136,16 @@ SOURCE=..\..\Crypto\HmacSha256.h
# Begin Source File
SOURCE=..\..\Crypto\MyAes.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
@@ -1106,6 +1154,16 @@ SOURCE=..\..\Crypto\MyAes.h
# Begin Source File
SOURCE=..\..\Crypto\MyAesReg.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
@@ -1164,6 +1222,16 @@ SOURCE=..\..\Crypto\Rar20Crypto.h
# Begin Source File
SOURCE=..\..\Crypto\Rar5Aes.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
@@ -1172,6 +1240,16 @@ SOURCE=..\..\Crypto\Rar5Aes.h
# Begin Source File
SOURCE=..\..\Crypto\RarAes.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
@@ -1184,6 +1262,16 @@ SOURCE=..\..\Crypto\Sha1Cls.h
# Begin Source File
SOURCE=..\..\Crypto\WzAes.cpp
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
@@ -1938,6 +2026,22 @@ SOURCE=..\..\..\..\C\Ppmd7.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Ppmd7aDec.c
!IF "$(CFG)" == "7z - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Ppmd7Dec.c
!IF "$(CFG)" == "7z - Win32 Release"
@@ -2651,6 +2755,10 @@ SOURCE=..\..\Archive\ArjHandler.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Base64Handler.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Archive\Bz2Handler.cpp
# End Source File
# Begin Source File
@@ -3002,6 +3110,68 @@ InputName=AesOpt
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\Asm\x86\Sha1Opt.asm
!IF "$(CFG)" == "7z - Win32 Release"
# Begin Custom Build
OutDir=.\Release
InputPath=..\..\..\..\Asm\x86\Sha1Opt.asm
InputName=Sha1Opt
"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
ml.exe -c -Fo$(OutDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# Begin Custom Build
OutDir=.\Debug
InputPath=..\..\..\..\Asm\x86\Sha1Opt.asm
InputName=Sha1Opt
"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
ml.exe -c -omf -Fo$(OutDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\Asm\x86\Sha256Opt.asm
!IF "$(CFG)" == "7z - Win32 Release"
# Begin Custom Build
OutDir=.\Release
InputPath=..\..\..\..\Asm\x86\Sha256Opt.asm
InputName=Sha256Opt
"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
ml.exe -c -Fo$(OutDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ELSEIF "$(CFG)" == "7z - Win32 Debug"
# Begin Custom Build
OutDir=.\Debug
InputPath=..\..\..\..\Asm\x86\Sha256Opt.asm
InputName=Sha256Opt
"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
ml.exe -c -omf -Fo$(OutDir)\$(InputName).obj $(InputPath)
# End Custom Build
!ENDIF
# End Source File
# End Group
# End Target

View File

@@ -0,0 +1,45 @@
PROG = 7z
DEF_FILE = ../../Archive/Archive2.def
# IS_X64 = 1
# USE_ASM = 1
# ST_MODE = 1
include Arc_gcc.mak
ifdef SystemDrive
LOCAL_FLAGS_WIN = \
-D_7ZIP_LARGE_PAGES \
$(LOCAL_FLAGS_ST) \
SYS_OBJS = \
$O/resource.o \
else
SYS_OBJS = \
$O/MyWindows.o \
endif
LOCAL_FLAGS = \
-DEXTERNAL_CODECS \
$(LOCAL_FLAGS_WIN) \
$(LOCAL_FLAGS_ST) \
COMPRESS_OBJS_2 = \
$O/CodecExports.o \
AR_OBJS_2 = \
$O/ArchiveExports.o \
$O/DllExports2.o \
OBJS = \
$(ARC_OBJS) \
$(AR_OBJS_2) \
$(COMPRESS_OBJS_2) \
$(SYS_OBJS) \
include ../../7zip_gcc.mak

View File

@@ -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 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 wim:15 swm:15 esd:15 fat:21 ntfs:22 dmg:17 hfs:18 xar:19 squashfs:24 zst:25"
END