diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-06-03 18:57:48 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-06-05 21:42:34 +0400 |
commit | 0de0acecff7c33a3dbf0a9d6d4f4e73de86b2566 (patch) | |
tree | 872d1b823a033298f941adf7cbf25a2d8ebd71e4 /src/thirdparty/unrar | |
parent | 62710faa36013e06e648bb9120fae29a1db06fd8 (diff) |
Update Unrar to v5.0.6.
Diffstat (limited to 'src/thirdparty/unrar')
-rw-r--r-- | src/thirdparty/unrar/arcread.cpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/cmddata.cpp | 8 | ||||
-rw-r--r-- | src/thirdparty/unrar/dll.rc | 8 | ||||
-rw-r--r-- | src/thirdparty/unrar/log.cpp | 4 | ||||
-rw-r--r-- | src/thirdparty/unrar/log.hpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/options.hpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/rar.cpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/unicode.cpp | 4 | ||||
-rw-r--r-- | src/thirdparty/unrar/version.hpp | 6 |
9 files changed, 23 insertions, 15 deletions
diff --git a/src/thirdparty/unrar/arcread.cpp b/src/thirdparty/unrar/arcread.cpp index 5c6549cf4..166c2f2ef 100644 --- a/src/thirdparty/unrar/arcread.cpp +++ b/src/thirdparty/unrar/arcread.cpp @@ -1279,7 +1279,7 @@ void Archive::ConvertFileHeader(FileHeader *hd) // This code must be performed only after other path separator checks, // because it produces backslashes illegal for some of checks above. // Backslash is allowed in file names in Unix, but not in Windows. - // Still, RAR 4.x use backslashes as path separator even in Unix. + // Still, RAR 4.x uses backslashes as path separator even in Unix. // Forward slash is not allowed in both systems. In RAR 5.0 we use // the forward slash as universal path separator. if (*s=='/' || *s=='\\' && Format!=RARFMT50) diff --git a/src/thirdparty/unrar/cmddata.cpp b/src/thirdparty/unrar/cmddata.cpp index e0190911a..b46e55fb2 100644 --- a/src/thirdparty/unrar/cmddata.cpp +++ b/src/thirdparty/unrar/cmddata.cpp @@ -217,13 +217,17 @@ bool CommandData::PreprocessSwitch(const wchar *Switch) // Ensure that correct log file name is already set // if we need to report an error when processing the command line. ProcessSwitch(Switch); - InitLogOptions(LogName); + InitLogOptions(LogName,ErrlogCharset); } #endif if (wcsnicomp(Switch,L"sc",2)==0) { // Process -sc before reading any file lists. ProcessSwitch(Switch); +#ifndef GUI + if (*LogName!=0) + InitLogOptions(LogName,ErrlogCharset); +#endif } } return true; @@ -738,7 +742,7 @@ void CommandData::ProcessSwitch(const wchar *Switch) }; if (!AlreadyBad) if (Switch[3]==0) - CommentCharset=FilelistCharset=rch; + CommentCharset=FilelistCharset=ErrlogCharset=rch; else for (uint I=3;Switch[I]!=0 && !AlreadyBad;I++) switch(toupperw(Switch[I])) diff --git a/src/thirdparty/unrar/dll.rc b/src/thirdparty/unrar/dll.rc index 4858a0bec..6d8c62e75 100644 --- a/src/thirdparty/unrar/dll.rc +++ b/src/thirdparty/unrar/dll.rc @@ -2,8 +2,8 @@ #include <commctrl.h>
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 5, 0, 4, 878
-PRODUCTVERSION 5, 0, 4, 878
+FILEVERSION 5, 0, 5, 885
+PRODUCTVERSION 5, 0, 5, 885
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", "5.0.4\0"
- VALUE "ProductVersion", "5.0.4\0"
+ VALUE "FileVersion", "5.0.5\0"
+ VALUE "ProductVersion", "5.0.5\0"
VALUE "LegalCopyright", "Copyright © Alexander Roshal 1993-2013\0"
VALUE "OriginalFilename", "Unrar.dll\0"
}
diff --git a/src/thirdparty/unrar/log.cpp b/src/thirdparty/unrar/log.cpp index b84980116..965c16ce6 100644 --- a/src/thirdparty/unrar/log.cpp +++ b/src/thirdparty/unrar/log.cpp @@ -2,10 +2,12 @@ static wchar LogName[NM]; +static RAR_CHARSET LogCharset=RCH_DEFAULT; -void InitLogOptions(const wchar *LogFileName) +void InitLogOptions(const wchar *LogFileName,RAR_CHARSET CSet) { wcsncpyz(LogName,LogFileName,ASIZE(LogName)); + LogCharset=CSet; } diff --git a/src/thirdparty/unrar/log.hpp b/src/thirdparty/unrar/log.hpp index c10c5c873..008ef11a0 100644 --- a/src/thirdparty/unrar/log.hpp +++ b/src/thirdparty/unrar/log.hpp @@ -1,7 +1,7 @@ #ifndef _RAR_LOG_ #define _RAR_LOG_ -void InitLogOptions(const wchar *LogFileName); +void InitLogOptions(const wchar *LogFileName,RAR_CHARSET CSet); #ifdef SILENT inline void Log(const wchar *ArcName,const wchar *fmt,...) {} diff --git a/src/thirdparty/unrar/options.hpp b/src/thirdparty/unrar/options.hpp index e4967810b..bf8c8e74c 100644 --- a/src/thirdparty/unrar/options.hpp +++ b/src/thirdparty/unrar/options.hpp @@ -94,6 +94,8 @@ class RAROptions wchar CommentFile[NM]; RAR_CHARSET CommentCharset; RAR_CHARSET FilelistCharset; + RAR_CHARSET ErrlogCharset; + wchar ArcPath[NM]; SecPassword Password; bool EncryptHeaders; diff --git a/src/thirdparty/unrar/rar.cpp b/src/thirdparty/unrar/rar.cpp index bf3b6c83e..4baabd20c 100644 --- a/src/thirdparty/unrar/rar.cpp +++ b/src/thirdparty/unrar/rar.cpp @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) #endif InitConsoleOptions(Cmd->MsgStream,Cmd->Sound); - InitLogOptions(Cmd->LogName); + InitLogOptions(Cmd->LogName,Cmd->ErrlogCharset); ErrHandler.SetSilent(Cmd->AllYes || Cmd->MsgStream==MSG_NULL); ErrHandler.SetShutdown(Cmd->Shutdown); diff --git a/src/thirdparty/unrar/unicode.cpp b/src/thirdparty/unrar/unicode.cpp index 8af88d804..a6b0907a4 100644 --- a/src/thirdparty/unrar/unicode.cpp +++ b/src/thirdparty/unrar/unicode.cpp @@ -207,7 +207,7 @@ byte* WideToRaw(const wchar *Src,byte *Dest,size_t SrcSize) if (*Src==0) break; } - return(Dest); + return Dest; } @@ -216,7 +216,7 @@ wchar* RawToWide(const byte *Src,wchar *Dest,size_t DestSize) for (size_t I=0;I<DestSize;I++) if ((Dest[I]=Src[I*2]+(Src[I*2+1]<<8))==0) break; - return(Dest); + return Dest; } diff --git a/src/thirdparty/unrar/version.hpp b/src/thirdparty/unrar/version.hpp index 078369ce2..e851f286d 100644 --- a/src/thirdparty/unrar/version.hpp +++ b/src/thirdparty/unrar/version.hpp @@ -1,6 +1,6 @@ #define RARVER_MAJOR 5 #define RARVER_MINOR 0 -#define RARVER_BETA 4 -#define RARVER_DAY 27 -#define RARVER_MONTH 5 +#define RARVER_BETA 5 +#define RARVER_DAY 3 +#define RARVER_MONTH 6 #define RARVER_YEAR 2013 |