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

If zstd fails, give a more specific failure massage, fix #109

Browse Source
This commit is contained in:
Tino Reichardt
2020-04-14 08:25:21 +02:00
parent d2845a69d0
commit 9884fb96fa
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
// (C) 2016 - 2018 Tino Reichardt // (C) 2016 - 2020 Tino Reichardt
#define DEBUG 0 #define DEBUG 0
@@ -110,8 +110,22 @@ HRESULT CDecoder::CodeSpec(ISequentialInStream * inStream,
zOut.pos = 0; zOut.pos = 0;
result = ZSTD_decompressStream(_ctx, &zOut, &zIn); result = ZSTD_decompressStream(_ctx, &zOut, &zIn);
if (ZSTD_isError(result)) if (ZSTD_isError(result)) {
switch (ZSTD_getErrorCode(result)) {
/* @Igor: would be nice, if we have an API to store the errmsg */
case ZSTD_error_memory_allocation:
return E_OUTOFMEMORY;
case ZSTD_error_version_unsupported:
case ZSTD_error_frameParameter_unsupported:
return E_NOTIMPL;
case ZSTD_error_frameParameter_windowTooLarge:
case ZSTD_error_parameter_unsupported:
case ZSTD_error_parameter_outOfBound:
return E_INVALIDARG;
default:
return E_FAIL; return E_FAIL;
}
}
#if DEBUG #if DEBUG
printf("res = %u\n", (unsigned)result); printf("res = %u\n", (unsigned)result);

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

@@ -3,6 +3,7 @@
#define ZSTD_STATIC_LINKING_ONLY #define ZSTD_STATIC_LINKING_ONLY
#include "../../../C/Alloc.h" #include "../../../C/Alloc.h"
#include "../../../C/zstd/zstd.h" #include "../../../C/zstd/zstd.h"
#include "../../../C/zstd/zstd_errors.h"
#include "../../Windows/System.h" #include "../../Windows/System.h"
#include "../../Common/Common.h" #include "../../Common/Common.h"

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

@@ -1,8 +1,8 @@
// (C) 2016 - 2018 Tino Reichardt // (C) 2016 - 2020 Tino Reichardt
#define DEBUG 0 #define DEBUG 0
#if DEBUG #if 0
#include <stdio.h> #include <stdio.h>
#endif #endif
@@ -349,7 +349,22 @@ STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream,
} }
err = ZSTD_compressStream2(_ctx, &outBuff, &inBuff, ZSTD_todo); err = ZSTD_compressStream2(_ctx, &outBuff, &inBuff, ZSTD_todo);
if (ZSTD_isError(err)) return E_FAIL; if (ZSTD_isError(err)) {
switch (ZSTD_getErrorCode(err)) {
/* @Igor: would be nice, if we have an API to store the errmsg */
case ZSTD_error_memory_allocation:
return E_OUTOFMEMORY;
case ZSTD_error_version_unsupported:
case ZSTD_error_frameParameter_unsupported:
return E_NOTIMPL;
case ZSTD_error_frameParameter_windowTooLarge:
case ZSTD_error_parameter_unsupported:
case ZSTD_error_parameter_outOfBound:
return E_INVALIDARG;
default:
return E_FAIL;
}
}
#if DEBUG #if DEBUG
printf("err=%u ", (unsigned)err); printf("err=%u ", (unsigned)err);