From 6b66e6b057f227aa3b450a7af3fcb7b0d0c4c0ca Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Fri, 2 Jun 2017 23:26:18 +0200 Subject: [PATCH] fix: add correct smybols for CoderMt - decompressing with -mmt will correctly applied now --- CPP/7zip/Compress/BrotliDecoder.h | 4 +++- CPP/7zip/Compress/BrotliEncoder.h | 11 +++++++++-- CPP/7zip/Compress/LizardDecoder.h | 4 +++- CPP/7zip/Compress/LizardEncoder.h | 11 +++++++++-- CPP/7zip/Compress/Lz4Decoder.h | 4 +++- CPP/7zip/Compress/Lz4Encoder.h | 11 +++++++++-- CPP/7zip/Compress/Lz5Decoder.h | 4 +++- CPP/7zip/Compress/Lz5Encoder.h | 11 +++++++++-- CPP/7zip/Compress/ZstdDecoder.h | 4 +++- CPP/7zip/Compress/ZstdEncoder.h | 11 +++++++++-- 10 files changed, 60 insertions(+), 15 deletions(-) diff --git a/CPP/7zip/Compress/BrotliDecoder.h b/CPP/7zip/Compress/BrotliDecoder.h index 6ee853ef..7ab6f933 100644 --- a/CPP/7zip/Compress/BrotliDecoder.h +++ b/CPP/7zip/Compress/BrotliDecoder.h @@ -48,6 +48,7 @@ struct DProps class CDecoder:public ICompressCoder, public ICompressSetDecoderProperties2, + public ICompressSetCoderMt, public CMyUnknownImp { CMyComPtr < ISequentialInStream > _inStream; @@ -71,13 +72,14 @@ public: #ifndef NO_READ_FROM_CODER MY_QUERYINTERFACE_ENTRY(ICompressSetInStream) #endif + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt) MY_QUERYINTERFACE_END MY_ADDREF_RELEASE STDMETHOD (Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); STDMETHOD (SetDecoderProperties2)(const Byte *data, UInt32 size); STDMETHOD (SetOutStreamSize)(const UInt64 *outSize); - STDMETHODIMP CDecoder::SetNumberOfThreads(UInt32 numThreads); + STDMETHOD (SetNumberOfThreads)(UInt32 numThreads); #ifndef NO_READ_FROM_CODER STDMETHOD (SetInStream)(ISequentialInStream *inStream); diff --git a/CPP/7zip/Compress/BrotliEncoder.h b/CPP/7zip/Compress/BrotliEncoder.h index ec183bcd..6a282ef2 100644 --- a/CPP/7zip/Compress/BrotliEncoder.h +++ b/CPP/7zip/Compress/BrotliEncoder.h @@ -33,6 +33,7 @@ struct CProps class CEncoder: public ICompressCoder, + public ICompressSetCoderMt, public ICompressSetCoderProperties, public ICompressWriteCoderProperties, public CMyUnknownImp @@ -48,11 +49,17 @@ class CEncoder: HRESULT CEncoder::ErrorOut(size_t code); public: - MY_UNKNOWN_IMP2 (ICompressSetCoderProperties, ICompressWriteCoderProperties) + MY_QUERYINTERFACE_BEGIN2(ICompressCoder) + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt) + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderProperties) + MY_QUERYINTERFACE_ENTRY(ICompressWriteCoderProperties) + MY_QUERYINTERFACE_END + MY_ADDREF_RELEASE + STDMETHOD (Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); STDMETHOD (SetCoderProperties)(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps); STDMETHOD (WriteCoderProperties)(ISequentialOutStream *outStream); - STDMETHODIMP CEncoder::SetNumberOfThreads(UInt32 numThreads); + STDMETHOD (SetNumberOfThreads)(UInt32 numThreads); CEncoder(); virtual ~CEncoder(); diff --git a/CPP/7zip/Compress/LizardDecoder.h b/CPP/7zip/Compress/LizardDecoder.h index 2fbba01c..ae6efdc5 100644 --- a/CPP/7zip/Compress/LizardDecoder.h +++ b/CPP/7zip/Compress/LizardDecoder.h @@ -50,6 +50,7 @@ struct DProps class CDecoder:public ICompressCoder, public ICompressSetDecoderProperties2, + public ICompressSetCoderMt, public CMyUnknownImp { CMyComPtr < ISequentialInStream > _inStream; @@ -73,13 +74,14 @@ public: #ifndef NO_READ_FROM_CODER MY_QUERYINTERFACE_ENTRY(ICompressSetInStream) #endif + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt) MY_QUERYINTERFACE_END MY_ADDREF_RELEASE STDMETHOD (Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); STDMETHOD (SetDecoderProperties2)(const Byte *data, UInt32 size); STDMETHOD (SetOutStreamSize)(const UInt64 *outSize); - STDMETHODIMP CDecoder::SetNumberOfThreads(UInt32 numThreads); + STDMETHOD (SetNumberOfThreads)(UInt32 numThreads); #ifndef NO_READ_FROM_CODER STDMETHOD (SetInStream)(ISequentialInStream *inStream); diff --git a/CPP/7zip/Compress/LizardEncoder.h b/CPP/7zip/Compress/LizardEncoder.h index 3b6126b4..431a4e6a 100644 --- a/CPP/7zip/Compress/LizardEncoder.h +++ b/CPP/7zip/Compress/LizardEncoder.h @@ -34,6 +34,7 @@ struct CProps class CEncoder: public ICompressCoder, + public ICompressSetCoderMt, public ICompressSetCoderProperties, public ICompressWriteCoderProperties, public CMyUnknownImp @@ -49,11 +50,17 @@ class CEncoder: HRESULT CEncoder::ErrorOut(size_t code); public: - MY_UNKNOWN_IMP2 (ICompressSetCoderProperties, ICompressWriteCoderProperties) + MY_QUERYINTERFACE_BEGIN2(ICompressCoder) + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt) + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderProperties) + MY_QUERYINTERFACE_ENTRY(ICompressWriteCoderProperties) + MY_QUERYINTERFACE_END + MY_ADDREF_RELEASE + STDMETHOD (Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); STDMETHOD (SetCoderProperties)(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps); STDMETHOD (WriteCoderProperties)(ISequentialOutStream *outStream); - STDMETHODIMP CEncoder::SetNumberOfThreads(UInt32 numThreads); + STDMETHOD (SetNumberOfThreads)(UInt32 numThreads); CEncoder(); virtual ~CEncoder(); diff --git a/CPP/7zip/Compress/Lz4Decoder.h b/CPP/7zip/Compress/Lz4Decoder.h index 75c06080..484b924c 100644 --- a/CPP/7zip/Compress/Lz4Decoder.h +++ b/CPP/7zip/Compress/Lz4Decoder.h @@ -49,6 +49,7 @@ struct DProps class CDecoder:public ICompressCoder, public ICompressSetDecoderProperties2, + public ICompressSetCoderMt, public CMyUnknownImp { CMyComPtr < ISequentialInStream > _inStream; @@ -72,13 +73,14 @@ public: #ifndef NO_READ_FROM_CODER MY_QUERYINTERFACE_ENTRY(ICompressSetInStream) #endif + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt) MY_QUERYINTERFACE_END MY_ADDREF_RELEASE STDMETHOD (Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); STDMETHOD (SetDecoderProperties2)(const Byte *data, UInt32 size); STDMETHOD (SetOutStreamSize)(const UInt64 *outSize); - STDMETHODIMP CDecoder::SetNumberOfThreads(UInt32 numThreads); + STDMETHOD (SetNumberOfThreads)(UInt32 numThreads); #ifndef NO_READ_FROM_CODER STDMETHOD (SetInStream)(ISequentialInStream *inStream); diff --git a/CPP/7zip/Compress/Lz4Encoder.h b/CPP/7zip/Compress/Lz4Encoder.h index b7f4c314..930e128f 100644 --- a/CPP/7zip/Compress/Lz4Encoder.h +++ b/CPP/7zip/Compress/Lz4Encoder.h @@ -34,6 +34,7 @@ struct CProps class CEncoder: public ICompressCoder, + public ICompressSetCoderMt, public ICompressSetCoderProperties, public ICompressWriteCoderProperties, public CMyUnknownImp @@ -49,11 +50,17 @@ class CEncoder: HRESULT CEncoder::ErrorOut(size_t code); public: - MY_UNKNOWN_IMP2 (ICompressSetCoderProperties, ICompressWriteCoderProperties) + MY_QUERYINTERFACE_BEGIN2(ICompressCoder) + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt) + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderProperties) + MY_QUERYINTERFACE_ENTRY(ICompressWriteCoderProperties) + MY_QUERYINTERFACE_END + MY_ADDREF_RELEASE + STDMETHOD (Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); STDMETHOD (SetCoderProperties)(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps); STDMETHOD (WriteCoderProperties)(ISequentialOutStream *outStream); - STDMETHODIMP CEncoder::SetNumberOfThreads(UInt32 numThreads); + STDMETHOD (SetNumberOfThreads)(UInt32 numThreads); CEncoder(); virtual ~CEncoder(); diff --git a/CPP/7zip/Compress/Lz5Decoder.h b/CPP/7zip/Compress/Lz5Decoder.h index 8e3e15b1..3574fffe 100644 --- a/CPP/7zip/Compress/Lz5Decoder.h +++ b/CPP/7zip/Compress/Lz5Decoder.h @@ -49,6 +49,7 @@ struct DProps class CDecoder:public ICompressCoder, public ICompressSetDecoderProperties2, + public ICompressSetCoderMt, public CMyUnknownImp { CMyComPtr < ISequentialInStream > _inStream; @@ -72,13 +73,14 @@ public: #ifndef NO_READ_FROM_CODER MY_QUERYINTERFACE_ENTRY(ICompressSetInStream) #endif + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt) MY_QUERYINTERFACE_END MY_ADDREF_RELEASE STDMETHOD (Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); STDMETHOD (SetDecoderProperties2)(const Byte *data, UInt32 size); STDMETHOD (SetOutStreamSize)(const UInt64 *outSize); - STDMETHODIMP CDecoder::SetNumberOfThreads(UInt32 numThreads); + STDMETHOD (SetNumberOfThreads)(UInt32 numThreads); #ifndef NO_READ_FROM_CODER STDMETHOD (SetInStream)(ISequentialInStream *inStream); diff --git a/CPP/7zip/Compress/Lz5Encoder.h b/CPP/7zip/Compress/Lz5Encoder.h index 581f0870..84d8120f 100644 --- a/CPP/7zip/Compress/Lz5Encoder.h +++ b/CPP/7zip/Compress/Lz5Encoder.h @@ -34,6 +34,7 @@ struct CProps class CEncoder: public ICompressCoder, + public ICompressSetCoderMt, public ICompressSetCoderProperties, public ICompressWriteCoderProperties, public CMyUnknownImp @@ -49,11 +50,17 @@ class CEncoder: HRESULT CEncoder::ErrorOut(size_t code); public: - MY_UNKNOWN_IMP2 (ICompressSetCoderProperties, ICompressWriteCoderProperties) + MY_QUERYINTERFACE_BEGIN2(ICompressCoder) + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt) + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderProperties) + MY_QUERYINTERFACE_ENTRY(ICompressWriteCoderProperties) + MY_QUERYINTERFACE_END + MY_ADDREF_RELEASE + STDMETHOD (Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); STDMETHOD (SetCoderProperties)(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps); STDMETHOD (WriteCoderProperties)(ISequentialOutStream *outStream); - STDMETHODIMP CEncoder::SetNumberOfThreads(UInt32 numThreads); + STDMETHOD (SetNumberOfThreads)(UInt32 numThreads); CEncoder(); virtual ~CEncoder(); diff --git a/CPP/7zip/Compress/ZstdDecoder.h b/CPP/7zip/Compress/ZstdDecoder.h index 93c428e0..bf65f7ec 100644 --- a/CPP/7zip/Compress/ZstdDecoder.h +++ b/CPP/7zip/Compress/ZstdDecoder.h @@ -49,6 +49,7 @@ struct DProps class CDecoder:public ICompressCoder, public ICompressSetDecoderProperties2, + public ICompressSetCoderMt, public CMyUnknownImp { CMyComPtr < ISequentialInStream > _inStream; @@ -72,13 +73,14 @@ public: #ifndef NO_READ_FROM_CODER MY_QUERYINTERFACE_ENTRY(ICompressSetInStream) #endif + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt) MY_QUERYINTERFACE_END MY_ADDREF_RELEASE STDMETHOD (Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); STDMETHOD (SetDecoderProperties2)(const Byte *data, UInt32 size); STDMETHOD (SetOutStreamSize)(const UInt64 *outSize); - STDMETHODIMP CDecoder::SetNumberOfThreads(UInt32 numThreads); + STDMETHOD (SetNumberOfThreads)(UInt32 numThreads); #ifndef NO_READ_FROM_CODER STDMETHOD (SetInStream)(ISequentialInStream *inStream); diff --git a/CPP/7zip/Compress/ZstdEncoder.h b/CPP/7zip/Compress/ZstdEncoder.h index e589a63e..5733cd3f 100644 --- a/CPP/7zip/Compress/ZstdEncoder.h +++ b/CPP/7zip/Compress/ZstdEncoder.h @@ -34,6 +34,7 @@ struct CProps class CEncoder: public ICompressCoder, + public ICompressSetCoderMt, public ICompressSetCoderProperties, public ICompressWriteCoderProperties, public CMyUnknownImp @@ -49,11 +50,17 @@ class CEncoder: HRESULT CEncoder::ErrorOut(size_t code); public: - MY_UNKNOWN_IMP2 (ICompressSetCoderProperties, ICompressWriteCoderProperties) + MY_QUERYINTERFACE_BEGIN2(ICompressCoder) + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt) + MY_QUERYINTERFACE_ENTRY(ICompressSetCoderProperties) + MY_QUERYINTERFACE_ENTRY(ICompressWriteCoderProperties) + MY_QUERYINTERFACE_END + MY_ADDREF_RELEASE + STDMETHOD (Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); STDMETHOD (SetCoderProperties)(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps); STDMETHOD (WriteCoderProperties)(ISequentialOutStream *outStream); - STDMETHODIMP CEncoder::SetNumberOfThreads(UInt32 numThreads); + STDMETHOD (SetNumberOfThreads)(UInt32 numThreads); CEncoder(); virtual ~CEncoder();