fix: add correct smybols for CoderMt

- decompressing with -mmt will correctly applied now
This commit is contained in:
Tino Reichardt
2017-06-02 23:26:18 +02:00
parent 129504dd3a
commit 6b66e6b057
10 changed files with 60 additions and 15 deletions

View File

@@ -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);

View File

@@ -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();

View File

@@ -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);

View File

@@ -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();

View File

@@ -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);

View File

@@ -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();

View File

@@ -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);

View File

@@ -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();

View File

@@ -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);

View File

@@ -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();