v6.1.2: Extracted from https://www.rarlab.com/rar/unrarsrc-6.1.2.tar.gz (#34)

aawc · web-flow · commit 6dd904ac19b2 · 2022-05-10T02:56:16.000-07:00
diff --git a/acknow.txt b/acknow.txt
@@ -1,59 +1,59 @@
-                           ACKNOWLEDGMENTS
-
-* We used "Screaming Fast Galois Field Arithmetic Using Intel
-  SIMD Instructions" paper by James S. Plank, Kevin M. Greenan
-  and Ethan L. Miller to improve Reed-Solomon coding performance.
-  Also we are grateful to Artem Drobanov and Bulat Ziganshin
-  for samples and ideas allowed to make Reed-Solomon coding
-  more efficient.
-
-* RAR4 text compression algorithm is based on Dmitry Shkarin PPMII
-  and Dmitry Subbotin carryless rangecoder public domain source code.
-  You can find it in ftp.elf.stuba.sk/pub/pc/pack.
-
-* RAR encryption includes parts of public domain code
-  from Szymon Stefanek AES and Steve Reid SHA-1 implementations.
-
-* With exception of SFX modules, RAR uses CRC32 function based
-  on Intel Slicing-by-8 algorithm. Original Intel Slicing-by-8 code
-  is available here:
-
-    https://sourceforge.net/projects/slicing-by-8/
-
-  Original Intel Slicing-by-8 code is licensed under BSD License
-  available at http://www.opensource.org/licenses/bsd-license.html
-
-    Copyright (c) 2004-2006 Intel Corporation. 
-    All Rights Reserved
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-    
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer
-    in the documentation and/or other materials provided with
-    the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-    FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-    OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
-* RAR archives may optionally include BLAKE2sp hash ( https://blake2.net ),
-  designed by Jean-Philippe Aumasson, Samuel Neves, Zooko Wilcox-O'Hearn
-  and Christian Winnerlein.
-
-* Useful hints provided by Alexander Khoroshev and Bulat Ziganshin allowed
-  to significantly improve RAR compression and speed.
+                           ACKNOWLEDGMENTS
+
+* We used "Screaming Fast Galois Field Arithmetic Using Intel
+  SIMD Instructions" paper by James S. Plank, Kevin M. Greenan
+  and Ethan L. Miller to improve Reed-Solomon coding performance.
+  Also we are grateful to Artem Drobanov and Bulat Ziganshin
+  for samples and ideas allowed to make Reed-Solomon coding
+  more efficient.
+
+* RAR4 text compression algorithm is based on Dmitry Shkarin PPMII
+  and Dmitry Subbotin carryless rangecoder public domain source code.
+  You can find it in ftp.elf.stuba.sk/pub/pc/pack.
+
+* RAR encryption includes parts of public domain code
+  from Szymon Stefanek AES and Steve Reid SHA-1 implementations.
+
+* With exception of SFX modules, RAR uses CRC32 function based
+  on Intel Slicing-by-8 algorithm. Original Intel Slicing-by-8 code
+  is available here:
+
+    https://sourceforge.net/projects/slicing-by-8/
+
+  Original Intel Slicing-by-8 code is licensed under BSD License
+  available at http://www.opensource.org/licenses/bsd-license.html
+
+    Copyright (c) 2004-2006 Intel Corporation. 
+    All Rights Reserved
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+    
+    Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer
+    in the documentation and/or other materials provided with
+    the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+    FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+    OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+* RAR archives may optionally include BLAKE2sp hash ( https://blake2.net ),
+  designed by Jean-Philippe Aumasson, Samuel Neves, Zooko Wilcox-O'Hearn
+  and Christian Winnerlein.
+
+* Useful hints provided by Alexander Khoroshev and Bulat Ziganshin allowed
+  to significantly improve RAR compression and speed.
diff --git a/arcmem.cpp b/arcmem.cpp
diff --git a/arcmem.hpp b/arcmem.hpp
diff --git a/dll.rc b/dll.rc
@@ -1,27 +1,28 @@
-#include <windows.h>
-#include <commctrl.h>
-
-VS_VERSION_INFO VERSIONINFO
+#include <windows.h>
+#include <commctrl.h>
+
+VS_VERSION_INFO VERSIONINFO
 FILEVERSION 6, 10, 2, 318
 PRODUCTVERSION 6, 10, 2, 318
-FILEOS VOS__WINDOWS32
-FILETYPE VFT_APP
-{
-  BLOCK "StringFileInfo"
-  {
-    BLOCK "040904E4"
-    {
-      VALUE "CompanyName", "Alexander Roshal\0"
-      VALUE "ProductName", "RAR decompression library\0"
-      VALUE "FileDescription", "RAR decompression library\0"
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+{
+  BLOCK "StringFileInfo"
+  {
+    BLOCK "040904E4"
+    {
+      VALUE "CompanyName", "Alexander Roshal\0"
+      VALUE "ProductName", "RAR decompression library\0"
+      VALUE "FileDescription", "RAR decompression library\0"
       VALUE "FileVersion", "6.10.2\0"
       VALUE "ProductVersion", "6.10.2\0"
-      VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2021\0"
-      VALUE "OriginalFilename", "Unrar.dll\0"
-    }
-  }
-  BLOCK "VarFileInfo"
-  {
-    VALUE "Translation", 0x0409, 0x04E4
-  }
-}
+      VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2021\0"
+      VALUE "OriginalFilename", "Unrar.dll\0"
+    }
+  }
+  BLOCK "VarFileInfo"
+  {
+    VALUE "Translation", 0x0409, 0x04E4
+  }
+}
+
diff --git a/extract.cpp b/extract.cpp
@@ -783,14 +783,6 @@ bool CmdExtract::ExtractCurrentFile(Archive &Arc,size_t HeaderSize,bool &Repeat)
       // both target and link attributes if PrepareToDelete() changed them.
       bool SetAttrOnly=LinkEntry && Arc.FileHead.RedirType==FSREDIR_HARDLINK && LinkSuccess;
 
-      // If we successfully unpacked a hard link, we wish to set its file
-      // attributes. Hard link shares file metadata with link target,
-      // so we do not need to set link time or owner. But when we overwrite
-      // an existing link, we can call PrepareToDelete(), which affects
-      // link target attributes as well. So we set link attributes to restore
-      // both target and link attributes if PrepareToDelete() changed them.
-      bool SetAttrOnly=LinkEntry && Arc.FileHead.RedirType==FSREDIR_HARDLINK && LinkSuccess;
-
       if (!TestMode && (Command=='X' || Command=='E') &&
           (!LinkEntry || SetAttrOnly || Arc.FileHead.RedirType==FSREDIR_FILECOPY && LinkSuccess) && 
           (!BrokenFile || Cmd->KeepBroken))
@@ -1049,11 +1041,7 @@ bool CmdExtract::ExtrGetPassword(Archive &Arc,const wchar *ArcFileName)
     if (!uiGetPassword(UIPASSWORD_FILE,ArcFileName,&Cmd->Password)/* || !Cmd->Password.IsSet()*/)
     {
       // Suppress "test is ok" message if user cancelled the password prompt.
-// 2019.03.23: If some archives are tested ok and prompt is cancelled for others,
-// do we really need to suppress "test is ok"? Also if we set an empty password
-// and "Use for all archives" in WinRAR Ctrl+P and skip some encrypted archives.
-// We commented out this UIERROR_INCERRCOUNT for now.
-//      uiMsg(UIERROR_INCERRCOUNT);
+      uiMsg(UIERROR_INCERRCOUNT);
       return false;
     }
     Cmd->ManualPassword=true;
diff --git a/loclang.hpp b/loclang.hpp
@@ -393,4 +393,4 @@
 #define   MTruncPsw          L"\nPassword exceeds the maximum allowed length of %u characters and will be truncated."
 #define   MAdjustValue       L"\nAdjusting %s value to %s."
 #define   MOpFailed          L"\nOperation failed"
-#define   MSkipEncArc        L"\nSkipping the encrypted archive %s"
+#define   MSkipEncArc        L"\nSkipping the encrypted archive %s"
diff --git a/savepos.hpp b/savepos.hpp
diff --git a/unicode.cpp b/unicode.cpp
@@ -603,3 +603,4 @@ char* SupportDBCS::charnext(const char *s)
 }
 #endif
 
+
diff --git a/version.hpp b/version.hpp
@@ -3,4 +3,4 @@
 #define RARVER_BETA      2
 #define RARVER_DAY      15
 #define RARVER_MONTH    11
-#define RARVER_YEAR   2021
+#define RARVER_YEAR   2021

Original file line number	Diff line number	Diff line change
`@@ -603,3 +603,4 @@ char* SupportDBCS::charnext(const char *s)`
`603`	`603`	`}`
`604`	`604`	`#endif`
`605`	`605`
	`606`	`+`