mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-10 08:07:09 -06:00
ef790b5209
- Minor speed optimization for LZMA2 (xz and 7z) multi-threading compression.
7-Zip now uses additional memory buffers for multi-block LZMA2 compression.
CPU utilization was slightly improved.
- 7-zip now creates multi-block xz archives by default. Block size can be
specified with -ms[Size]{m|g} switch.
- xz decoder now can unpack random block from multi-block xz archives. 7-Zip
File Manager now can open nested multi-block xz archives (for example,
image.iso.xz) without full unpacking of xz archive.
- 7-Zip now can create zip archives from stdin to stdout.
- 7-Zip command line: @listfile now doesn't work after -- switch. Use
-i@listfile before -- switch instead.
fixed bugs:
- 7-Zip could add unrequired alternate file streams to WIM archives, for
commands that contain filename wildcards and -sns switch.
- 7-Zip 17.00 beta crashed for commands that write anti-item to 7z archive.
- 7-Zip 17.00 beta ignored "Use large memory pages" option.
70 lines
1.6 KiB
C++
70 lines
1.6 KiB
C++
// ZipAddCommon.h
|
|
|
|
#ifndef __ZIP_ADD_COMMON_H
|
|
#define __ZIP_ADD_COMMON_H
|
|
|
|
#include "../../ICoder.h"
|
|
#include "../../IProgress.h"
|
|
|
|
#include "../../Common/CreateCoder.h"
|
|
#include "../../Common/FilterCoder.h"
|
|
|
|
#include "../../Compress/CopyCoder.h"
|
|
|
|
#include "../../Crypto/ZipCrypto.h"
|
|
#include "../../Crypto/WzAes.h"
|
|
|
|
#include "ZipCompressionMode.h"
|
|
|
|
namespace NArchive {
|
|
namespace NZip {
|
|
|
|
struct CCompressingResult
|
|
{
|
|
UInt64 UnpackSize;
|
|
UInt64 PackSize;
|
|
UInt32 CRC;
|
|
UInt16 Method;
|
|
Byte ExtractVersion;
|
|
bool DescriptorMode;
|
|
bool LzmaEos;
|
|
};
|
|
|
|
class CAddCommon
|
|
{
|
|
CCompressionMethodMode _options;
|
|
NCompress::CCopyCoder *_copyCoderSpec;
|
|
CMyComPtr<ICompressCoder> _copyCoder;
|
|
|
|
CMyComPtr<ICompressCoder> _compressEncoder;
|
|
Byte _compressExtractVersion;
|
|
bool _isLzmaEos;
|
|
|
|
CFilterCoder *_cryptoStreamSpec;
|
|
CMyComPtr<ISequentialOutStream> _cryptoStream;
|
|
|
|
NCrypto::NZip::CEncoder *_filterSpec;
|
|
NCrypto::NWzAes::CEncoder *_filterAesSpec;
|
|
|
|
Byte *_buf;
|
|
|
|
HRESULT CalcStreamCRC(ISequentialInStream *inStream, UInt32 &resultCRC);
|
|
public:
|
|
CAddCommon(const CCompressionMethodMode &options);
|
|
~CAddCommon();
|
|
|
|
HRESULT Set_Pre_CompressionResult(bool inSeqMode, bool outSeqMode, UInt64 unpackSize,
|
|
CCompressingResult &opRes) const;
|
|
|
|
HRESULT Compress(
|
|
DECL_EXTERNAL_CODECS_LOC_VARS
|
|
ISequentialInStream *inStream, IOutStream *outStream,
|
|
bool inSeqMode, bool outSeqMode,
|
|
UInt32 fileTime, UInt64 expectedDataSize,
|
|
ICompressProgressInfo *progress, CCompressingResult &opRes);
|
|
};
|
|
|
|
}}
|
|
|
|
#endif
|