mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-11 06:07:12 -06:00
23.01
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
// Compress/BZip2Decoder.h
|
||||
|
||||
#ifndef __COMPRESS_BZIP2_DECODER_H
|
||||
#define __COMPRESS_BZIP2_DECODER_H
|
||||
#ifndef ZIP7_INC_COMPRESS_BZIP2_DECODER_H
|
||||
#define ZIP7_INC_COMPRESS_BZIP2_DECODER_H
|
||||
|
||||
#include "../../Common/MyCom.h"
|
||||
|
||||
// #define NO_READ_FROM_CODER
|
||||
// #define _7ZIP_ST
|
||||
// #define Z7_NO_READ_FROM_CODER
|
||||
// #define Z7_ST
|
||||
|
||||
#ifndef _7ZIP_ST
|
||||
#ifndef Z7_ST
|
||||
#include "../../Windows/Synchronization.h"
|
||||
#include "../../Windows/Thread.h"
|
||||
#endif
|
||||
@@ -134,7 +134,7 @@ public:
|
||||
|
||||
ISequentialInStream *InStream;
|
||||
|
||||
#ifndef NO_READ_FROM_CODER
|
||||
#ifndef Z7_NO_READ_FROM_CODER
|
||||
CMyComPtr<ISequentialInStream> InStreamRef;
|
||||
#endif
|
||||
|
||||
@@ -194,24 +194,51 @@ public:
|
||||
|
||||
|
||||
|
||||
class CDecoder :
|
||||
class CDecoder:
|
||||
public ICompressCoder,
|
||||
public ICompressSetFinishMode,
|
||||
public ICompressGetInStreamProcessedSize,
|
||||
public ICompressReadUnusedFromInBuf,
|
||||
|
||||
#ifndef NO_READ_FROM_CODER
|
||||
#ifndef Z7_NO_READ_FROM_CODER
|
||||
public ICompressSetInStream,
|
||||
public ICompressSetOutStreamSize,
|
||||
public ISequentialInStream,
|
||||
#endif
|
||||
|
||||
#ifndef _7ZIP_ST
|
||||
#endif
|
||||
#ifndef Z7_ST
|
||||
public ICompressSetCoderMt,
|
||||
#endif
|
||||
|
||||
#endif
|
||||
public CMyUnknownImp
|
||||
{
|
||||
Z7_COM_QI_BEGIN2(ICompressCoder)
|
||||
Z7_COM_QI_ENTRY(ICompressSetFinishMode)
|
||||
Z7_COM_QI_ENTRY(ICompressGetInStreamProcessedSize)
|
||||
Z7_COM_QI_ENTRY(ICompressReadUnusedFromInBuf)
|
||||
#ifndef Z7_NO_READ_FROM_CODER
|
||||
Z7_COM_QI_ENTRY(ICompressSetInStream)
|
||||
Z7_COM_QI_ENTRY(ICompressSetOutStreamSize)
|
||||
Z7_COM_QI_ENTRY(ISequentialInStream)
|
||||
#endif
|
||||
#ifndef Z7_ST
|
||||
Z7_COM_QI_ENTRY(ICompressSetCoderMt)
|
||||
#endif
|
||||
Z7_COM_QI_END
|
||||
Z7_COM_ADDREF_RELEASE
|
||||
|
||||
Z7_IFACE_COM7_IMP(ICompressCoder)
|
||||
Z7_IFACE_COM7_IMP(ICompressSetFinishMode)
|
||||
Z7_IFACE_COM7_IMP(ICompressGetInStreamProcessedSize)
|
||||
Z7_IFACE_COM7_IMP(ICompressReadUnusedFromInBuf)
|
||||
#ifndef Z7_NO_READ_FROM_CODER
|
||||
Z7_IFACE_COM7_IMP(ICompressSetInStream)
|
||||
Z7_IFACE_COM7_IMP(ICompressSetOutStreamSize)
|
||||
Z7_IFACE_COM7_IMP_NONFINAL(ISequentialInStream)
|
||||
#endif
|
||||
public:
|
||||
#ifndef Z7_ST
|
||||
Z7_IFACE_COM7_IMP(ICompressSetCoderMt)
|
||||
#endif
|
||||
|
||||
private:
|
||||
Byte *_outBuf;
|
||||
size_t _outPos;
|
||||
UInt64 _outWritten;
|
||||
@@ -235,7 +262,7 @@ public:
|
||||
CSpecState _spec;
|
||||
UInt32 *_counters;
|
||||
|
||||
#ifndef _7ZIP_ST
|
||||
#ifndef Z7_ST
|
||||
|
||||
struct CBlock
|
||||
{
|
||||
@@ -339,60 +366,20 @@ public:
|
||||
HRESULT DecodeBlock(const CBlockProps &props);
|
||||
HRESULT DecodeStreams(ICompressProgressInfo *progress);
|
||||
|
||||
MY_QUERYINTERFACE_BEGIN2(ICompressCoder)
|
||||
MY_QUERYINTERFACE_ENTRY(ICompressSetFinishMode)
|
||||
MY_QUERYINTERFACE_ENTRY(ICompressGetInStreamProcessedSize)
|
||||
MY_QUERYINTERFACE_ENTRY(ICompressReadUnusedFromInBuf)
|
||||
|
||||
#ifndef NO_READ_FROM_CODER
|
||||
MY_QUERYINTERFACE_ENTRY(ICompressSetInStream)
|
||||
MY_QUERYINTERFACE_ENTRY(ICompressSetOutStreamSize)
|
||||
MY_QUERYINTERFACE_ENTRY(ISequentialInStream)
|
||||
#endif
|
||||
|
||||
#ifndef _7ZIP_ST
|
||||
MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt)
|
||||
#endif
|
||||
|
||||
MY_QUERYINTERFACE_END
|
||||
MY_ADDREF_RELEASE
|
||||
|
||||
|
||||
STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
|
||||
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
|
||||
|
||||
STDMETHOD(SetFinishMode)(UInt32 finishMode);
|
||||
STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);
|
||||
STDMETHOD(ReadUnusedFromInBuf)(void *data, UInt32 size, UInt32 *processedSize);
|
||||
|
||||
UInt64 GetNumStreams() const { return Base.NumStreams; }
|
||||
UInt64 GetNumBlocks() const { return Base.NumBlocks; }
|
||||
|
||||
#ifndef NO_READ_FROM_CODER
|
||||
|
||||
STDMETHOD(SetInStream)(ISequentialInStream *inStream);
|
||||
STDMETHOD(ReleaseInStream)();
|
||||
STDMETHOD(SetOutStreamSize)(const UInt64 *outSize);
|
||||
STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _7ZIP_ST
|
||||
STDMETHOD(SetNumberOfThreads)(UInt32 numThreads);
|
||||
#endif
|
||||
|
||||
CDecoder();
|
||||
~CDecoder();
|
||||
virtual ~CDecoder();
|
||||
};
|
||||
|
||||
|
||||
|
||||
#ifndef NO_READ_FROM_CODER
|
||||
#ifndef Z7_NO_READ_FROM_CODER
|
||||
|
||||
class CNsisDecoder : public CDecoder
|
||||
class CNsisDecoder Z7_final: public CDecoder
|
||||
{
|
||||
public:
|
||||
STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
|
||||
Z7_IFACE_COM7_IMP(ISequentialInStream)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user