xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-08 14:07:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

show MessageBox with the ZStandard error message, when there are problems while decompressing

Browse Source
This commit is contained in:
Tino Reichardt
2016-09-05 22:33:50 +02:00
parent ec25a9576b
commit 7a9d12a5a3
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
CPP/7zip/Compress/ZstdDecoder.cpp
View File

@@ -29,9 +29,6 @@ CDecoder::~CDecoder()
MyFree(_buffIn); MyFree(_buffIn);
MyFree(_buffOut); MyFree(_buffOut);
_buffInSizeAllocated = 0;
_buffOutSizeAllocated = 0;
} }
STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte * prop, UInt32 size) STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte * prop, UInt32 size)
@@ -66,7 +63,6 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte * prop, UInt32 size)
return E_FAIL; return E_FAIL;
if (pProps->_ver_minor != ZSTD_VERSION_MINOR) if (pProps->_ver_minor != ZSTD_VERSION_MINOR)
return E_FAIL; return E_FAIL;
#endif #endif
memcpy(&_props, pProps, sizeof (DProps)); memcpy(&_props, pProps, sizeof (DProps));
@@ -75,6 +71,22 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte * prop, UInt32 size)
return S_OK; return S_OK;
} }
HRESULT CDecoder::ErrorOut(size_t code)
{
const char *strError = ZSTD_getErrorName(code);
size_t strErrorLen = strlen(strError) + 1;
wchar_t *wstrError = (wchar_t *)MyAlloc(sizeof(wchar_t) * strErrorLen);
if (!wstrError)
return E_FAIL;
mbstowcs(wstrError, strError, strErrorLen - 1);
MessageBoxW(0, wstrError, L"7-Zip ZStandard", MB_ICONERROR | MB_OK);
MyFree(wstrError);
return E_FAIL;
}
HRESULT CDecoder::CreateDecompressor() HRESULT CDecoder::CreateDecompressor()
{ {
size_t result; size_t result;
@@ -90,13 +102,12 @@ HRESULT CDecoder::CreateDecompressor()
result = ZSTD_initDStream(_dstream); result = ZSTD_initDStream(_dstream);
if (ZSTD_isError(result)) if (ZSTD_isError(result))
return E_FAIL; return ErrorOut(result);
/* allocate buffers */ /* allocate buffers */
if (_buffInSizeAllocated != _buffInSize) if (_buffInSizeAllocated != _buffInSize)
{ {
if (_buffIn) MyFree(_buffIn);
MyFree(_buffIn);
_buffIn = MyAlloc(_buffInSize); _buffIn = MyAlloc(_buffInSize);
if (!_buffIn) if (!_buffIn)
@@ -106,8 +117,7 @@ HRESULT CDecoder::CreateDecompressor()
if (_buffOutSizeAllocated != _buffOutSize) if (_buffOutSizeAllocated != _buffOutSize)
{ {
if (_buffOut) MyFree(_buffOut);
MyFree(_buffOut);
_buffOut = MyAlloc(_buffOutSize); _buffOut = MyAlloc(_buffOutSize);
if (!_buffOut) if (!_buffOut)
@@ -168,15 +178,21 @@ HRESULT CDecoder::CodeSpec(ISequentialInStream * inStream, ISequentialOutStream
for (;;) { for (;;) {
ZSTD_outBuffer output = { _buffOut, _buffOutSize, 0 }; ZSTD_outBuffer output = { _buffOut, _buffOutSize, 0 };
result = ZSTD_decompressStream(_dstream, &output , &input); result = ZSTD_decompressStream(_dstream, &output , &input);
#if 0
printf("%s in=%d out=%d result=%d in.pos=%d in.size=%d\n", __FUNCTION__,
InSize, output.pos, result, input.pos, input.size);
fflush(stdout);
#endif
if (ZSTD_isError(result)) if (ZSTD_isError(result))
return S_FALSE; return ErrorOut(result);
/* write decompressed stream and update progress */ /* write decompressed stream and update progress */
RINOK(WriteStream(outStream, _buffOut, output.pos)); RINOK(WriteStream(outStream, _buffOut, output.pos));
_processedOut += output.pos; _processedOut += output.pos;
RINOK(progress->SetRatioInfo(&_processedIn, &_processedOut)); RINOK(progress->SetRatioInfo(&_processedIn, &_processedOut));
/* one more round */ /* one more round */
if ((input.pos == input.size) && (result == 1)) if ((input.pos == input.size) && (result == 1) && output.pos)
continue; continue;
/* finished */ /* finished */
@@ -236,7 +252,7 @@ STDMETHODIMP CDecoder::Read(void *data, UInt32 /*size*/, UInt32 *processedSize)
ZSTD_outBuffer output = { dataout, _buffOutSize, 0 }; ZSTD_outBuffer output = { dataout, _buffOutSize, 0 };
result = ZSTD_decompressStream(_dstream, &output , &input); result = ZSTD_decompressStream(_dstream, &output , &input);
if (ZSTD_isError(result)) if (ZSTD_isError(result))
return S_FALSE; return ErrorOut(result);
if (processedSize) if (processedSize)
*processedSize += static_cast < UInt32 > (output.pos); *processedSize += static_cast < UInt32 > (output.pos);
@@ -244,7 +260,7 @@ STDMETHODIMP CDecoder::Read(void *data, UInt32 /*size*/, UInt32 *processedSize)
dataout += output.pos; dataout += output.pos;
/* one more round */ /* one more round */
if ((input.pos == input.size) && (result == 1)) if ((input.pos == input.size) && (result == 1) && output.pos)
continue; continue;
/* finished */ /* finished */

1
CPP/7zip/Compress/ZstdDecoder.h
View File

@@ -64,6 +64,7 @@ class CDecoder:public ICompressCoder,
UInt64 _processedOut; UInt64 _processedOut;
HRESULT CDecoder::CreateDecompressor(); HRESULT CDecoder::CreateDecompressor();
HRESULT CDecoder::ErrorOut(size_t code);
HRESULT CodeSpec(ISequentialInStream *inStream, ISequentialOutStream *outStream, ICompressProgressInfo *progress); HRESULT CodeSpec(ISequentialInStream *inStream, ISequentialOutStream *outStream, ICompressProgressInfo *progress);
HRESULT SetOutStreamSizeResume(const UInt64 *outSize); HRESULT SetOutStreamSizeResume(const UInt64 *outSize);

2
CPP/7zip/Compress/ZstdEncoder.cpp
View File

@@ -27,8 +27,6 @@ CEncoder::~CEncoder()
MyFree(_buffIn); MyFree(_buffIn);
MyFree(_buffOut); MyFree(_buffOut);
_buffIn = 0;
_buffOut = 0;
} }
STDMETHODIMP CEncoder::SetCoderProperties(const PROPID * propIDs, const PROPVARIANT * coderProps, UInt32 numProps) STDMETHODIMP CEncoder::SetCoderProperties(const PROPID * propIDs, const PROPVARIANT * coderProps, UInt32 numProps)