Added unrar 6.0.2

Author: cataphract

unrar/consio.cpp

@@ -164,7 +164,7 @@ static void GetPasswordText(wchar *Str,uint MaxLength)
     SetConsoleMode(hConIn,ConInMode);
     SetConsoleMode(hConOut,ConOutMode);
 #else
-    char StrA[MAXPASSWORD];
+    char StrA[MAXPASSWORD*4]; // "*4" for multibyte UTF-8 characters.
 #if defined(_EMX) || defined (__VMS)
     fgets(StrA,ASIZE(StrA)-1,stdin);
 #elif defined(__sun)
@@ -248,6 +248,12 @@ bool getwstr(wchar *str,size_t n)
       ErrHandler.Exit(RARX_USERBREAK);
     }
     StrA[ReadSize]=0;
+
+    // We expect ANSI encoding here, but "echo text|rar ..." to pipe to RAR,
+    // such as send passwords, we get OEM encoding by default, unless we
+    // use "chcp" in console. But we avoid OEM to ANSI conversion,
+    // because we also want to handle ANSI files redirection correctly,
+    // like "rar ... < ansifile.txt".
     CharToWide(&StrA[0],str,n);
     cleandata(&StrA[0],StrA.Size()); // We can use this function to enter passwords.
   }

unrar/dll.rc

@@ -2,8 +2,8 @@
 #include <commctrl.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 6, 0, 1, 3589
-PRODUCTVERSION 6, 0, 1, 3589
+FILEVERSION 6, 0, 2, 3610
+PRODUCTVERSION 6, 0, 2, 3610
 FILEOS VOS__WINDOWS32
 FILETYPE VFT_APP
 {
@@ -14,8 +14,8 @@ FILETYPE VFT_APP
       VALUE "CompanyName", "Alexander Roshal\0"
       VALUE "ProductName", "RAR decompression library\0"
       VALUE "FileDescription", "RAR decompression library\0"
-      VALUE "FileVersion", "6.0.1\0"
-      VALUE "ProductVersion", "6.0.1\0"
+      VALUE "FileVersion", "6.0.2\0"
+      VALUE "ProductVersion", "6.0.2\0"
       VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2020\0"
       VALUE "OriginalFilename", "Unrar.dll\0"
     }

unrar/file.cpp

@@ -120,12 +120,12 @@ bool File::Open(const wchar *Name,uint Mode)
 #ifdef _OSF_SOURCE
   extern "C" int flock(int, int);
 #endif
-
   if (!OpenShared && UpdateMode && handle>=0 && flock(handle,LOCK_EX|LOCK_NB)==-1)
   {
     close(handle);
     return false;
   }
+
 #endif
   if (handle==-1)
     hNewFile=FILE_BAD_HANDLE;

unrar/loclang.hpp

@@ -352,7 +352,7 @@
 #define   MRecVolLimit       L"\nTotal number of usual and recovery volumes must not exceed %d"
 #define   MVolumeNumber      L"volume %d"
 #define   MCannotDelete      L"\nCannot delete %s"
-#define   MRecycleFailed     L"\nCannot move some files and folders to Recycle Bin"
+#define   MRecycleFailed     L"\nCannot move some files and directories to Recycle Bin"
 #define   MCalcCRC           L"\nCalculating the checksum"
 #define   MTooLargeSFXArc    L"\nToo large SFX archive. Windows cannot run the executable file exceeding 4 GB."
 #define   MCalcCRCAllVol     L"\nCalculating checksums of all volumes."

unrar/version.hpp

@@ -1,6 +1,6 @@
 #define RARVER_MAJOR     6
 #define RARVER_MINOR     0
-#define RARVER_BETA      1
-#define RARVER_DAY      22
-#define RARVER_MONTH    10
+#define RARVER_BETA      2
+#define RARVER_DAY      12
+#define RARVER_MONTH    11
 #define RARVER_YEAR   2020