4.55 beta

This commit is contained in:
Igor Pavlov
2007-09-05 00:00:00 +00:00
committed by Kornel Lesiński
parent b82f80647d
commit b67ffe691b
11 changed files with 35 additions and 25 deletions

View File

@@ -41,7 +41,6 @@ void CArchiveExtractCallback::Init(
{
_stdOutMode = stdOutMode;
_numErrors = 0;
_ratioMode = false;
_unpTotal = 1;
_packTotal = packSize;
@@ -50,6 +49,7 @@ void CArchiveExtractCallback::Init(
_extractCallback2.QueryInterface(IID_ICompressProgressInfo, &_compressProgress);
LocalProgressSpec->Init(extractCallback2, true);
LocalProgressSpec->SendProgress = false;
_itemDefaultName = itemDefaultName;
_utcLastWriteTimeDefault = utcLastWriteTimeDefault;
@@ -97,8 +97,6 @@ STDMETHODIMP CArchiveExtractCallback::SetCompleted(const UInt64 *completeValue)
if (_multiArchives)
{
if (_ratioMode)
return S_OK;
if (completeValue != NULL)
{
UInt64 packCur = LocalProgressSpec->InSize + MyMultDiv64(*completeValue, _unpTotal, _packTotal);
@@ -112,7 +110,6 @@ STDMETHODIMP CArchiveExtractCallback::SetCompleted(const UInt64 *completeValue)
STDMETHODIMP CArchiveExtractCallback::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize)
{
COM_TRY_BEGIN
_ratioMode = true;
return _localProgress->SetRatioInfo(inSize, outSize);
COM_TRY_END
}