mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-14 18:11:41 -06:00
Update to 7-Zip 17.00 Beta
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
#include "../../Common/FilterCoder.h"
|
||||
#include "../../Common/StreamUtils.h"
|
||||
|
||||
#include "../../Compress/BZip2Decoder.h"
|
||||
#include "../../Compress/DeflateDecoder.h"
|
||||
#include "../../Compress/LzmaDecoder.h"
|
||||
|
||||
@@ -38,6 +39,7 @@ class CDecoder
|
||||
CMyComPtr<ISequentialInStream> _codecInStream;
|
||||
CMyComPtr<ISequentialInStream> _decoderInStream;
|
||||
|
||||
NCompress::NBZip2::CNsisDecoder *_bzDecoder;
|
||||
NCompress::NDeflate::NDecoder::CCOMCoder *_deflateDecoder;
|
||||
NCompress::NLzma::CDecoder *_lzmaDecoder;
|
||||
|
||||
@@ -50,13 +52,17 @@ public:
|
||||
bool Solid;
|
||||
bool IsNsisDeflate;
|
||||
|
||||
CByteBuffer Buffer; // temp buf.
|
||||
CByteBuffer Buffer; // temp buf
|
||||
|
||||
CDecoder():
|
||||
FilterFlag(false),
|
||||
Solid(true),
|
||||
IsNsisDeflate(true)
|
||||
{}
|
||||
{
|
||||
_bzDecoder = NULL;
|
||||
_deflateDecoder = NULL;
|
||||
_lzmaDecoder = NULL;
|
||||
}
|
||||
|
||||
void Release()
|
||||
{
|
||||
@@ -64,10 +70,16 @@ public:
|
||||
_codecInStream.Release();
|
||||
_decoderInStream.Release();
|
||||
InputStream.Release();
|
||||
|
||||
_bzDecoder = NULL;
|
||||
_deflateDecoder = NULL;
|
||||
_lzmaDecoder = NULL;
|
||||
}
|
||||
|
||||
UInt64 GetInputProcessedSize() const;
|
||||
|
||||
HRESULT Init(ISequentialInStream *inStream, bool &useFilter);
|
||||
|
||||
HRESULT Read(void *data, size_t *processedSize)
|
||||
{
|
||||
return ReadStream(_decoderInStream, data, processedSize);;
|
||||
|
||||
Reference in New Issue
Block a user