1 files changed, 32 insertions, 69 deletions

diff --git a/CPP/7zip/Archive/Wim/WimHandlerOut.cpp b/CPP/7zip/Archive/Wim/WimHandlerOut.cpp
index 5d9dea2..3b2cb31 100644
--- a/CPP/7zip/Archive/Wim/WimHandlerOut.cpp
+++ b/CPP/7zip/Archive/Wim/WimHandlerOut.cpp
@@ -20,6 +20,8 @@
 #include "../../Crypto/RandGen.h"
 #include "../../Crypto/Sha1Cls.h"
 
+#include "../Common/OutStreamWithSha1.h"
+
 #include "WimHandler.h"
 
 using namespace NWindows;
@@ -345,40 +347,6 @@ void CStreamInfo::WriteTo(Byte *p) const
 }
 
 
-Z7_CLASS_IMP_NOQIB_1(
-  CInStreamWithSha1
-  , ISequentialInStream
-)
-  CMyComPtr<ISequentialInStream> _stream;
-  UInt64 _size;
-  // NCrypto::NSha1::CContext _sha;
-  CAlignedBuffer1 _sha;
-  CSha1 *Sha() { return (CSha1 *)(void *)(Byte *)_sha; }
-public:
-  CInStreamWithSha1(): _sha(sizeof(CSha1)) {}
-  void SetStream(ISequentialInStream *stream) { _stream = stream;  }
-  void Init()
-  {
-    _size = 0;
-    Sha1_Init(Sha());
-  }
-  void ReleaseStream() { _stream.Release(); }
-  UInt64 GetSize() const { return _size; }
-  void Final(Byte *digest) { Sha1_Final(Sha(), digest); }
-};
-
-Z7_COM7F_IMF(CInStreamWithSha1::Read(void *data, UInt32 size, UInt32 *processedSize))
-{
-  UInt32 realProcessedSize;
-  const HRESULT result = _stream->Read(data, size, &realProcessedSize);
-  _size += realProcessedSize;
-  Sha1_Update(Sha(), (const Byte *)data, realProcessedSize);
-  if (processedSize)
-    *processedSize = realProcessedSize;
-  return result;
-}
-
-
 static void SetFileTimeToMem(Byte *p, const FILETIME &ft)
 {
   Set32(p, ft.dwLowDateTime)
@@ -599,14 +567,14 @@ void CDb::WriteOrderList(const CDir &tree)
 
 static void AddTag_ToString(AString &s, const char *name, const char *value)
 {
-  s += '<';
+  s.Add_Char('<');
   s += name;
-  s += '>';
+  s.Add_Char('>');
   s += value;
-  s += '<';
-  s += '/';
+  s.Add_Char('<');
+  s.Add_Slash();
   s += name;
-  s += '>';
+  s.Add_Char('>');
 }
 
 
@@ -620,7 +588,7 @@ static void AddTagUInt64_ToString(AString &s, const char *name, UInt64 value)
 
 static CXmlItem &AddUniqueTag(CXmlItem &parentItem, const char *name)
 {
-  int index = parentItem.FindSubTag(name);
+  const int index = parentItem.FindSubTag(name);
   if (index < 0)
   {
     CXmlItem &subItem = parentItem.SubItems.AddNew();
@@ -679,8 +647,7 @@ static void AddTag_Time(CXmlItem &parentItem, const char *name, const FILETIME &
 
 static void AddTag_String_IfEmpty(CXmlItem &parentItem, const char *name, const char *value)
 {
-  int index = parentItem.FindSubTag(name);
-  if (index >= 0)
+  if (parentItem.FindSubTag(name) >= 0)
     return;
   CXmlItem &tag = parentItem.SubItems.AddNew();
   tag.IsTag = true;
@@ -1094,7 +1061,7 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
     {
       for (;;)
       {
-        wchar_t c = *path++;
+        const wchar_t c = *path++;
         if (c == 0)
           break;
         if (c == WCHAR_PATH_SEPARATOR || c == L'/')
@@ -1382,12 +1349,9 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
   RINOK(callback->SetTotal(complexity))
   UInt64 totalComplexity = complexity;
 
-  NCompress::CCopyCoder *copyCoderSpec = new NCompress::CCopyCoder;
-  CMyComPtr<ICompressCoder> copyCoder = copyCoderSpec;
-
-  CLocalProgress *lps = new CLocalProgress;
-  CMyComPtr<ICompressProgressInfo> progress = lps;
+  CMyComPtr2_Create<ICompressProgressInfo, CLocalProgress> lps;
   lps->Init(callback, true);
+  CMyComPtr2_Create<ICompressCoder, NCompress::CCopyCoder> copyCoder;
 
   complexity = 0;
 
@@ -1419,8 +1383,7 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
 
   UInt64 curPos = kHeaderSizeMax;
 
-  CInStreamWithSha1 *inShaStreamSpec = new CInStreamWithSha1;
-  CMyComPtr<ISequentialInStream> inShaStream = inShaStreamSpec;
+  CMyComPtr2_Create<ISequentialInStream, CInStreamWithSha1> inShaStream;
 
   CLimitedSequentialInStream *inStreamLimitedSpec = NULL;
   CMyComPtr<ISequentialInStream> inStreamLimited;
@@ -1492,7 +1455,7 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
      
     if (!rs.IsSolid() || rs.IsSolidSmall())
     {
-      const int find = AddUniqHash(&streams.Front(), sortedHashes, siOld.Hash, (int)streamIndex);
+      const int find = AddUniqHash(streams.ConstData(), sortedHashes, siOld.Hash, (int)streamIndex);
       if (find != -1)
         return E_FAIL; // two streams with same SHA-1
     }
@@ -1501,8 +1464,8 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
     {
       RINOK(InStream_SeekSet(_volumes[siOld.PartNumber].Stream, rs.Offset))
       inStreamLimitedSpec->Init(rs.PackSize);
-      RINOK(copyCoder->Code(inStreamLimited, outStream, NULL, NULL, progress))
-      if (copyCoderSpec->TotalSize != rs.PackSize)
+      RINOK(copyCoder.Interface()->Code(inStreamLimited, outStream, NULL, NULL, lps))
+      if (copyCoder->TotalSize != rs.PackSize)
         return E_FAIL;
       s.Resource.Offset = curPos;
       curPos += rs.PackSize;
@@ -1564,7 +1527,7 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
       
       const CStreamInfo &siOld = _db.DataStreams[item.StreamIndex];
 
-      const int index = AddUniqHash(&streams.Front(), sortedHashes, siOld.Hash, -1);
+      const int index = AddUniqHash(streams.ConstData(), sortedHashes, siOld.Hash, -1);
       // we must have written that stream already
       if (index == -1)
         return E_FAIL;
@@ -1655,7 +1618,7 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
         Byte hash[kHashSize];
         sha1.Final(hash);
         
-        int index = AddUniqHash(&streams.Front(), sortedHashes, hash, (int)streams.Size());
+        int index = AddUniqHash(streams.ConstData(), sortedHashes, hash, (int)streams.Size());
 
         if (index != -1)
           streams[index].RefCount++;
@@ -1684,13 +1647,13 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
       }
       else
       {
-        inShaStreamSpec->SetStream(fileInStream);
+        inShaStream->SetStream(fileInStream);
 
         CMyComPtr<IInStream> inSeekStream;
         fileInStream.QueryInterface(IID_IInStream, (void **)&inSeekStream);
         
         fileInStream.Release();
-        inShaStreamSpec->Init();
+        inShaStream->Init();
         UInt64 offsetBlockSize = 0;
         /*
         if (useResourceCompression)
@@ -1711,16 +1674,16 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
         
         if (inSeekStream /* && !sortedHashes.IsEmpty() */)
         {
-          RINOK(copyCoder->Code(inShaStream, NULL, NULL, NULL, progress))
-          size = copyCoderSpec->TotalSize;
+          RINOK(copyCoder.Interface()->Code(inShaStream, NULL, NULL, NULL, lps))
+          size = copyCoder->TotalSize;
           if (size == 0)
             needWritePass = false;
           else
           {
             Byte hash[kHashSize];
-            inShaStreamSpec->Final(hash);
+            inShaStream->Final(hash);
 
-            index = AddUniqHash(&streams.Front(), sortedHashes, hash, -1);
+            index = AddUniqHash(streams.ConstData(), sortedHashes, hash, -1);
             if (index != -1)
             {
               streams[index].RefCount++;
@@ -1729,15 +1692,15 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
             else
             {
               RINOK(InStream_SeekToBegin(inSeekStream))
-              inShaStreamSpec->Init();
+              inShaStream->Init();
             }
           }
         }
         
         if (needWritePass)
         {
-          RINOK(copyCoder->Code(inShaStream, outStream, NULL, NULL, progress))
-          size = copyCoderSpec->TotalSize;
+          RINOK(copyCoder.Interface()->Code(inShaStream, outStream, NULL, NULL, lps))
+          size = copyCoder->TotalSize;
         }
        
         if (size != 0)
@@ -1746,9 +1709,9 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
           {
             Byte hash[kHashSize];
             const UInt64 packSize = offsetBlockSize + size;
-            inShaStreamSpec->Final(hash);
+            inShaStream->Final(hash);
             
-            index = AddUniqHash(&streams.Front(), sortedHashes, hash, (int)streams.Size());
+            index = AddUniqHash(streams.ConstData(), sortedHashes, hash, (int)streams.Size());
             
             if (index != -1)
             {
@@ -1805,8 +1768,8 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
       
       RINOK(InStream_SeekSet(_volumes[1].Stream, s.Resource.Offset))
       inStreamLimitedSpec->Init(s.Resource.PackSize);
-      RINOK(copyCoder->Code(inStreamLimited, outStream, NULL, NULL, progress))
-      if (copyCoderSpec->TotalSize != s.Resource.PackSize)
+      RINOK(copyCoder.Interface()->Code(inStreamLimited, outStream, NULL, NULL, lps))
+      if (copyCoder->TotalSize != s.Resource.PackSize)
         return E_FAIL;
 
       s.Resource.Offset = curPos;
@@ -1874,7 +1837,7 @@ Z7_COM7F_IMF(CHandler::UpdateItems(ISequentialOutStream *outSeqStream, UInt32 nu
       Set32((Byte *)meta, (UInt32)pos) // size of security data
     }
     
-    db.Hashes = &streams.Front();
+    db.Hashes = streams.ConstData();
     db.WriteTree(tree, (Byte *)meta, pos);
 
     {