mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-11 12:07:12 -06:00
Update to 7-Zip Version 21.02
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
// PpmdDecoder.h
|
||||
// 2009-03-11 : Igor Pavlov : Public domain
|
||||
// 2020-07-03 : Igor Pavlov : Public domain
|
||||
|
||||
#ifndef __COMPRESS_PPMD_DECODER_H
|
||||
#define __COMPRESS_PPMD_DECODER_H
|
||||
@@ -8,16 +8,17 @@
|
||||
|
||||
#include "../../Common/MyCom.h"
|
||||
|
||||
#include "../Common/CWrappers.h"
|
||||
|
||||
#include "../ICoder.h"
|
||||
|
||||
#include "../Common/CWrappers.h"
|
||||
|
||||
namespace NCompress {
|
||||
namespace NPpmd {
|
||||
|
||||
class CDecoder :
|
||||
public ICompressCoder,
|
||||
public ICompressSetDecoderProperties2,
|
||||
public ICompressSetFinishMode,
|
||||
public ICompressGetInStreamProcessedSize,
|
||||
#ifndef NO_READ_FROM_CODER
|
||||
public ICompressSetInStream,
|
||||
@@ -27,12 +28,13 @@ class CDecoder :
|
||||
public CMyUnknownImp
|
||||
{
|
||||
Byte *_outBuf;
|
||||
CPpmd7z_RangeDec _rangeDec;
|
||||
CByteInBufWrap _inStream;
|
||||
CPpmd7 _ppmd;
|
||||
|
||||
Byte _order;
|
||||
bool FinishStream;
|
||||
bool _outSizeDefined;
|
||||
HRESULT _res;
|
||||
int _status;
|
||||
UInt64 _outSize;
|
||||
UInt64 _processedSize;
|
||||
@@ -47,7 +49,7 @@ public:
|
||||
|
||||
MY_QUERYINTERFACE_BEGIN2(ICompressCoder)
|
||||
MY_QUERYINTERFACE_ENTRY(ICompressSetDecoderProperties2)
|
||||
// MY_QUERYINTERFACE_ENTRY(ICompressSetFinishMode)
|
||||
MY_QUERYINTERFACE_ENTRY(ICompressSetFinishMode)
|
||||
MY_QUERYINTERFACE_ENTRY(ICompressGetInStreamProcessedSize)
|
||||
#ifndef NO_READ_FROM_CODER
|
||||
MY_QUERYINTERFACE_ENTRY(ICompressSetInStream)
|
||||
@@ -61,6 +63,7 @@ public:
|
||||
STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
|
||||
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
|
||||
STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);
|
||||
STDMETHOD(SetFinishMode)(UInt32 finishMode);
|
||||
STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);
|
||||
|
||||
STDMETHOD(SetOutStreamSize)(const UInt64 *outSize);
|
||||
@@ -71,11 +74,13 @@ public:
|
||||
STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
|
||||
#endif
|
||||
|
||||
CDecoder(): _outBuf(NULL), _outSizeDefined(false)
|
||||
CDecoder():
|
||||
_outBuf(NULL),
|
||||
FinishStream(false),
|
||||
_outSizeDefined(false)
|
||||
{
|
||||
Ppmd7z_RangeDec_CreateVTable(&_rangeDec);
|
||||
_rangeDec.Stream = &_inStream.vt;
|
||||
Ppmd7_Construct(&_ppmd);
|
||||
_ppmd.rc.dec.Stream = &_inStream.vt;
|
||||
}
|
||||
|
||||
~CDecoder();
|
||||
|
||||
Reference in New Issue
Block a user