mirror of
https://github.com/aaru-dps/Aaru.Compression.Native.git
synced 2025-12-16 19:24:31 +00:00
Update to lzma 23.01.
This commit is contained in:
53
3rdparty/lzma/CPP/7zip/Common/StreamUtils.cpp
vendored
53
3rdparty/lzma/CPP/7zip/Common/StreamUtils.cpp
vendored
@@ -2,10 +2,55 @@
|
||||
|
||||
#include "StdAfx.h"
|
||||
|
||||
#include "../../Common/MyCom.h"
|
||||
|
||||
#include "StreamUtils.h"
|
||||
|
||||
static const UInt32 kBlockSize = ((UInt32)1 << 31);
|
||||
|
||||
|
||||
HRESULT InStream_SeekToBegin(IInStream *stream) throw()
|
||||
{
|
||||
return InStream_SeekSet(stream, 0);
|
||||
}
|
||||
|
||||
|
||||
HRESULT InStream_AtBegin_GetSize(IInStream *stream, UInt64 &sizeRes) throw()
|
||||
{
|
||||
#ifdef _WIN32
|
||||
{
|
||||
Z7_DECL_CMyComPtr_QI_FROM(
|
||||
IStreamGetSize,
|
||||
streamGetSize, stream)
|
||||
if (streamGetSize && streamGetSize->GetSize(&sizeRes) == S_OK)
|
||||
return S_OK;
|
||||
}
|
||||
#endif
|
||||
const HRESULT hres = InStream_GetSize_SeekToEnd(stream, sizeRes);
|
||||
const HRESULT hres2 = InStream_SeekToBegin(stream);
|
||||
return hres != S_OK ? hres : hres2;
|
||||
}
|
||||
|
||||
|
||||
HRESULT InStream_GetPos_GetSize(IInStream *stream, UInt64 &curPosRes, UInt64 &sizeRes) throw()
|
||||
{
|
||||
RINOK(InStream_GetPos(stream, curPosRes))
|
||||
#ifdef _WIN32
|
||||
{
|
||||
Z7_DECL_CMyComPtr_QI_FROM(
|
||||
IStreamGetSize,
|
||||
streamGetSize, stream)
|
||||
if (streamGetSize && streamGetSize->GetSize(&sizeRes) == S_OK)
|
||||
return S_OK;
|
||||
}
|
||||
#endif
|
||||
const HRESULT hres = InStream_GetSize_SeekToEnd(stream, sizeRes);
|
||||
const HRESULT hres2 = InStream_SeekSet(stream, curPosRes);
|
||||
return hres != S_OK ? hres : hres2;
|
||||
}
|
||||
|
||||
|
||||
|
||||
HRESULT ReadStream(ISequentialInStream *stream, void *data, size_t *processedSize) throw()
|
||||
{
|
||||
size_t size = *processedSize;
|
||||
@@ -18,7 +63,7 @@ HRESULT ReadStream(ISequentialInStream *stream, void *data, size_t *processedSiz
|
||||
*processedSize += processedSizeLoc;
|
||||
data = (void *)((Byte *)data + processedSizeLoc);
|
||||
size -= processedSizeLoc;
|
||||
RINOK(res);
|
||||
RINOK(res)
|
||||
if (processedSizeLoc == 0)
|
||||
return S_OK;
|
||||
}
|
||||
@@ -28,14 +73,14 @@ HRESULT ReadStream(ISequentialInStream *stream, void *data, size_t *processedSiz
|
||||
HRESULT ReadStream_FALSE(ISequentialInStream *stream, void *data, size_t size) throw()
|
||||
{
|
||||
size_t processedSize = size;
|
||||
RINOK(ReadStream(stream, data, &processedSize));
|
||||
RINOK(ReadStream(stream, data, &processedSize))
|
||||
return (size == processedSize) ? S_OK : S_FALSE;
|
||||
}
|
||||
|
||||
HRESULT ReadStream_FAIL(ISequentialInStream *stream, void *data, size_t size) throw()
|
||||
{
|
||||
size_t processedSize = size;
|
||||
RINOK(ReadStream(stream, data, &processedSize));
|
||||
RINOK(ReadStream(stream, data, &processedSize))
|
||||
return (size == processedSize) ? S_OK : E_FAIL;
|
||||
}
|
||||
|
||||
@@ -48,7 +93,7 @@ HRESULT WriteStream(ISequentialOutStream *stream, const void *data, size_t size)
|
||||
HRESULT res = stream->Write(data, curSize, &processedSizeLoc);
|
||||
data = (const void *)((const Byte *)data + processedSizeLoc);
|
||||
size -= processedSizeLoc;
|
||||
RINOK(res);
|
||||
RINOK(res)
|
||||
if (processedSizeLoc == 0)
|
||||
return E_FAIL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user