| Index: third_party/lzma/v4_65/files/CPP/7zip/Compress/LzmaDecoder.cpp
|
| diff --git a/third_party/lzma/v4_65/files/CPP/7zip/Compress/LzmaDecoder.cpp b/third_party/lzma/v4_65/files/CPP/7zip/Compress/LzmaDecoder.cpp
|
| deleted file mode 100644
|
| index 5bfffe90d9f8b475a4fd2ca152f472041cb502b7..0000000000000000000000000000000000000000
|
| --- a/third_party/lzma/v4_65/files/CPP/7zip/Compress/LzmaDecoder.cpp
|
| +++ /dev/null
|
| @@ -1,190 +0,0 @@
|
| -// LzmaDecoder.cpp
|
| -
|
| -#include "StdAfx.h"
|
| -
|
| -extern "C"
|
| -{
|
| -#include "../../../C/Alloc.h"
|
| -}
|
| -
|
| -#include "../Common/StreamUtils.h"
|
| -
|
| -#include "LzmaDecoder.h"
|
| -
|
| -static HRESULT SResToHRESULT(SRes res)
|
| -{
|
| - switch(res)
|
| - {
|
| - case SZ_OK: return S_OK;
|
| - case SZ_ERROR_MEM: return E_OUTOFMEMORY;
|
| - case SZ_ERROR_PARAM: return E_INVALIDARG;
|
| - case SZ_ERROR_UNSUPPORTED: return E_NOTIMPL;
|
| - // case SZ_ERROR_PROGRESS: return E_ABORT;
|
| - case SZ_ERROR_DATA: return S_FALSE;
|
| - }
|
| - return E_FAIL;
|
| -}
|
| -
|
| -namespace NCompress {
|
| -namespace NLzma {
|
| -
|
| -static const UInt32 kInBufSize = 1 << 20;
|
| -
|
| -CDecoder::CDecoder(): _inBuf(0), _outSizeDefined(false), FinishStream(false)
|
| -{
|
| - LzmaDec_Construct(&_state);
|
| -}
|
| -
|
| -static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }
|
| -static void SzFree(void *p, void *address) { p = p; MyFree(address); }
|
| -static ISzAlloc g_Alloc = { SzAlloc, SzFree };
|
| -
|
| -CDecoder::~CDecoder()
|
| -{
|
| - LzmaDec_Free(&_state, &g_Alloc);
|
| - MyFree(_inBuf);
|
| -}
|
| -
|
| -STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *prop, UInt32 size)
|
| -{
|
| - RINOK(SResToHRESULT(LzmaDec_Allocate(&_state, prop, size, &g_Alloc)));
|
| -
|
| - if (_inBuf == 0)
|
| - {
|
| - _inBuf = (Byte *)MyAlloc(kInBufSize);
|
| - if (_inBuf == 0)
|
| - return E_OUTOFMEMORY;
|
| - }
|
| -
|
| - return S_OK;
|
| -}
|
| -
|
| -STDMETHODIMP CDecoder::GetInStreamProcessedSize(UInt64 *value) { *value = _inSizeProcessed; return S_OK; }
|
| -STDMETHODIMP CDecoder::SetInStream(ISequentialInStream *inStream) { _inStream = inStream; return S_OK; }
|
| -STDMETHODIMP CDecoder::ReleaseInStream() { _inStream.Release(); return S_OK; }
|
| -
|
| -STDMETHODIMP CDecoder::SetOutStreamSize(const UInt64 *outSize)
|
| -{
|
| - _outSizeDefined = (outSize != NULL);
|
| - if (_outSizeDefined)
|
| - _outSize = *outSize;
|
| -
|
| - LzmaDec_Init(&_state);
|
| -
|
| - _inPos = _inSize = 0;
|
| - _inSizeProcessed = _outSizeProcessed = 0;
|
| - return S_OK;
|
| -}
|
| -
|
| -STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
|
| - const UInt64 * /* inSize */, const UInt64 *outSize, ICompressProgressInfo *progress)
|
| -{
|
| - if (_inBuf == 0)
|
| - return S_FALSE;
|
| - SetOutStreamSize(outSize);
|
| -
|
| - for (;;)
|
| - {
|
| - if (_inPos == _inSize)
|
| - {
|
| - _inPos = _inSize = 0;
|
| - RINOK(inStream->Read(_inBuf, kInBufSize, &_inSize));
|
| - }
|
| -
|
| - SizeT dicPos = _state.dicPos;
|
| - SizeT curSize = _state.dicBufSize - dicPos;
|
| - const UInt32 kStepSize = ((UInt32)1 << 22);
|
| - if (curSize > kStepSize)
|
| - curSize = (SizeT)kStepSize;
|
| -
|
| - ELzmaFinishMode finishMode = LZMA_FINISH_ANY;
|
| - if (_outSizeDefined)
|
| - {
|
| - const UInt64 rem = _outSize - _outSizeProcessed;
|
| - if (rem < curSize)
|
| - {
|
| - curSize = (SizeT)rem;
|
| - if (FinishStream)
|
| - finishMode = LZMA_FINISH_END;
|
| - }
|
| - }
|
| -
|
| - SizeT inSizeProcessed = _inSize - _inPos;
|
| - ELzmaStatus status;
|
| - SRes res = LzmaDec_DecodeToDic(&_state, dicPos + curSize, _inBuf + _inPos, &inSizeProcessed, finishMode, &status);
|
| -
|
| - _inPos += (UInt32)inSizeProcessed;
|
| - _inSizeProcessed += inSizeProcessed;
|
| - SizeT outSizeProcessed = _state.dicPos - dicPos;
|
| - _outSizeProcessed += outSizeProcessed;
|
| -
|
| - bool finished = (inSizeProcessed == 0 && outSizeProcessed == 0);
|
| - bool stopDecoding = (_outSizeDefined && _outSizeProcessed >= _outSize);
|
| -
|
| - if (res != 0 || _state.dicPos == _state.dicBufSize || finished || stopDecoding)
|
| - {
|
| - HRESULT res2 = WriteStream(outStream, _state.dic, _state.dicPos);
|
| - if (res != 0)
|
| - return S_FALSE;
|
| - RINOK(res2);
|
| - if (stopDecoding)
|
| - return S_OK;
|
| - if (finished)
|
| - return (status == LZMA_STATUS_FINISHED_WITH_MARK ? S_OK : S_FALSE);
|
| - }
|
| - if (_state.dicPos == _state.dicBufSize)
|
| - _state.dicPos = 0;
|
| -
|
| - if (progress != NULL)
|
| - {
|
| - RINOK(progress->SetRatioInfo(&_inSizeProcessed, &_outSizeProcessed));
|
| - }
|
| - }
|
| -}
|
| -
|
| -#ifndef NO_READ_FROM_CODER
|
| -
|
| -STDMETHODIMP CDecoder::Read(void *data, UInt32 size, UInt32 *processedSize)
|
| -{
|
| - if (processedSize)
|
| - *processedSize = 0;
|
| - do
|
| - {
|
| - if (_inPos == _inSize)
|
| - {
|
| - _inPos = _inSize = 0;
|
| - RINOK(_inStream->Read(_inBuf, kInBufSize, &_inSize));
|
| - }
|
| - {
|
| - SizeT inProcessed = _inSize - _inPos;
|
| -
|
| - if (_outSizeDefined)
|
| - {
|
| - const UInt64 rem = _outSize - _outSizeProcessed;
|
| - if (rem < size)
|
| - size = (UInt32)rem;
|
| - }
|
| -
|
| - SizeT outProcessed = size;
|
| - ELzmaStatus status;
|
| - SRes res = LzmaDec_DecodeToBuf(&_state, (Byte *)data, &outProcessed,
|
| - _inBuf + _inPos, &inProcessed, LZMA_FINISH_ANY, &status);
|
| - _inPos += (UInt32)inProcessed;
|
| - _inSizeProcessed += inProcessed;
|
| - _outSizeProcessed += outProcessed;
|
| - size -= (UInt32)outProcessed;
|
| - data = (Byte *)data + outProcessed;
|
| - if (processedSize)
|
| - *processedSize += (UInt32)outProcessed;
|
| - RINOK(SResToHRESULT(res));
|
| - if (inProcessed == 0 && outProcessed == 0)
|
| - return S_OK;
|
| - }
|
| - }
|
| - while (size != 0);
|
| - return S_OK;
|
| -}
|
| -
|
| -#endif
|
| -
|
| -}}
|
|
|