xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2026-01-31 06:24:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix x86 warning and improve progress updates

Browse Source
This commit is contained in:
conor42
2019-03-29 00:14:05 +10:00
parent 6eb40bd436
commit 80ae5388ad
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CPP/7zip/Compress/Lzma2Encoder.cpp
+11 -8
View File
@@ -120,7 +120,7 @@ STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream, ISequentialOutStream
return SResToHRESULT(res); return SResToHRESULT(res);
} }
static HRESULT TranslateError(size_t res) static HRESULT TranslateError(size_t res)
{ {
if (FL2_getErrorCode(res) == FL2_error_memory_allocation) if (FL2_getErrorCode(res) == FL2_error_memory_allocation)
@@ -181,7 +181,7 @@ HRESULT CFastEncoder::FastLzma2::SetCoderProperties(const PROPID *propIDs, const
if (!dictSize) { if (!dictSize) {
dictSize = (UInt32)FL2_CCtx_getParameter(fcs, FL2_p_dictionarySize); dictSize = (UInt32)FL2_CCtx_getParameter(fcs, FL2_p_dictionarySize);
} }
size_t reduceSize = lzma2Props.lzmaProps.reduceSize; UInt64 reduceSize = lzma2Props.lzmaProps.reduceSize;
reduceSize += (reduceSize < (UInt64)-1); /* prevent extra buffer shift after read */ reduceSize += (reduceSize < (UInt64)-1); /* prevent extra buffer shift after read */
dictSize = (UInt32)min(dictSize, reduceSize); dictSize = (UInt32)min(dictSize, reduceSize);
dictSize = max(dictSize, FL2_DICTSIZE_MIN); dictSize = max(dictSize, FL2_DICTSIZE_MIN);
@@ -242,9 +242,12 @@ HRESULT CFastEncoder::FastLzma2::AddByteCount(size_t count, ISequentialOutStream
CHECK_H(WaitAndReport(res, progress)); CHECK_H(WaitAndReport(res, progress));
if (res != 0) if (res != 0)
CHECK_H(WriteBuffers(outStream)); CHECK_H(WriteBuffers(outStream));
do { res = FL2_getDictionaryBuffer(fcs, &dict);
while (FL2_isTimedOut(res)) {
if (!UpdateProgress(progress))
return S_FALSE;
res = FL2_getDictionaryBuffer(fcs, &dict); res = FL2_getDictionaryBuffer(fcs, &dict);
} while (FL2_isTimedOut(res)); }
CHECK_S(res); CHECK_S(res);
dict_pos = 0; dict_pos = 0;
} }
@@ -272,10 +275,10 @@ HRESULT CFastEncoder::FastLzma2::WriteBuffers(ISequentialOutStream *outStream)
size_t csize; size_t csize;
for (;;) { for (;;) {
FL2_cBuffer cbuf; FL2_cBuffer cbuf;
do { do {
csize = FL2_getNextCompressedBuffer(fcs, &cbuf); csize = FL2_getNextCompressedBuffer(fcs, &cbuf);
} while (FL2_isTimedOut(csize)); } while (FL2_isTimedOut(csize));
CHECK_S(csize); CHECK_S(csize);
if (csize == 0) if (csize == 0)
break; break;
HRESULT err = WriteStream(outStream, cbuf.src, cbuf.size); HRESULT err = WriteStream(outStream, cbuf.src, cbuf.size);