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

9.06 beta

Browse Source
This commit is contained in:
Igor Pavlov
2009-08-17 00:00:00 +00:00
committed by Kornel Lesiński
parent 829409452d
commit c99f3ebdd6
445 changed files with 15246 additions and 8133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
CPP/7zip/Compress/BZip2Decoder.cpp
View File

@@ -584,12 +584,7 @@ HRESULT CDecoder::DecodeFile(bool &isBZ, ICompressProgressInfo *progress)
CState &state = m_States[0];
for (;;)
{
if (progress)
{
UInt64 packSize = m_InStream.GetProcessedSize();
UInt64 unpackSize = m_OutStream.GetProcessedSize();
RINOK(progress->SetRatioInfo(&packSize, &unpackSize));
}
RINOK(SetRatioProgress(m_InStream.GetProcessedSize()));
bool wasFinished;
UInt32 crc;
RINOK(ReadSignatures(wasFinished, crc));
@@ -608,7 +603,7 @@ HRESULT CDecoder::DecodeFile(bool &isBZ, ICompressProgressInfo *progress)
return S_FALSE;
}
}
return S_OK;
return SetRatioProgress(m_InStream.GetProcessedSize());
}
HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
@@ -766,16 +761,9 @@ void CState::ThreadFunc()
if (!needFinish)
{
if ((randMode ?
DecodeBlock2Rand(Counters + 256, blockSize, origPtr, Decoder->m_OutStream) :
DecodeBlock2(Counters + 256, blockSize, origPtr, Decoder->m_OutStream)) == crc)
{
if (Decoder->Progress)
{
UInt64 inSize = packSize - Decoder->_inStart;
UInt64 unpackSize = Decoder->m_OutStream.GetProcessedSize();
res = Decoder->Progress->SetRatioInfo(&inSize, &unpackSize);
}
}
DecodeBlock2Rand(Counters + 256, blockSize, origPtr, Decoder->m_OutStream) :
DecodeBlock2(Counters + 256, blockSize, origPtr, Decoder->m_OutStream)) == crc)
res = Decoder->SetRatioProgress(packSize);
else
res = S_FALSE;
}
@@ -808,4 +796,13 @@ STDMETHODIMP CDecoder::SetNumberOfThreads(UInt32 numThreads)
}
#endif
HRESULT CDecoder::SetRatioProgress(UInt64 packSize)
{
if (!Progress)
return S_OK;
packSize -= _inStart;
UInt64 unpackSize = m_OutStream.GetProcessedSize();
return Progress->SetRatioInfo(&packSize, &unpackSize);
}
}}