unrar update 7.0.7

CMakeLists.txt

@@ -83,7 +83,7 @@ endif()
 
 set(UNRAR_VERSION_MAJOR 7)
 set(UNRAR_VERSION_MINOR 0)
-set(UNRAR_VERSION_PATCH 6)
+set(UNRAR_VERSION_PATCH 7)
 set(PACKAGE_VERSION "${UNRAR_VERSION_MAJOR}.${UNRAR_VERSION_MINOR}.${UNRAR_VERSION_PATCH}")
 
 string(TOLOWER "${CMAKE_C_COMPILER_ARCHITECTURE_ID}" UNRAR_ARCH_NAME)

unrar/dll.cpp

@@ -390,6 +390,10 @@ int PASCAL ProcessFile(HANDLE hArcData,int Operation,char *DestPath,char *DestNa
       Data->Extract.ExtractCurrentFile(Data->Arc,Data->HeaderSize,Repeat);
 
       // Now we process extra file information if any.
+      // It is important to do it in the same ProcessFile(), because caller
+      // app can rely on this behavior, for example, to overwrite
+      // the extracted Mark of the Web with propagated from archive
+      // immediately after ProcessFile() call.
       //
       // Archive can be closed if we process volumes, next volume is missing
       // and current one is already removed or deleted. So we need to check

unrar/dll.rc

@@ -2,8 +2,8 @@
 #include <commctrl.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 7, 0, 4, 1121
-PRODUCTVERSION 7, 0, 4, 1121
+FILEVERSION 7, 0, 100, 1154
+PRODUCTVERSION 7, 0, 100, 1154
 FILEOS VOS__WINDOWS32
 FILETYPE VFT_APP
 {
@@ -14,9 +14,9 @@ FILETYPE VFT_APP
       VALUE "CompanyName", "Alexander Roshal\0"
       VALUE "ProductName", "RAR decompression library\0"
       VALUE "FileDescription", "RAR decompression library\0"
-      VALUE "FileVersion", "7.0.4\0"
-      VALUE "ProductVersion", "7.0.4\0"
-      VALUE "LegalCopyright", "Copyright © Alexander Roshal 1993-2024\0"
+      VALUE "FileVersion", "7.0.0\0"
+      VALUE "ProductVersion", "7.0.0\0"
+      VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2024\0"
       VALUE "OriginalFilename", "Unrar.dll\0"
     }
   }

unrar/scantree.cpp

@@ -104,10 +104,10 @@ bool ScanTree::ExpandFolderMask()
     {
       FD.Name+=CurMask.substr(SlashPos);
 
-      // Treat dir*\* or dir*\*.* as dir, so empty 'dir' is also matched
+      // Treat dir*\*, dir*\*.* or dir*\ as dir, so empty 'dir' is also matched
       // by such mask. Skipping empty dir with dir*\*.* confused some users.
       std::wstring LastMask=PointToName(FD.Name);
-      if (LastMask==L"*" || LastMask==L"*.*")
+      if (LastMask==L"*" || LastMask==L"*.*" || LastMask.empty())
         RemoveNameFromPath(FD.Name);
 
       ExpandedFolderList.AddString(FD.Name);

unrar/unicode.cpp

@@ -677,8 +677,10 @@ int wcsnicomp(const wchar *s1,const wchar *s2,size_t n)
   // If we specify 'n' exceeding the actual string length, CompareString goes
   // beyond the trailing zero and compares garbage. So we need to limit 'n'
   // to real string length.
-  size_t l1=Min(wcslen(s1)+1,n);
-  size_t l2=Min(wcslen(s2)+1,n);
+  size_t sl1=wcslen(s1); // Pre-compute to not call wcslen() in Min() twice.
+  size_t l1=Min(sl1+1,n);
+  size_t sl2=wcslen(s2); // Pre-compute to not call wcslen() in Min() twice.
+  size_t l2=Min(sl2+1,n);
   return CompareStringW(LOCALE_USER_DEFAULT,NORM_IGNORECASE|SORT_STRINGSORT,s1,(int)l1,s2,(int)l2)-2;
 #else
   if (n==0)

unrar/unrar.rc

@@ -3,8 +3,8 @@
 #include "version.hpp"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 7, 0, 4, 1121
-PRODUCTVERSION 7, 0, 4, 1121
+FILEVERSION 7, 0, 100, 1154
+PRODUCTVERSION 7, 0, 100, 1154
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -21,12 +21,12 @@ BLOCK "000904b0"
 BEGIN
 VALUE "CompanyName", L"Alexander Roshal"
 VALUE "FileDescription", L"UnRAR freeware"
-VALUE "FileVersion", L"7.0.6"
+VALUE "FileVersion", L"7.0.7"
 VALUE "InternalName", L"unrar.exe"
 VALUE "LegalCopyright", L"Copyright © 1993-2024 Alexander Roshal"
 VALUE "OriginalFilename", L"unrar.exe"
 VALUE "ProductName", L"UnRAR freeware"
-VALUE "ProductVersion", L"7.0.6"
+VALUE "ProductVersion", L"7.0.7"
 END
 END
 BLOCK "VarFileInfo"

unrar/version.hpp

@@ -1,6 +1,6 @@
 #define RARVER_MAJOR     7
 #define RARVER_MINOR     0
-#define RARVER_BETA      4
-#define RARVER_DAY      24
-#define RARVER_MONTH     1
+#define RARVER_BETA      0
+#define RARVER_DAY      26
+#define RARVER_MONTH     2
 #define RARVER_YEAR   2024