4.55 beta

CPP/7zip/Common/ProgressUtils.cpp

@@ -7,7 +7,7 @@
 CLocalProgress::CLocalProgress()
 {
   ProgressOffset = InSize = OutSize = 0;
-  SendRatio = true;
+  SendRatio = SendProgress = true;
 }
 
 void CLocalProgress::Init(IProgress *progress, bool inSizeIsMain)
@@ -31,7 +31,9 @@ STDMETHODIMP CLocalProgress::SetRatioInfo(const UInt64 *inSize, const UInt64 *ou
   }
   inSizeNew += ProgressOffset;
   outSizeNew += ProgressOffset;
-  return _progress->SetCompleted(_inSizeIsMain ? &inSizeNew : &outSizeNew);
+  if (SendProgress)
+    return _progress->SetCompleted(_inSizeIsMain ? &inSizeNew : &outSizeNew);
+  return S_OK;
 }
 
 HRESULT CLocalProgress::SetCur()

CPP/7zip/Common/ProgressUtils.h

@@ -20,6 +20,7 @@ public:
   UInt64 InSize;
   UInt64 OutSize;
   bool SendRatio;
+  bool SendProgress;
 
   CLocalProgress();
   void Init(IProgress *progress, bool inSizeIsMain);

CPP/7zip/MyVersion.h

@@ -1,8 +1,8 @@
 #define MY_VER_MAJOR 4
-#define MY_VER_MINOR 54
+#define MY_VER_MINOR 55
 #define MY_VER_BUILD 0
-#define MY_VERSION "4.54 beta"
+#define MY_VERSION "4.55 beta"
-#define MY_7ZIP_VERSION "7-Zip 4.54 beta"
+#define MY_7ZIP_VERSION "7-Zip 4.55 beta"
-#define MY_DATE "2007-09-04"
+#define MY_DATE "2007-09-05"
 #define MY_COPYRIGHT "Copyright (c) 1999-2007 Igor Pavlov"
 #define MY_VERSION_COPYRIGHT_DATE MY_VERSION "  " MY_COPYRIGHT "  " MY_DATE

CPP/7zip/UI/Agent/AgentOut.cpp

@@ -226,8 +226,10 @@ STDMETHODIMP CAgent::DoOperation(
     if (updatePairs2[i].NewData)
       numFiles++;
   
-  RINOK(updateCallback100->SetNumFiles(numFiles));
+  if (updateCallback100)
-
+  {
+    RINOK(updateCallback100->SetNumFiles(numFiles));
+  }
   
   CUpdateCallbackAgent updateCallbackAgent;
   updateCallbackAgent.SetCallback(updateCallback100);

CPP/7zip/UI/Common/ArchiveExtractCallback.cpp

@@ -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
 }

CPP/7zip/UI/Common/ArchiveExtractCallback.h

@@ -105,7 +105,6 @@ public:
 
   CLocalProgress *LocalProgressSpec;
   CMyComPtr<ICompressProgressInfo> _localProgress;
-  bool _ratioMode;
   UInt64 _packTotal;
   UInt64 _unpTotal;
 

CPP/7zip/UI/Common/Extract.cpp

@@ -91,6 +91,7 @@ HRESULT DecompressArchives(
   CExtractOptions options = optionsSpec;
   int i;
   UInt64 totalPackSize = 0;
+  CRecordVector<UInt64> archiveSizes;
   for (i = 0; i < archivePaths.Size(); i++)
   {
     const UString &archivePath = archivePaths[i];
@@ -99,6 +100,7 @@ HRESULT DecompressArchives(
       throw "there is no such archive";
     if (archiveFileInfo.IsDirectory())
       throw "can't decompress folder";
+    archiveSizes.Add(archiveFileInfo.Size);
     totalPackSize += archiveFileInfo.Size;
   }
   CArchiveExtractCallback *extractCallbackSpec = new CArchiveExtractCallback;
@@ -145,8 +147,15 @@ HRESULT DecompressArchives(
       {
         archivePaths.Delete(index);
         archivePathsFull.Delete(index);
+        totalPackSize -= archiveSizes[index];
+        archiveSizes.Delete(index);
       }
     }
+    if (archiveLink.VolumePaths.Size() != 0)
+    {
+      totalPackSize += archiveLink.VolumesSize;
+      RINOK(extractCallback->SetTotal(totalPackSize));  
+    }
 
     #ifndef _NO_CRYPTO
     UString password;
@@ -160,7 +169,7 @@ HRESULT DecompressArchives(
     options.DefaultItemName = archiveLink.GetDefaultItemName();
     RINOK(DecompressArchive(
         archiveLink.GetArchive(), 
-        archiveFileInfo.Size,
+        archiveFileInfo.Size + archiveLink.VolumesSize,
         archiveLink.GetDefaultItemName(),
         wildcardCensor, options, extractCallback, extractCallbackSpec, errorMessage));
     extractCallbackSpec->LocalProgressSpec->InSize += archiveFileInfo.Size + 

CPP/7zip/UI/Far/Far.dsp

@@ -410,14 +410,6 @@ SOURCE=..\Common\OpenArchive.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Common\ProgressUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Common\ProgressUtils.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\Common\PropIDUtils.cpp
 # End Source File
 # Begin Source File
@@ -550,6 +542,14 @@ SOURCE=..\..\Common\FileStreams.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Common\ProgressUtils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\ProgressUtils.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Common\StreamUtils.cpp
 # End Source File
 # Begin Source File

DOC/7zip.nsi

@@ -2,7 +2,7 @@
 ;Defines
 
 !define VERSION_MAJOR 4
-!define VERSION_MINOR 54
+!define VERSION_MINOR 55
 !define VERSION_POSTFIX_FULL " beta"
 !ifdef WIN64
 !ifdef IA64

DOC/7zip.wxs

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <?define VerMajor = "4" ?>
-<?define VerMinor = "54" ?>
+<?define VerMinor = "55" ?>
 <?define VerBuild = "00" ?>
 <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
 <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?>

DOC/readme.txt

@@ -1,4 +1,4 @@
-7-Zip 4.54 Sources
+7-Zip 4.55 Sources
 ------------------
 
 7-Zip is a file archiver for Windows 95/98/ME/NT/2000/2003/XP/Vista.