aaru-dps/Aaru.Compression.Native
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Compression.Native.git synced 2025-12-16 19:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to lzma 23.01.

Browse Source
This commit is contained in:
Natalia Portillo
2023-09-24 03:13:03 +01:00
parent 5a6a32f513
commit dda9bcac54
530 changed files with 31937 additions and 14468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
3rdparty/lzma/CPP/7zip/Compress/CopyCoder.cpp vendored
View File

@@ -15,15 +15,15 @@ CCopyCoder::~CCopyCoder()
::MidFree(_buf);
}
STDMETHODIMP CCopyCoder::SetFinishMode(UInt32 /* finishMode */)
Z7_COM7F_IMF(CCopyCoder::SetFinishMode(UInt32 /* finishMode */))
{
return S_OK;
}
STDMETHODIMP CCopyCoder::Code(ISequentialInStream *inStream,
Z7_COM7F_IMF(CCopyCoder::Code(ISequentialInStream *inStream,
ISequentialOutStream *outStream,
const UInt64 * /* inSize */, const UInt64 *outSize,
ICompressProgressInfo *progress)
ICompressProgressInfo *progress))
{
if (!_buf)
{
@@ -37,12 +37,39 @@ STDMETHODIMP CCopyCoder::Code(ISequentialInStream *inStream,
for (;;)
{
UInt32 size = kBufSize;
if (outSize && size > *outSize - TotalSize)
size = (UInt32)(*outSize - TotalSize);
if (size == 0)
return S_OK;
if (outSize)
{
const UInt64 rem = *outSize - TotalSize;
if (size > rem)
{
size = (UInt32)rem;
if (size == 0)
{
/* if we enable the following check,
we will make one call of Read(_buf, 0) for empty stream */
// if (TotalSize != 0)
return S_OK;
}
}
}
HRESULT readRes = inStream->Read(_buf, size, &size);
HRESULT readRes;
{
UInt32 pos = 0;
do
{
const UInt32 curSize = size - pos;
UInt32 processed = 0;
readRes = inStream->Read(_buf + pos, curSize, &processed);
if (processed > curSize)
return E_FAIL; // internal code failure
pos += processed;
if (readRes != S_OK || processed == 0)
break;
}
while (pos < kBufSize);
size = pos;
}
if (size == 0)
return readRes;
@@ -52,12 +79,15 @@ STDMETHODIMP CCopyCoder::Code(ISequentialInStream *inStream,
UInt32 pos = 0;
do
{
UInt32 curSize = size - pos;
HRESULT res = outStream->Write(_buf + pos, curSize, &curSize);
pos += curSize;
TotalSize += curSize;
RINOK(res);
if (curSize == 0)
const UInt32 curSize = size - pos;
UInt32 processed = 0;
const HRESULT res = outStream->Write(_buf + pos, curSize, &processed);
if (processed > curSize)
return E_FAIL; // internal code failure
pos += processed;
TotalSize += processed;
RINOK(res)
if (processed == 0)
return E_FAIL;
}
while (pos < size);
@@ -65,29 +95,32 @@ STDMETHODIMP CCopyCoder::Code(ISequentialInStream *inStream,
else
TotalSize += size;
RINOK(readRes);
RINOK(readRes)
if (progress)
if (size != kBufSize)
return S_OK;
if (progress && (TotalSize & (((UInt32)1 << 22) - 1)) == 0)
{
RINOK(progress->SetRatioInfo(&TotalSize, &TotalSize));
RINOK(progress->SetRatioInfo(&TotalSize, &TotalSize))
}
}
}
STDMETHODIMP CCopyCoder::SetInStream(ISequentialInStream *inStream)
Z7_COM7F_IMF(CCopyCoder::SetInStream(ISequentialInStream *inStream))
{
_inStream = inStream;
TotalSize = 0;
return S_OK;
}
STDMETHODIMP CCopyCoder::ReleaseInStream()
Z7_COM7F_IMF(CCopyCoder::ReleaseInStream())
{
_inStream.Release();
return S_OK;
}
STDMETHODIMP CCopyCoder::Read(void *data, UInt32 size, UInt32 *processedSize)
Z7_COM7F_IMF(CCopyCoder::Read(void *data, UInt32 size, UInt32 *processedSize))
{
UInt32 realProcessedSize = 0;
HRESULT res = _inStream->Read(data, size, &realProcessedSize);
@@ -97,7 +130,7 @@ STDMETHODIMP CCopyCoder::Read(void *data, UInt32 size, UInt32 *processedSize)
return res;
}
STDMETHODIMP CCopyCoder::GetInStreamProcessedSize(UInt64 *value)
Z7_COM7F_IMF(CCopyCoder::GetInStreamProcessedSize(UInt64 *value))
{
*value = TotalSize;
return S_OK;
@@ -113,7 +146,7 @@ HRESULT CopyStream_ExactSize(ISequentialInStream *inStream, ISequentialOutStream
{
NCompress::CCopyCoder *copyCoderSpec = new NCompress::CCopyCoder;
CMyComPtr<ICompressCoder> copyCoder = copyCoderSpec;
RINOK(copyCoder->Code(inStream, outStream, NULL, &size, progress));
RINOK(copyCoder->Code(inStream, outStream, NULL, &size, progress))
return copyCoderSpec->TotalSize == size ? S_OK : E_FAIL;
}