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

Make 7-Zip ZS binary compatible with 7-Zip Standard

Browse Source 
- you can use codec extensions for 7-zip now ;)
- remove builds for: Format7zFO, Format7zUSB
- also change build scripts and version numbers
This commit is contained in:
Tino Reichardt
2018-11-27 15:41:49 +01:00
parent f98edef556
commit bc77601656
35 changed files with 33 additions and 3935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CPP/7zip/Bundles/Codec_brotli/makefile
View File

@@ -1,6 +1,6 @@
PROG = brotli.dll
DEF_FILE = ../../Compress/Codec.def
CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
CFLAGS = $(CFLAGS)
7ZIP_COMMON_OBJS = \
$O\StreamUtils.obj \

2
CPP/7zip/Bundles/Codec_flzma2/makefile
View File

@@ -1,6 +1,6 @@
PROG = flzma2.dll
DEF_FILE = ../../Compress/Codec.def
CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DNO_XXHASH
CFLAGS = $(CFLAGS) -DNO_XXHASH
7ZIP_COMMON_OBJS = \
$O\CWrappers.obj \

2
CPP/7zip/Bundles/Codec_lizard/makefile
View File

@@ -1,6 +1,6 @@
PROG = lizard.dll
DEF_FILE = ../../Compress/Codec.def
CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
CFLAGS = $(CFLAGS)
7ZIP_COMMON_OBJS = \
$O\StreamUtils.obj \

2
CPP/7zip/Bundles/Codec_lz4/makefile
View File

@@ -1,6 +1,6 @@
PROG = lz4.dll
DEF_FILE = ../../Compress/Codec.def
CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
CFLAGS = $(CFLAGS)
7ZIP_COMMON_OBJS = \
$O\StreamUtils.obj \

2
CPP/7zip/Bundles/Codec_lz5/makefile
View File

@@ -1,6 +1,6 @@
PROG = lz5.dll
DEF_FILE = ../../Compress/Codec.def
CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
CFLAGS = $(CFLAGS)
7ZIP_COMMON_OBJS = \
$O\StreamUtils.obj \

11
CPP/7zip/Bundles/Codec_zstd/makefile
View File

@@ -1,6 +1,6 @@
PROG = zstd-min.dll
PROG = zstd.dll
DEF_FILE = ../../Compress/Codec.def
CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DZSTD_MULTITHREAD
CFLAGS = $(CFLAGS) -DZSTD_LEGACY_SUPPORT -DZSTD_MULTITHREAD
7ZIP_COMMON_OBJS = \
$O\StreamUtils.obj \
@@ -42,6 +42,13 @@ ZSTD_OBJS = \
$O\zstd_ldm.obj \
$O\zstdmt_compress.obj \
$O\zstd_opt.obj \
$O\zstd_v01.obj \
$O\zstd_v02.obj \
$O\zstd_v03.obj \
$O\zstd_v04.obj \
$O\zstd_v05.obj \
$O\zstd_v06.obj \
$O\zstd_v07.obj \
ZSTDMT_OBJS = \
$O\zstd-mt_threading.obj \

3
CPP/7zip/Bundles/Codec_zstdF/StdAfx.cpp
View File

@@ -1,3 +0,0 @@
// StdAfx.cpp
#include "StdAfx.h"

8
CPP/7zip/Bundles/Codec_zstdF/StdAfx.h
View File

@@ -1,8 +0,0 @@
// StdAfx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#include "../../../Common/Common.h"
#endif

56
CPP/7zip/Bundles/Codec_zstdF/makefile
View File

@@ -1,56 +0,0 @@
PROG = zstd.dll
DEF_FILE = ../../Compress/Codec.def
CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DZSTD_LEGACY_SUPPORT -DZSTD_MULTITHREAD
7ZIP_COMMON_OBJS = \
$O\StreamUtils.obj \
WIN_OBJS = \
$O\System.obj \
COMPRESS_OBJS = \
$O\CodecExports.obj \
$O\DllExportsCompress.obj \
C_OBJS = \
$O\Alloc.obj \
$O\Threads.obj \
COMPRESS_OBJS = $(COMPRESS_OBJS) \
$O\ZstdDecoder.obj \
$O\ZstdEncoder.obj \
$O\ZstdRegister.obj \
ZSTD_OBJS = \
$O\debug.obj \
$O\entropy_common.obj \
$O\error_private.obj \
$O\fse_compress.obj \
$O\fse_decompress.obj \
$O\hist.obj \
$O\huf_compress.obj \
$O\huf_decompress.obj \
$O\pool.obj \
$O\threading.obj \
$O\xxhash.obj \
$O\zstd_common.obj \
$O\zstd_compress.obj \
$O\zstd_decompress.obj \
$O\zstd_double_fast.obj \
$O\zstd_fast.obj \
$O\zstd_lazy.obj \
$O\zstd_ldm.obj \
$O\zstdmt_compress.obj \
$O\zstd_opt.obj \
$O\zstd_v01.obj \
$O\zstd_v02.obj \
$O\zstd_v03.obj \
$O\zstd_v04.obj \
$O\zstd_v05.obj \
$O\zstd_v06.obj \
$O\zstd_v07.obj \
ZSTDMT_OBJS = \
$O\zstd-mt_threading.obj \
!include "../../7zip.mak"

6
CPP/7zip/Bundles/Codec_zstdF/resource.rc
View File

@@ -1,6 +0,0 @@
#include "../../../../C/7zVersionTr.h"
#include "../../../../C/7zVersion.rc"
MY_VERSION_INFO_DLL("7-Zip ZS Plugin v1.3.7", "zstd")
101 ICON "../../Archive/Icons/zst.ico"

4
CPP/7zip/Bundles/Format7zExtract/makefile
View File

@@ -1,8 +1,6 @@
PROG = 7zxa.dll
DEF_FILE = ../../Archive/Archive2.def
CFLAGS = $(CFLAGS) \
-DNEED_7ZIP_GUID \
-DEXTRACT_ONLY \
CFLAGS = $(CFLAGS) -DEXTRACT_ONLY \
COMMON_OBJS = \
$O\CRC.obj \

306
CPP/7zip/Bundles/Format7zFO/Arc.mak
View File

@@ -1,306 +0,0 @@
COMMON_OBJS = \
$O\CRC.obj \
$O\CrcReg.obj \
$O\DynLimBuf.obj \
$O\IntToString.obj \
$O\Md2Reg.obj \
$O\Md4Reg.obj \
$O\Md5Reg.obj \
$O\MyMap.obj \
$O\MyString.obj \
$O\MyVector.obj \
$O\MyXml.obj \
$O\NewHandler.obj \
$O\Sha1Reg.obj \
$O\Sha256Reg.obj \
$O\Sha384Reg.obj \
$O\Sha512Reg.obj \
$O\StringConvert.obj \
$O\StringToInt.obj \
$O\UTFConvert.obj \
$O\Wildcard.obj \
$O\XXH32Reg.obj \
$O\XXH64Reg.obj \
$O\XzCrc64Init.obj \
$O\XzCrc64Reg.obj \
WIN_OBJS = \
$O\FileDir.obj \
$O\FileFind.obj \
$O\FileIO.obj \
$O\FileName.obj \
$O\PropVariant.obj \
$O\PropVariantUtils.obj \
$O\Synchronization.obj \
$O\System.obj \
$O\TimeUtils.obj \
7ZIP_COMMON_OBJS = \
$O\CreateCoder.obj \
$O\CWrappers.obj \
$O\InBuffer.obj \
$O\InOutTempBuffer.obj \
$O\FilterCoder.obj \
$O\LimitedStreams.obj \
$O\LockedStream.obj \
$O\MemBlocks.obj \
$O\MethodId.obj \
$O\MethodProps.obj \
$O\OffsetStream.obj \
$O\OutBuffer.obj \
$O\OutMemStream.obj \
$O\ProgressMt.obj \
$O\ProgressUtils.obj \
$O\PropId.obj \
$O\StreamBinder.obj \
$O\StreamObjects.obj \
$O\StreamUtils.obj \
$O\UniqBlocks.obj \
$O\VirtThread.obj \
AR_OBJS = \
$O\ApmHandler.obj \
$O\ArHandler.obj \
$O\ArjHandler.obj \
$O\Bz2Handler.obj \
$O\ComHandler.obj \
$O\CpioHandler.obj \
$O\CramfsHandler.obj \
$O\DeflateProps.obj \
$O\DmgHandler.obj \
$O\ElfHandler.obj \
$O\ExtHandler.obj \
$O\FatHandler.obj \
$O\FlvHandler.obj \
$O\GzHandler.obj \
$O\GptHandler.obj \
$O\HandlerCont.obj \
$O\HfsHandler.obj \
$O\IhexHandler.obj \
$O\LzHandler.obj \
$O\Lz4Handler.obj \
$O\Lz5Handler.obj \
$O\LizardHandler.obj \
$O\LzhHandler.obj \
$O\LzmaHandler.obj \
$O\MachoHandler.obj \
$O\MbrHandler.obj \
$O\MslzHandler.obj \
$O\MubHandler.obj \
$O\NtfsHandler.obj \
$O\PeHandler.obj \
$O\PpmdHandler.obj \
$O\QcowHandler.obj \
$O\RpmHandler.obj \
$O\SplitHandler.obj \
$O\SquashfsHandler.obj \
$O\SwfHandler.obj \
$O\UefiHandler.obj \
$O\VdiHandler.obj \
$O\VhdHandler.obj \
$O\VmdkHandler.obj \
$O\XarHandler.obj \
$O\XzHandler.obj \
$O\ZHandler.obj \
$O\ZstdHandler.obj \
AR_COMMON_OBJS = \
$O\CoderMixer2.obj \
$O\DummyOutStream.obj \
$O\FindSignature.obj \
$O\InStreamWithCRC.obj \
$O\ItemNameUtils.obj \
$O\MultiStream.obj \
$O\OutStreamWithCRC.obj \
$O\OutStreamWithSha1.obj \
$O\HandlerOut.obj \
$O\ParseProperties.obj \
7Z_OBJS = \
$O\7zCompressionMode.obj \
$O\7zDecode.obj \
$O\7zEncode.obj \
$O\7zExtract.obj \
$O\7zFolderInStream.obj \
$O\7zHandler.obj \
$O\7zHandlerOut.obj \
$O\7zHeader.obj \
$O\7zIn.obj \
$O\7zOut.obj \
$O\7zProperties.obj \
$O\7zSpecStream.obj \
$O\7zUpdate.obj \
$O\7zRegister.obj \
CAB_OBJS = \
$O\CabBlockInStream.obj \
$O\CabHandler.obj \
$O\CabHeader.obj \
$O\CabIn.obj \
$O\CabRegister.obj \
CHM_OBJS = \
$O\ChmHandler.obj \
$O\ChmIn.obj \
ISO_OBJS = \
$O\IsoHandler.obj \
$O\IsoHeader.obj \
$O\IsoIn.obj \
$O\IsoRegister.obj \
NSIS_OBJS = \
$O\NsisDecode.obj \
$O\NsisHandler.obj \
$O\NsisIn.obj \
$O\NsisRegister.obj \
RAR_OBJS = \
$O\RarHandler.obj \
$O\Rar5Handler.obj \
TAR_OBJS = \
$O\TarHandler.obj \
$O\TarHandlerOut.obj \
$O\TarHeader.obj \
$O\TarIn.obj \
$O\TarOut.obj \
$O\TarUpdate.obj \
$O\TarRegister.obj \
UDF_OBJS = \
$O\UdfHandler.obj \
$O\UdfIn.obj \
WIM_OBJS = \
$O\WimHandler.obj \
$O\WimHandlerOut.obj \
$O\WimIn.obj \
$O\WimRegister.obj \
ZIP_OBJS = \
$O\ZipAddCommon.obj \
$O\ZipHandler.obj \
$O\ZipHandlerOut.obj \
$O\ZipIn.obj \
$O\ZipItem.obj \
$O\ZipOut.obj \
$O\ZipUpdate.obj \
$O\ZipRegister.obj \
COMPRESS_OBJS = \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\BitlDecoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\ByteSwap.obj \
$O\BZip2Crc.obj \
$O\BZip2Decoder.obj \
$O\BZip2Encoder.obj \
$O\BZip2Register.obj \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
$O\Deflate64Register.obj \
$O\DeflateDecoder.obj \
$O\DeflateEncoder.obj \
$O\DeflateRegister.obj \
$O\DeltaFilter.obj \
$O\ImplodeDecoder.obj \
$O\LzfseDecoder.obj \
$O\LzhDecoder.obj \
$O\Lzma2Decoder.obj \
$O\Lzma2Encoder.obj \
$O\Lzma2Register.obj \
$O\LzmaDecoder.obj \
$O\LzmaEncoder.obj \
$O\LzmaRegister.obj \
$O\LzmsDecoder.obj \
$O\LzOutWindow.obj \
$O\LzxDecoder.obj \
$O\PpmdDecoder.obj \
$O\PpmdEncoder.obj \
$O\PpmdRegister.obj \
$O\PpmdZip.obj \
$O\QuantumDecoder.obj \
$O\Rar1Decoder.obj \
$O\Rar2Decoder.obj \
$O\Rar3Decoder.obj \
$O\Rar3Vm.obj \
$O\Rar5Decoder.obj \
$O\RarCodecsRegister.obj \
$O\ShrinkDecoder.obj \
$O\XpressDecoder.obj \
$O\XzDecoder.obj \
$O\XzEncoder.obj \
$O\ZlibDecoder.obj \
$O\ZlibEncoder.obj \
$O\ZDecoder.obj \
CRYPTO_OBJS = \
$O\7zAes.obj \
$O\7zAesRegister.obj \
$O\HmacSha1.obj \
$O\HmacSha256.obj \
$O\MyAes.obj \
$O\MyAesReg.obj \
$O\Pbkdf2HmacSha1.obj \
$O\RandGen.obj \
$O\Rar20Crypto.obj \
$O\Rar5Aes.obj \
$O\RarAes.obj \
$O\WzAes.obj \
$O\ZipCrypto.obj \
$O\ZipStrong.obj \
HASHES_OBJS = \
$O\md2.obj \
$O\md4.obj \
$O\md5.obj \
$O\sha512.obj \
C_OBJS = \
$O\7zBuf2.obj \
$O\7zStream.obj \
$O\Alloc.obj \
$O\Bcj2.obj \
$O\Bcj2Enc.obj \
$O\Blake2s.obj \
$O\Bra.obj \
$O\Bra86.obj \
$O\BraIA64.obj \
$O\BwtSort.obj \
$O\CpuArch.obj \
$O\Delta.obj \
$O\HuffEnc.obj \
$O\LzFind.obj \
$O\LzFindMt.obj \
$O\Lzma2Dec.obj \
$O\Lzma2DecMt.obj \
$O\Lzma2Enc.obj \
$O\LzmaDec.obj \
$O\LzmaEnc.obj \
$O\MtCoder.obj \
$O\MtDec.obj \
$O\Ppmd7.obj \
$O\Ppmd7Dec.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 \
$O\XzDec.obj \
$O\XzEnc.obj \
$O\XzIn.obj \
!include "../../Aes.mak"
!include "../../Crc.mak"
!include "../../Crc64.mak"
!include "../../LzmaDec.mak"

3008
CPP/7zip/Bundles/Format7zFO/Format7z.dsp
View File

File diff suppressed because it is too large Load Diff

29
CPP/7zip/Bundles/Format7zFO/Format7z.dsw
View File

@@ -1,29 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "7z"=.\Format7z.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

3
CPP/7zip/Bundles/Format7zFO/StdAfx.cpp
View File

@@ -1,3 +0,0 @@
// StdAfx.cpp
#include "StdAfx.h"

8
CPP/7zip/Bundles/Format7zFO/StdAfx.h
View File

@@ -1,8 +0,0 @@
// StdAfx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#include "../../../Common/Common.h"
#endif

133
CPP/7zip/Bundles/Format7zFO/makefile
View File

@@ -1,133 +0,0 @@
PROG = 7z.dll
DEF_FILE = ../../Archive/Archive2.def
CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DEXTERNAL_CODECS -DZSTD_LEGACY_SUPPORT -DZSTD_MULTITHREAD
!IFNDEF UNDER_CE
CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -D_7ZIP_LARGE_PAGES
!ENDIF
!include "Arc.mak"
COMPRESS_OBJS = $(COMPRESS_OBJS) \
$O\CodecExports.obj \
AR_OBJS = $(AR_OBJS) \
$O\ArchiveExports.obj \
$O\DllExports2.obj \
COMPRESS_OBJS = $(COMPRESS_OBJS) \
$O\BrotliDecoder.obj \
$O\BrotliEncoder.obj \
$O\BrotliRegister.obj \
$O\Lz4Decoder.obj \
$O\Lz4Encoder.obj \
$O\Lz4Register.obj \
$O\LizardDecoder.obj \
$O\LizardEncoder.obj \
$O\LizardRegister.obj \
$O\Lz5Decoder.obj \
$O\Lz5Encoder.obj \
$O\Lz5Register.obj \
$O\ZstdDecoder.obj \
$O\ZstdEncoder.obj \
$O\ZstdRegister.obj \
$O\FastLzma2Register.obj \
BROTLI_OBJS = \
$O/br_backward_references.obj \
$O/br_backward_references_hq.obj \
$O/br_bit_cost.obj \
$O/br_bit_reader.obj \
$O/br_block_splitter.obj \
$O/br_brotli_bit_stream.obj \
$O/br_cluster.obj \
$O/br_compress_fragment.obj \
$O/br_compress_fragment_two_pass.obj \
$O/br_decode.obj \
$O/br_dictionary.obj \
$O/br_dictionary_hash.obj \
$O/br_encode.obj \
$O/br_encoder_dict.obj \
$O/br_entropy_encode.obj \
$O/br_histogram.obj \
$O/br_huffman.obj \
$O/br_literal_cost.obj \
$O/br_memory.obj \
$O/br_metablock.obj \
$O/br_state.obj \
$O/br_static_dict.obj \
$O/br_transform.obj \
$O/br_utf8_util.obj \
LIZARD_OBJS = \
$O/lizard_compress.obj \
$O/lizard_decompress.obj \
$O/lizard_frame.obj \
LZ4_OBJS = \
$O\lz4.obj \
$O\lz4frame.obj \
$O\lz4hc.obj \
LZ5_OBJS = \
$O\lz5.obj \
$O\lz5frame.obj \
$O\lz5hc.obj \
ZSTD_OBJS = \
$O\debug.obj \
$O\entropy_common.obj \
$O\error_private.obj \
$O\fse_compress.obj \
$O\fse_decompress.obj \
$O\hist.obj \
$O\huf_compress.obj \
$O\huf_decompress.obj \
$O\pool.obj \
$O\threading.obj \
$O\xxhash.obj \
$O\zstd_common.obj \
$O\zstd_compress.obj \
$O\zstd_decompress.obj \
$O\zstd_double_fast.obj \
$O\zstd_fast.obj \
$O\zstd_lazy.obj \
$O\zstd_ldm.obj \
$O\zstdmt_compress.obj \
$O\zstd_opt.obj \
$O\zstd_v01.obj \
$O\zstd_v02.obj \
$O\zstd_v03.obj \
$O\zstd_v04.obj \
$O\zstd_v05.obj \
$O\zstd_v06.obj \
$O\zstd_v07.obj \
ZSTDMT_OBJS = \
$O\brotli-mt_common.obj \
$O\brotli-mt_compress.obj \
$O\brotli-mt_decompress.obj \
$O\lizard-mt_common.obj \
$O\lizard-mt_compress.obj \
$O\lizard-mt_decompress.obj \
$O\lz4-mt_common.obj \
$O\lz4-mt_compress.obj \
$O\lz4-mt_decompress.obj \
$O\lz5-mt_common.obj \
$O\lz5-mt_compress.obj \
$O\lz5-mt_decompress.obj \
$O\zstd-mt_threading.obj \
FASTLZMA2_OBJS = \
$O\fl2_error_private.obj \
$O\fl2pool.obj \
$O\fl2threading.obj \
$O\fl2_common.obj \
$O\fl2_compress.obj \
$O\lzma2_enc.obj \
$O\radix_bitpack.obj \
$O\radix_mf.obj \
$O\radix_struct.obj \
$O\range_enc.obj \
!include "../../7zip.mak"

40
CPP/7zip/Bundles/Format7zFO/resource.rc
View File

@@ -1,40 +0,0 @@
#include "../../MyVersionInfo.rc"
MY_VERSION_INFO_DLL("7z Plugin" , "7z")
0 ICON "../../Archive/Icons/7z.ico"
1 ICON "../../Archive/Icons/zip.ico"
2 ICON "../../Archive/Icons/bz2.ico"
3 ICON "../../Archive/Icons/rar.ico"
4 ICON "../../Archive/Icons/arj.ico"
5 ICON "../../Archive/Icons/z.ico"
6 ICON "../../Archive/Icons/lzh.ico"
7 ICON "../../Archive/Icons/cab.ico"
8 ICON "../../Archive/Icons/iso.ico"
9 ICON "../../Archive/Icons/split.ico"
10 ICON "../../Archive/Icons/rpm.ico"
11 ICON "../../Archive/Icons/deb.ico"
12 ICON "../../Archive/Icons/cpio.ico"
13 ICON "../../Archive/Icons/tar.ico"
14 ICON "../../Archive/Icons/gz.ico"
15 ICON "../../Archive/Icons/wim.ico"
16 ICON "../../Archive/Icons/lzma.ico"
17 ICON "../../Archive/Icons/dmg.ico"
18 ICON "../../Archive/Icons/hfs.ico"
19 ICON "../../Archive/Icons/xar.ico"
20 ICON "../../Archive/Icons/vhd.ico"
21 ICON "../../Archive/Icons/fat.ico"
22 ICON "../../Archive/Icons/ntfs.ico"
23 ICON "../../Archive/Icons/xz.ico"
24 ICON "../../Archive/Icons/squashfs.ico"
25 ICON "../../Archive/Icons/zst.ico"
26 ICON "../../Archive/Icons/lz4.ico"
27 ICON "../../Archive/Icons/lz5.ico"
28 ICON "../../Archive/Icons/liz.ico"
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"
END

3
CPP/7zip/Bundles/Format7zUSB/StdAfx.cpp
View File

@@ -1,3 +0,0 @@
// StdAfx.cpp
#include "StdAfx.h"

8
CPP/7zip/Bundles/Format7zUSB/StdAfx.h
View File

@@ -1,8 +0,0 @@
// StdAfx.h
#ifndef __STDAFX_H
#define __STDAFX_H
#include "../../../Common/Common.h"
#endif

250
CPP/7zip/Bundles/Format7zUSB/makefile
View File

@@ -1,250 +0,0 @@
PROG = 7zu.dll
DEF_FILE = ../../Archive/Archive2.def
CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -DZSTD_MULTITHREAD
COMMON_OBJS = \
$O\CRC.obj \
$O\CrcReg.obj \
$O\IntToString.obj \
$O\NewHandler.obj \
$O\MyString.obj \
$O\Sha256Reg.obj \
$O\StringConvert.obj \
$O\StringToInt.obj \
$O\MyVector.obj \
$O\Wildcard.obj \
WIN_OBJS = \
$O\FileDir.obj \
$O\FileFind.obj \
$O\FileIO.obj \
$O\FileName.obj \
$O\PropVariant.obj \
$O\Synchronization.obj \
$O\System.obj \
7ZIP_COMMON_OBJS = \
$O\CreateCoder.obj \
$O\CWrappers.obj \
$O\InBuffer.obj \
$O\InOutTempBuffer.obj \
$O\FilterCoder.obj \
$O\LimitedStreams.obj \
$O\MethodId.obj \
$O\MethodProps.obj \
$O\OutBuffer.obj \
$O\ProgressUtils.obj \
$O\PropId.obj \
$O\StreamBinder.obj \
$O\StreamObjects.obj \
$O\StreamUtils.obj \
$O\UniqBlocks.obj \
$O\VirtThread.obj \
AR_OBJS = \
$O\ArchiveExports.obj \
$O\DllExports2.obj \
AR_COMMON_OBJS = \
$O\CoderMixer2.obj \
$O\HandlerOut.obj \
$O\InStreamWithCRC.obj \
$O\ItemNameUtils.obj \
$O\OutStreamWithCRC.obj \
$O\ParseProperties.obj \
7Z_OBJS = \
$O\7zCompressionMode.obj \
$O\7zDecode.obj \
$O\7zEncode.obj \
$O\7zExtract.obj \
$O\7zFolderInStream.obj \
$O\7zHandler.obj \
$O\7zHandlerOut.obj \
$O\7zHeader.obj \
$O\7zIn.obj \
$O\7zOut.obj \
$O\7zProperties.obj \
$O\7zSpecStream.obj \
$O\7zUpdate.obj \
$O\7zRegister.obj \
COMPRESS_OBJS = \
$O\CodecExports.obj \
$O\Bcj2Coder.obj \
$O\Bcj2Register.obj \
$O\BcjCoder.obj \
$O\BcjRegister.obj \
$O\BitlDecoder.obj \
$O\BranchMisc.obj \
$O\BranchRegister.obj \
$O\ByteSwap.obj \
$O\BZip2Crc.obj \
$O\BZip2Decoder.obj \
$O\BZip2Encoder.obj \
$O\BZip2Register.obj \
$O\CopyCoder.obj \
$O\CopyRegister.obj \
$O\DeflateDecoder.obj \
$O\DeflateEncoder.obj \
$O\DeflateRegister.obj \
$O\DeltaFilter.obj \
$O\Lzma2Decoder.obj \
$O\Lzma2Encoder.obj \
$O\Lzma2Register.obj \
$O\LzmaDecoder.obj \
$O\LzmaEncoder.obj \
$O\LzmaRegister.obj \
$O\LzOutWindow.obj \
$O\PpmdDecoder.obj \
$O\PpmdEncoder.obj \
$O\PpmdRegister.obj \
CRYPTO_OBJS = \
$O\7zAes.obj \
$O\7zAesRegister.obj \
$O\MyAes.obj \
$O\MyAesReg.obj \
$O\RandGen.obj \
C_OBJS = \
$O\Alloc.obj \
$O\Bcj2.obj \
$O\Bcj2Enc.obj \
$O\Bra.obj \
$O\Bra86.obj \
$O\BraIA64.obj \
$O\BwtSort.obj \
$O\CpuArch.obj \
$O\Delta.obj \
$O\HuffEnc.obj \
$O\LzFind.obj \
$O\LzFindMt.obj \
$O\Lzma2Dec.obj \
$O\Lzma2DecMt.obj \
$O\Lzma2Enc.obj \
$O\LzmaDec.obj \
$O\LzmaEnc.obj \
$O\MtCoder.obj \
$O\MtDec.obj \
$O\Ppmd7.obj \
$O\Ppmd7Dec.obj \
$O\Ppmd7Enc.obj \
$O\Sha256.obj \
$O\Sort.obj \
$O\Threads.obj \
!include "../../Aes.mak"
!include "../../Crc.mak"
COMPRESS_OBJS = $(COMPRESS_OBJS) \
$O\BrotliDecoder.obj \
$O\BrotliEncoder.obj \
$O\BrotliRegister.obj \
$O\Lz4Decoder.obj \
$O\Lz4Encoder.obj \
$O\Lz4Register.obj \
$O\LizardDecoder.obj \
$O\LizardEncoder.obj \
$O\LizardRegister.obj \
$O\Lz5Decoder.obj \
$O\Lz5Encoder.obj \
$O\Lz5Register.obj \
$O\ZstdDecoder.obj \
$O\ZstdEncoder.obj \
$O\ZstdRegister.obj \
$O\FastLzma2Register.obj \
BROTLI_OBJS = \
$O/br_backward_references.obj \
$O/br_backward_references_hq.obj \
$O/br_bit_cost.obj \
$O/br_bit_reader.obj \
$O/br_block_splitter.obj \
$O/br_brotli_bit_stream.obj \
$O/br_cluster.obj \
$O/br_compress_fragment.obj \
$O/br_compress_fragment_two_pass.obj \
$O/br_decode.obj \
$O/br_dictionary.obj \
$O/br_dictionary_hash.obj \
$O/br_encode.obj \
$O/br_encoder_dict.obj \
$O/br_entropy_encode.obj \
$O/br_histogram.obj \
$O/br_huffman.obj \
$O/br_literal_cost.obj \
$O/br_memory.obj \
$O/br_metablock.obj \
$O/br_state.obj \
$O/br_static_dict.obj \
$O/br_transform.obj \
$O/br_utf8_util.obj \
LIZARD_OBJS = \
$O/lizard_compress.obj \
$O/lizard_decompress.obj \
$O/lizard_frame.obj \
LZ4_OBJS = \
$O\lz4.obj \
$O\lz4frame.obj \
$O\lz4hc.obj \
LZ5_OBJS = \
$O\lz5.obj \
$O\lz5frame.obj \
$O\lz5hc.obj \
ZSTD_OBJS = \
$O\debug.obj \
$O\entropy_common.obj \
$O\error_private.obj \
$O\fse_compress.obj \
$O\fse_decompress.obj \
$O\hist.obj \
$O\huf_compress.obj \
$O\huf_decompress.obj \
$O\pool.obj \
$O\threading.obj \
$O\xxhash.obj \
$O\zstd_common.obj \
$O\zstd_compress.obj \
$O\zstd_decompress.obj \
$O\zstd_double_fast.obj \
$O\zstd_fast.obj \
$O\zstd_lazy.obj \
$O\zstd_ldm.obj \
$O\zstdmt_compress.obj \
$O\zstd_opt.obj \
ZSTDMT_OBJS = \
$O\brotli-mt_common.obj \
$O\brotli-mt_compress.obj \
$O\brotli-mt_decompress.obj \
$O\lizard-mt_common.obj \
$O\lizard-mt_compress.obj \
$O\lizard-mt_decompress.obj \
$O\lz4-mt_common.obj \
$O\lz4-mt_compress.obj \
$O\lz4-mt_decompress.obj \
$O\lz5-mt_common.obj \
$O\lz5-mt_compress.obj \
$O\lz5-mt_decompress.obj \
$O\zstd-mt_threading.obj \
FASTLZMA2_OBJS = \
$O\fl2_error_private.obj \
$O\fl2pool.obj \
$O\fl2threading.obj \
$O\fl2_common.obj \
$O\fl2_compress.obj \
$O\lzma2_enc.obj \
$O\radix_bitpack.obj \
$O\radix_mf.obj \
$O\radix_struct.obj \
$O\range_enc.obj \
!include "../../7zip.mak"

5
CPP/7zip/Bundles/Format7zUSB/resource.rc
View File

@@ -1,5 +0,0 @@
#include "../../MyVersionInfo.rc"
MY_VERSION_INFO_DLL("7z Standalone Plugin", "7za")
101 ICON "../../Archive/Icons/7z.ico"

7
CPP/7zip/IDecl.h
View File

@@ -6,15 +6,10 @@
#include "../Common/MyUnknown.h"
#define k_7zip_GUID_Data1 0x23170F69
#ifdef NEED_7ZIP_GUID
#define k_7zip_GUID_Data2 0x40C1
#else
#define k_7zip_GUID_Data2 0x0803
#endif
#define k_7zip_GUID_Data2_ZS 0x20BB
#define k_7zip_GUID_Data3_Common 0x278A
#define k_7zip_GUID_Data3_Decoder 0x2790
#define k_7zip_GUID_Data3_Encoder 0x2791
#define k_7zip_GUID_Data3_Hasher 0x2792

2
CPP/7zip/UI/Client7z/Client7z.cpp
View File

@@ -33,7 +33,7 @@ HINSTANCE g_hInstance = 0;
// Tou can find the list of all GUIDs in Guid.txt file.
// use another CLSIDs, if you want to support other formats (zip, rar, ...).
// {23170F69-0803-278A-1000-000110070000}
// {23170F69-40C1-278A-1000-000110070000}
DEFINE_GUID(CLSID_CFormat7z,
0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x07, 0x00, 0x00);

12
CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
View File

@@ -25,21 +25,17 @@
#include "ContextMenu.h"
static LPCTSTR const k_ShellExtName = TEXT("7-Zip-Zstandard Shell Extension");
static LPCTSTR const k_ShellExtName = TEXT("7-Zip ZS Shell Extension");
static LPCTSTR const k_Approved = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved");
// {23170F69-40C1-278A-1000-000100020000}
#ifdef NEED_7ZIP_GUID
static LPCTSTR const k_Clsid = TEXT("{23170F69-40C1-278A-1000-000100020001}");
#else
static LPCTSTR const k_Clsid = TEXT("{23170F69-0803-278A-1000-000100020001}");
#endif
static LPCTSTR const k_Clsid = TEXT("{23170F69-20BB-278A-1000-000100020000}");
DEFINE_GUID(CLSID_CZipContextMenu,
k_7zip_GUID_Data1,
k_7zip_GUID_Data2,
k_7zip_GUID_Data2_ZS,
k_7zip_GUID_Data3_Common,
0x10, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01);
0x10, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00);
using namespace NWindows;

4
CPP/7zip/UI/Explorer/RegistryContextMenu.cpp
View File

@@ -17,10 +17,10 @@ using namespace NRegistry;
// CLISID (and Approved ?) items are separated for 32-bit and 64-bit code.
// shellex items shared by 32-bit and 64-bit code?
#define k_Clsid_A "{23170F69-0803-278A-1000-000100020001}"
#define k_Clsid_A "{23170F69-20BB-278A-1000-000100020000}"
static LPCTSTR const k_Clsid = TEXT(k_Clsid_A);
static LPCTSTR const k_ShellExtName = TEXT("7-Zip Shell Extension");
static LPCTSTR const k_ShellExtName = TEXT("7-Zip ZS Shell Extension");
static LPCTSTR const k_Approved = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved");
static LPCTSTR const k_Inproc = TEXT("InprocServer32");

12
CPP/build-ia64.cmd
View File

@@ -22,16 +22,6 @@ nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error ia64 @ 7z.dll" >> %ERRFILE%
copy IA64\7z.dll %OUTDIR%\7z.dll
cd %ROOT%\Bundles\Format7zFO
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zOrig.dll" >> %ERRFILE%
copy IA64\7z.dll %OUTDIR%\7zOrig.dll
cd %ROOT%\Bundles\Format7zUSB
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zUSB.dll" >> %ERRFILE%
copy IA64\7zu.dll %OUTDIR%\7zu-x64.dll
cd %ROOT%\UI\FileManager
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zFM.exe" >> %ERRFILE%
@@ -72,7 +62,7 @@ nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error ia64 @ lz5-x64.dll" >> %ERRFILE%
copy IA64\lz5.dll %OUTDIR%\lz5-x64.dll
cd %ROOT%\Bundles\Codec_zstdF
cd %ROOT%\Bundles\Codec_zstd
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error ia64 @ zstd-x64.dll" >> %ERRFILE%
copy IA64\zstd.dll %OUTDIR%\zstd-x64.dll

12
CPP/build-x32.cmd
View File

@@ -23,16 +23,6 @@ nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x32 @ 7z.dll" >> %ERRFILE%
copy O\7z.dll %OUTDIR%\7z.dll
cd %ROOT%\Bundles\Format7zFO
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x32 @ 7zOrig.dll" >> %ERRFILE%
copy O\7z.dll %OUTDIR%\7zOrig.dll
cd %ROOT%\Bundles\Format7zUSB
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x32 @ 7zUSB.dll" >> %ERRFILE%
copy O\7zu.dll %OUTDIR%\7zu-x32.dll
cd %ROOT%\UI\FileManager
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x32 @ 7zFM.exe" >> %ERRFILE%
@@ -73,7 +63,7 @@ nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x32 @ lz5-x32.dll" >> %ERRFILE%
copy O\lz5.dll %OUTDIR%\lz5-x32.dll
cd %ROOT%\Bundles\Codec_zstdF
cd %ROOT%\Bundles\Codec_zstd
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x32 @ zstd-x32.dll" >> %ERRFILE%
copy O\zstd.dll %OUTDIR%\zstd-x32.dll

12
CPP/build-x64.cmd
View File

@@ -23,16 +23,6 @@ nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> %ERRFILE%
copy AMD64\7z.dll %OUTDIR%\7z.dll
cd %ROOT%\Bundles\Format7zFO
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7zOrig.dll" >> %ERRFILE%
copy AMD64\7z.dll %OUTDIR%\7zOrig.dll
cd %ROOT%\Bundles\Format7zUSB
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7zUSB.dll" >> %ERRFILE%
copy AMD64\7zu.dll %OUTDIR%\7zu-x64.dll
cd %ROOT%\UI\FileManager
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> %ERRFILE%
@@ -73,7 +63,7 @@ nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ lz5-x64.dll" >> %ERRFILE%
copy AMD64\lz5.dll %OUTDIR%\lz5-x64.dll
cd %ROOT%\Bundles\Codec_zstdF
cd %ROOT%\Bundles\Codec_zstd
nmake %OPTS%
IF %errorlevel% NEQ 0 echo "Error x64 @ zstd-x64.dll" >> %ERRFILE%
copy AMD64\zstd.dll %OUTDIR%\zstd-x64.dll