16.0216.02

5 files changed, 16 insertions, 11 deletions

diff --git a/CPP/7zip/Archive/Rar/RarHandler.cpp b/CPP/7zip/Archive/Rar/RarHandler.cpp
index 71237c93..e858c1ea 100644
--- a/CPP/7zip/Archive/Rar/RarHandler.cpp
+++ b/CPP/7zip/Archive/Rar/RarHandler.cpp
@@ -220,6 +220,8 @@ HRESULT CInArchive::Open(IInStream *stream, const UInt64 *searchHeaderSizeLimit)
   ArcInfo.Flags = Get16(buf + 3);
 
   UInt32 headerSize = NHeader::NArchive::kArchiveHeaderSize;
+  
+  /*
   if (ArcInfo.IsThereEncryptVer())
   {
     if (blockSize <= headerSize)
@@ -229,6 +231,8 @@ HRESULT CInArchive::Open(IInStream *stream, const UInt64 *searchHeaderSizeLimit)
     ArcInfo.EncryptVersion = buf[NHeader::NArchive::kArchiveHeaderSize];
     headerSize += 1;
   }
+  */
+  
   if (blockSize < headerSize
       || buf[2] != NHeader::NBlockType::kArchiveHeader
       || !CheckHeaderCrc(buf, headerSize))
@@ -509,7 +513,7 @@ HRESULT CInArchive::GetNextItem(CItem &item, ICryptoGetTextPassword *getTextPass
         m_RarAESSpec = new NCrypto::NRar3::CDecoder;
         m_RarAES = m_RarAESSpec;
       }
-      m_RarAESSpec->SetRar350Mode(ArcInfo.IsEncryptOld());
+      // m_RarAESSpec->SetRar350Mode(ArcInfo.IsEncryptOld());
 
       // Salt
       const UInt32 kSaltSize = 8;
@@ -1552,7 +1556,7 @@ STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems,
           rar3CryptoDecoderSpec = new NCrypto::NRar3::CDecoder;
           rar3CryptoDecoder = rar3CryptoDecoderSpec;
         }
-        rar3CryptoDecoderSpec->SetRar350Mode(item.UnPackVersion < 36);
+        // rar3CryptoDecoderSpec->SetRar350Mode(item.UnPackVersion < 36);
         /*
         CMyComPtr<ICompressSetDecoderProperties2> cryptoProperties;
         RINOK(rar3CryptoDecoder.QueryInterface(IID_ICompressSetDecoderProperties2,
diff --git a/CPP/7zip/Archive/Rar/RarHandler.h b/CPP/7zip/Archive/Rar/RarHandler.h
index e280eb57..901406d4 100644
--- a/CPP/7zip/Archive/Rar/RarHandler.h
+++ b/CPP/7zip/Archive/Rar/RarHandler.h
@@ -41,9 +41,9 @@ struct CInArcInfo
   bool IsRecovery()         const { return (Flags & NHeader::NArchive::kRecovery) != 0; }
   bool IsEncrypted()        const { return (Flags & NHeader::NArchive::kBlockEncryption) != 0; }
   bool IsFirstVolume()      const { return (Flags & NHeader::NArchive::kFirstVolume) != 0; }
-  bool IsThereEncryptVer()  const { return (Flags & NHeader::NArchive::kEncryptVer) != 0; }
 
-  bool IsEncryptOld()       const { return (!IsThereEncryptVer() || EncryptVersion < 36); }
+  // bool IsThereEncryptVer()  const { return (Flags & NHeader::NArchive::kEncryptVer) != 0; }
+  // bool IsEncryptOld()       const { return (!IsThereEncryptVer() || EncryptVersion < 36); }
 
   bool AreMoreVolumes()       const { return (EndFlags & NHeader::NArchive::kEndOfArc_Flags_NextVol) != 0; }
   bool Is_VolNumber_Defined() const { return (EndFlags & NHeader::NArchive::kEndOfArc_Flags_VolNumber) != 0; }
diff --git a/CPP/7zip/Archive/Rar/RarHeader.h b/CPP/7zip/Archive/Rar/RarHeader.h
index b518338a..30c53ec9 100644
--- a/CPP/7zip/Archive/Rar/RarHeader.h
+++ b/CPP/7zip/Archive/Rar/RarHeader.h
@@ -41,7 +41,8 @@ namespace NArchive
   const UInt16 kRecovery = 0x40;
   const UInt16 kBlockEncryption  = 0x80;
   const UInt16 kFirstVolume = 0x100; // (set only by RAR 3.0 and later)
-  const UInt16 kEncryptVer = 0x200; // RAR 3.6 there is EncryptVer Byte in End of MainHeader
+
+  // const UInt16 kEncryptVer = 0x200; // RAR 3.6 : that feature was discarded by origial RAR
 
   const UInt16 kEndOfArc_Flags_NextVol   = 1;
   const UInt16 kEndOfArc_Flags_DataCRC   = 2;
diff --git a/CPP/7zip/Archive/SplitHandler.cpp b/CPP/7zip/Archive/SplitHandler.cpp
index 4ca417e0..72b52fe7 100644
--- a/CPP/7zip/Archive/SplitHandler.cpp
+++ b/CPP/7zip/Archive/SplitHandler.cpp
@@ -203,7 +203,7 @@ HRESULT CHandler::Open2(IInStream *stream, IArchiveOpenCallback *callback)
   _streams.Add(stream);
   
   {
-    UInt64 numFiles = _streams.Size();
+    const UInt64 numFiles = _streams.Size();
     RINOK(callback->SetCompleted(&numFiles, NULL));
   }
   
@@ -218,7 +218,7 @@ HRESULT CHandler::Open2(IInStream *stream, IArchiveOpenCallback *callback)
       break;
     if (result != S_OK)
       return result;
-    if (!stream)
+    if (!nextStream)
       break;
     {
       /*
@@ -228,14 +228,14 @@ HRESULT CHandler::Open2(IInStream *stream, IArchiveOpenCallback *callback)
         return E_INVALIDARG;
       size = prop.uhVal.QuadPart;
       */
-      RINOK(stream->Seek(0, STREAM_SEEK_END, &size));
-      RINOK(stream->Seek(0, STREAM_SEEK_SET, NULL));
+      RINOK(nextStream->Seek(0, STREAM_SEEK_END, &size));
+      RINOK(nextStream->Seek(0, STREAM_SEEK_SET, NULL));
     }
     _totalSize += size;
     _sizes.Add(size);
     _streams.Add(nextStream);
     {
-      UInt64 numFiles = _streams.Size();
+      const UInt64 numFiles = _streams.Size();
       RINOK(callback->SetCompleted(&numFiles, NULL));
     }
   }
diff --git a/CPP/7zip/Archive/Wim/WimHandler.cpp b/CPP/7zip/Archive/Wim/WimHandler.cpp
index d4f53b9c..27d3298a 100644
--- a/CPP/7zip/Archive/Wim/WimHandler.cpp
+++ b/CPP/7zip/Archive/Wim/WimHandler.cpp
@@ -388,7 +388,7 @@ static void MethodToProp(int method, int chunksSizeBits, NCOM::CPropVariant &pro
     char temp[32];
     
     if ((unsigned)method < ARRAY_SIZE(k_Methods))
-      strcpy(temp, k_Methods[method]);
+      strcpy(temp, k_Methods[(unsigned)method]);
     else
       ConvertUInt32ToString((unsigned)method, temp);