Revert "Update unrar to 7.1.5"

This reverts commit cb7782e.

The upgrade is problematic, it will be reviewed and re-attempted later. For now, we want a working next build.

Author: Dutchman101

vendor/unrar/arccmt.cpp

@@ -36,12 +36,7 @@ bool Archive::DoGetComment(std::wstring &CmtData)
     {
       // Current (RAR 3.0+) version of archive comment.
       Seek(GetStartPos(),SEEK_SET);
-      if (SearchSubBlock(SUBHEAD_TYPE_CMT)!=0)
-        if (ReadCommentData(CmtData))
-          return true;
-        else
-          uiMsg(UIERROR_CMTBROKEN,FileName);
-      return false;
+      return SearchSubBlock(SUBHEAD_TYPE_CMT)!=0 && ReadCommentData(CmtData);
     }
 #ifndef SFX_MODULE
     // Old style (RAR 2.9) comment header embedded into the main 

vendor/unrar/archive.cpp

@@ -26,12 +26,10 @@ Archive::Archive(CommandData *InitCmd)
   FailedHeaderDecryption=false;
   BrokenHeader=false;
   LastReadBlock=0;
-  CurHeaderType=HEAD_UNKNOWN;
 
   CurBlockPos=0;
   NextBlockPos=0;
 
-  RecoveryPercent=-1;
 
   MainHead.Reset();
   CryptHead={};
@@ -69,7 +67,7 @@ void Archive::CheckArc(bool EnableBroken)
     // password is incorrect.
     if (!FailedHeaderDecryption)
       uiMsg(UIERROR_BADARCHIVE,FileName);
-    ErrHandler.Exit(RARX_BADARC);
+    ErrHandler.Exit(RARX_FATAL);
   }
 }
 
@@ -111,11 +109,9 @@ RARFORMAT Archive::IsSignature(const byte *D,size_t Size)
         // We check the last signature byte, so we can return a sensible
         // warning in case we'll want to change the archive format
         // sometimes in the future.
-#ifndef SFX_MODULE
         if (D[6]==0)
           Type=RARFMT15;
         else
-#endif
           if (D[6]==1)
             Type=RARFMT50;
           else

vendor/unrar/archive.hpp

@@ -47,7 +47,6 @@ class Archive:public File
     bool DummyCmd;
     CommandData *Cmd;
 
-    int RecoveryPercent;
 
     RarTime LatestTime;
     int LastReadBlock;
@@ -59,14 +58,13 @@ class Archive:public File
     bool ProhibitQOpen;
 #endif
   public:
-    Archive(CommandData *InitCmd=nullptr);
+    Archive(CommandData *InitCmd=NULL);
     ~Archive();
     static RARFORMAT IsSignature(const byte *D,size_t Size);
     bool IsArchive(bool EnableBroken);
     size_t SearchBlock(HEADER_TYPE HeaderType);
     size_t SearchSubBlock(const wchar *Type);
     size_t SearchRR();
-    int GetRecoveryPercent() {return RecoveryPercent;}
     size_t ReadHeader();
     void CheckArc(bool EnableBroken);
     void CheckOpen(const std::wstring &Name);
@@ -149,9 +147,6 @@ class Archive:public File
     bool NewArchive;
 
     std::wstring FirstVolumeName;
-#ifdef PROPAGATE_MOTW
-    MarkOfTheWeb Motw;
-#endif
 };
 
 

vendor/unrar/arcread.cpp

@@ -20,10 +20,10 @@ size_t Archive::ReadHeader()
     case RARFMT14:
       ReadSize=ReadHeader14();
       break;
+#endif
     case RARFMT15:
       ReadSize=ReadHeader15();
       break;
-#endif
     case RARFMT50:
       ReadSize=ReadHeader50();
       break;
@@ -106,9 +106,6 @@ void Archive::UnexpEndArcMsg()
   if (CurBlockPos!=ArcSize || NextBlockPos!=ArcSize)
   {
     uiMsg(UIERROR_UNEXPEOF,FileName);
-    if (CurHeaderType!=HEAD_FILE && CurHeaderType!=HEAD_UNKNOWN)
-      uiMsg(UIERROR_TRUNCSERVICE,FileName,SubHead.FileName);
-
     ErrHandler.SetErrorCode(RARX_WARNING);
   }
 }
@@ -140,7 +137,6 @@ inline int64 SafeAdd(int64 v1,int64 v2,int64 f)
 }
 
 
-#ifndef SFX_MODULE
 size_t Archive::ReadHeader15()
 {
   RawRead Raw(this);
@@ -149,7 +145,7 @@ size_t Archive::ReadHeader15()
 
   if (Decrypt)
   {
-#ifdef RAR_NOCRYPT // For rarext.dll, Setup.SFX and unrar_nocrypt.dll.
+#ifdef RAR_NOCRYPT // For rarext.dll and unrar_nocrypt.dll.
     return 0;
 #else
     RequestArcPassword(NULL);
@@ -549,7 +545,6 @@ size_t Archive::ReadHeader15()
 
   return Raw.Size();
 }
-#endif // #ifndef SFX_MODULE
 
 
 size_t Archive::ReadHeader50()
@@ -745,15 +740,10 @@ size_t Archive::ReadHeader50()
           byte csum[SIZE_PSWCHECK_CSUM];
           Raw.GetB(csum,SIZE_PSWCHECK_CSUM);
 
-// Exclude this code for rarext.dll, Setup.SFX and unrar_nocrypt.dll linked
-// without sha256. But still set Encrypted=true for rarext.dll here,
-// so it can recognize encrypted header archives in archive properties.
-#ifndef RAR_NOCRYPT
           byte Digest[SHA256_DIGEST_SIZE];
           sha256_get(CryptHead.PswCheck, SIZE_PSWCHECK, Digest);
 
           CryptHead.UsePswCheck=memcmp(csum,Digest,SIZE_PSWCHECK_CSUM)==0;
-#endif
         }
         Encrypted=true;
       }
@@ -904,16 +894,6 @@ size_t Archive::ReadHeader50()
         if (!FileBlock && hd->CmpName(SUBHEAD_TYPE_CMT))
           MainComment=true;
 
-        // For RAR5 format we read the user specified recovery percent here.
-        if (!FileBlock && hd->CmpName(SUBHEAD_TYPE_RR) && hd->SubData.size()>0)
-        {
-          // It is stored as a single byte up to RAR 6.02 and as vint since
-          // 6.10, where we extended the maximum RR size from 99% to 1000%.
-          RawRead RawPercent;
-          RawPercent.Read(hd->SubData.data(),hd->SubData.size());
-          RecoveryPercent=(int)RawPercent.GetV();
-
-        }
 
         if (BadCRC) // Add the file name to broken header message displayed above.
           uiMsg(UIERROR_FHEADERBROKEN,Archive::FileName,hd->FileName);
@@ -1056,30 +1036,22 @@ void Archive::ProcessExtra50(RawRead *Raw,size_t ExtraSize,const BaseBlock *bb)
       FileHeader *hd=(FileHeader *)bb;
       switch(FieldType)
       {
-#ifndef RAR_NOCRYPT // Except rarext.dll, Setup.SFX and unrar_nocrypt.dll.
         case FHEXTRA_CRYPT:
           {
             FileHeader *hd=(FileHeader *)bb;
             uint EncVersion=(uint)Raw->GetV();
             if (EncVersion>CRYPT_VERSION)
-            {
               UnkEncVerMsg(hd->FileName,L"x" + std::to_wstring(EncVersion));
-              hd->CryptMethod=CRYPT_UNKNOWN;
-            }
             else
             {
               uint Flags=(uint)Raw->GetV();
+              hd->UsePswCheck=(Flags & FHEXTRA_CRYPT_PSWCHECK)!=0;
+              hd->UseHashKey=(Flags & FHEXTRA_CRYPT_HASHMAC)!=0;
               hd->Lg2Count=Raw->Get1();
               if (hd->Lg2Count>CRYPT5_KDF_LG2_COUNT_MAX)
-              {
                 UnkEncVerMsg(hd->FileName,L"xc" + std::to_wstring(hd->Lg2Count));
-                hd->CryptMethod=CRYPT_UNKNOWN;
-              }
               else
               {
-                hd->UsePswCheck=(Flags & FHEXTRA_CRYPT_PSWCHECK)!=0;
-                hd->UseHashKey=(Flags & FHEXTRA_CRYPT_HASHMAC)!=0;
-
                 Raw->GetB(hd->Salt,SIZE_SALT50);
                 Raw->GetB(hd->InitV,SIZE_INITV);
                 if (hd->UsePswCheck)
@@ -1113,7 +1085,6 @@ void Archive::ProcessExtra50(RawRead *Raw,size_t ExtraSize,const BaseBlock *bb)
             }
           }
           break;
-#endif
         case FHEXTRA_HASH:
           {
             FileHeader *hd=(FileHeader *)bb;
@@ -1318,7 +1289,7 @@ size_t Archive::ReadHeader14()
     std::string FileName(NameSize,0);
     Raw.GetB((byte *)&FileName[0],NameSize);
     std::string NameA;
-    OemToExt(FileName,NameA);
+    IntToExt(FileName,NameA);
     CharToWide(NameA,FileHead.FileName);
     ConvertNameCase(FileHead.FileName);
     ConvertFileHeader(&FileHead);

vendor/unrar/blake2s.hpp

@@ -5,9 +5,12 @@
 #define BLAKE2_DIGEST_SIZE 32
 #define BLAKE2_THREADS_NUMBER 8
 
-// Use constexpr instead of enums for -std=c++20 compatibility.
-constexpr size_t BLAKE2S_BLOCKBYTES = 64;
-constexpr size_t BLAKE2S_OUTBYTES = 32;
+enum blake2s_constant
+{
+  BLAKE2S_BLOCKBYTES = 64,
+  BLAKE2S_OUTBYTES   = 32
+};
+
 
 // Alignment to 64 improves performance of both SSE and non-SSE versions.
 // Alignment to n*16 is required for SSE version, so we selected 64.

vendor/unrar/cmddata.cpp

@@ -38,9 +38,6 @@ void CommandData::Init()
   InclArgs.Reset();
   ArcNames.Reset();
   StoreArgs.Reset();
-#ifdef PROPAGATE_MOTW
-  MotwList.Reset();
-#endif
   Password.Clean();
   NextVolSizes.clear();
 #ifdef RARDLL
@@ -192,7 +189,7 @@ void CommandData::ParseDone()
 #if !defined(SFX_MODULE)
 void CommandData::ParseEnvVar()
 {
-  char *EnvVar=getenv("RARINISWITCHES");
+  char *EnvVar=getenv("RAR");
   if (EnvVar!=NULL)
   {
     std::wstring EnvStr;
@@ -296,9 +293,6 @@ void CommandData::ProcessSwitchesString(const std::wstring &Str)
 void CommandData::ProcessSwitch(const wchar *Switch)
 {
 
-  if (LargePageAlloc::ProcessSwitch(this,Switch))
-    return;
-
   switch(toupperw(Switch[0]))
   {
     case '@':
@@ -625,6 +619,8 @@ void CommandData::ProcessSwitch(const wchar *Switch)
               }
             }
           break;
+        case 'M':
+          break;
         case 'D':
           {
             bool SetDictLimit=toupperw(Switch[2])=='X';
@@ -669,30 +665,33 @@ void CommandData::ProcessSwitch(const wchar *Switch)
           if (toupperw(Switch[2])=='S' && Switch[3]==0)
             SkipEncrypted=true;
           break;
-        case 'L':
-          if (toupperw(Switch[2])=='P')
+        case 'S':
           {
-            UseLargePages=true;
-            if (!LargePageAlloc::IsPrivilegeAssigned() && LargePageAlloc::AssignConfirmation())
+            std::wstring StoreNames=(Switch[2]==0 ? DefaultStoreList:Switch+2);
+            size_t Pos=0;
+            while (Pos<StoreNames.size())
             {
-              LargePageAlloc::AssignPrivilege();
-
-              // Quit immediately. We do not want to interrupt the current copy
-              // archive processing with reboot after assigning privilege.
-              SetupComplete=true;
+              if (StoreNames[Pos]=='.')
+                Pos++;
+              size_t EndPos=StoreNames.find(';',Pos);
+              std::wstring Mask=StoreNames.substr(Pos,EndPos==std::wstring::npos ? EndPos:EndPos-Pos);
+              if (Mask.find_first_of(L"*?.")==std::wstring::npos)
+                Mask.insert(0,L"*.");
+              StoreArgs.AddString(Mask);
+              if (EndPos==std::wstring::npos)
+                break;
+              Pos=EndPos+1;
             }
           }
           break;
-        case 'M':
-          break;
-        case 'S':
-          GetBriefMaskList(Switch[2]==0 ? DefaultStoreList:Switch+2,StoreArgs);
-          break;
 #ifdef RAR_SMP
         case 'T':
           Threads=atoiw(Switch+2);
           if (Threads>MaxPoolThreads || Threads<1)
             BadSwitch(Switch);
+          else
+          {
+          }
           break;
 #endif
         default:
@@ -753,18 +752,6 @@ void CommandData::ProcessSwitch(const wchar *Switch)
             }
           break;
 #endif
-#ifdef PROPAGATE_MOTW
-        case 'M':
-          {
-            MotwAllFields=Switch[2]=='1';
-            const wchar *Sep=wcschr(Switch+2,'=');
-            if (Switch[2]=='-')
-              MotwList.Reset();
-            else
-              GetBriefMaskList(Sep==nullptr ? L"*":Sep+1,MotwList);
-          }
-          break;
-#endif
 #ifdef _WIN_ALL
         case 'N':
           if (toupperw(Switch[2])=='I')
@@ -1046,11 +1033,6 @@ void CommandData::ProcessCommand()
 #ifndef SFX_MODULE
 
   const wchar *SingleCharCommands=L"FUADPXETK";
-
-  // RAR -mlp command is the legitimate way to assign the required privilege.
-  if (Command.empty() && UseLargePages || SetupComplete)
-    return;
-
   if (Command[0]!=0 && Command[1]!=0 && wcschr(SingleCharCommands,Command[0])!=NULL || ArcName.empty())
     OutHelp(Command.empty() ? RARX_SUCCESS:RARX_USERERROR); // Return 'success' for 'rar' without parameters.
 
@@ -1114,18 +1096,8 @@ void CommandData::ProcessCommand()
       OutHelp(RARX_USERERROR);
 #endif
   }
-
-  // Since messages usually include '\n' in the beginning, we also issue
-  // the final '\n'. It is especially important in Unix, where otherwise
-  // the shell can display the prompt on the same line as the last message.
-  // mprintf is blocked with -idq and if error messages had been displayed
-  // in this mode, we use eprintf to separate them from shell prompt.
-  // If nothing was displayed with -idq, we avoid the excessive empty line.
   if (!BareOutput)
-    if (MsgStream==MSG_ERRONLY && IsConsoleOutputPresent())
-      eprintf(L"\n");
-    else
-      mprintf(L"\n");
+    mprintf(L"\n");
 }
 
 
@@ -1259,25 +1231,5 @@ int64 CommandData::GetVolSize(const wchar *S,uint DefMultiplier)
 }
 
 
-// Treat the list like rar;zip as *.rar;*.zip for -ms and similar switches.
-void CommandData::GetBriefMaskList(const std::wstring &Masks,StringList &Args)
-{
-  size_t Pos=0;
-  while (Pos<Masks.size())
-  {
-    if (Masks[Pos]=='.')
-      Pos++;
-    size_t EndPos=Masks.find(';',Pos);
-    std::wstring Mask=Masks.substr(Pos,EndPos==std::wstring::npos ? EndPos:EndPos-Pos);
-    if (Mask.find_first_of(L"*?.")==std::wstring::npos)
-      Mask.insert(0,L"*.");
-    Args.AddString(Mask);
-    if (EndPos==std::wstring::npos)
-      break;
-    Pos=EndPos+1;
-  }
-}
-
-