diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-07-13 22:24:02 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-07-13 22:41:27 +0400 |
commit | 2fcba01d03b535e30177f3aceb6726b90ee57521 (patch) | |
tree | 2ab33b535ec83b63fc0803477df4559f4a06fd41 /src/thirdparty/unrar | |
parent | d5cc3a5117774866af3f26d5f871b753a5877482 (diff) |
Update Unrar to 5.0.8.
Diffstat (limited to 'src/thirdparty/unrar')
-rw-r--r-- | src/thirdparty/unrar/cmddata.cpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/dll.rc | 8 | ||||
-rw-r--r-- | src/thirdparty/unrar/errhnd.cpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/extract.cpp | 10 | ||||
-rw-r--r-- | src/thirdparty/unrar/filcreat.hpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/file.cpp | 4 | ||||
-rw-r--r-- | src/thirdparty/unrar/filefn.cpp | 6 | ||||
-rw-r--r-- | src/thirdparty/unrar/filefn.hpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/filestr.cpp | 4 | ||||
-rw-r--r-- | src/thirdparty/unrar/find.cpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/global.cpp | 3 | ||||
-rw-r--r-- | src/thirdparty/unrar/hardlinks.cpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/os.hpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/pathfn.cpp | 30 | ||||
-rw-r--r-- | src/thirdparty/unrar/pathfn.hpp | 6 | ||||
-rw-r--r-- | src/thirdparty/unrar/rar.hpp | 2 | ||||
-rw-r--r-- | src/thirdparty/unrar/raros.hpp | 10 | ||||
-rw-r--r-- | src/thirdparty/unrar/resource.cpp | 1 | ||||
-rw-r--r-- | src/thirdparty/unrar/system.cpp | 8 | ||||
-rw-r--r-- | src/thirdparty/unrar/timefn.cpp | 8 | ||||
-rw-r--r-- | src/thirdparty/unrar/ulinks.cpp | 1 | ||||
-rw-r--r-- | src/thirdparty/unrar/version.hpp | 6 | ||||
-rw-r--r-- | src/thirdparty/unrar/volume.cpp | 4 |
23 files changed, 56 insertions, 69 deletions
diff --git a/src/thirdparty/unrar/cmddata.cpp b/src/thirdparty/unrar/cmddata.cpp index 8d31d0ddc..be3a2bdd0 100644 --- a/src/thirdparty/unrar/cmddata.cpp +++ b/src/thirdparty/unrar/cmddata.cpp @@ -673,7 +673,6 @@ void CommandData::ProcessSwitch(const wchar *Switch) case '0': Recurse=RECURSE_WILDCARDS; break; -#ifndef _WIN_CE case 'I': { Priority=atoiw(Switch+2); @@ -690,7 +689,6 @@ void CommandData::ProcessSwitch(const wchar *Switch) SetPriority(Priority); } break; -#endif } break; case 'S': diff --git a/src/thirdparty/unrar/dll.rc b/src/thirdparty/unrar/dll.rc index ee671ba3b..ee08b5e3b 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, 6, 901
-PRODUCTVERSION 5, 0, 6, 901
+FILEVERSION 5, 0, 7, 925
+PRODUCTVERSION 5, 0, 7, 925
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.6\0"
- VALUE "ProductVersion", "5.0.6\0"
+ VALUE "FileVersion", "5.0.7\0"
+ VALUE "ProductVersion", "5.0.7\0"
VALUE "LegalCopyright", "Copyright © Alexander Roshal 1993-2013\0"
VALUE "OriginalFilename", "Unrar.dll\0"
}
diff --git a/src/thirdparty/unrar/errhnd.cpp b/src/thirdparty/unrar/errhnd.cpp index cfb672d0a..1fb40c7b8 100644 --- a/src/thirdparty/unrar/errhnd.cpp +++ b/src/thirdparty/unrar/errhnd.cpp @@ -288,7 +288,7 @@ void _stdfunction ProcessSignal(int SigType) #ifdef _WIN_ALL // Let the main thread to handle 'throw' and destroy file objects. Sleep(200); -#if defined(USE_RC) && !defined(SFX_MODULE) && !defined(_WIN_CE) && !defined(RARDLL) +#if defined(USE_RC) && !defined(SFX_MODULE) && !defined(RARDLL) ExtRes.UnloadDLL(); #endif exit(RARX_USERBREAK); diff --git a/src/thirdparty/unrar/extract.cpp b/src/thirdparty/unrar/extract.cpp index 2d3279d30..a909de167 100644 --- a/src/thirdparty/unrar/extract.cpp +++ b/src/thirdparty/unrar/extract.cpp @@ -231,7 +231,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,size_t HeaderS HEADER_TYPE HeaderType=Arc.GetHeaderType();
if (HeaderType!=HEAD_FILE)
{
-#if !defined(SFX_MODULE) && !defined(_WIN_CE)
+#ifndef SFX_MODULE
if (HeaderType==HEAD3_OLDSERVICE && PrevExtracted)
SetExtraInfo20(Cmd,Arc,DestFileName);
#endif
@@ -615,12 +615,12 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,size_t HeaderS bool BrokenFile=false;
// Checksum is not calculated in skip solid mode for performance reason.
- if (!SkipSolid && ShowChecksum)
+ if (!SkipSolid)
{
if (!WrongPassword && ValidCRC)
{
#ifndef GUI
- if (Command!='P' && Command!='I')
+ if (Command!='P' && Command!='I' && ShowChecksum)
mprintf(L"%s%s ",Cmd->DisablePercentage ? L" ":L"\b\b\b\b\b ",
Arc.FileHead.FileHash.Type==HASH_NONE ? L" ?":St(MOk));
#endif
@@ -671,7 +671,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,size_t HeaderS Cmd->xctime==EXTTIME_NONE ? NULL:&Arc.FileHead.ctime,
Cmd->xatime==EXTTIME_NONE ? NULL:&Arc.FileHead.atime);
CurFile.Close();
-#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE)
+#if defined(_WIN_ALL) && !defined(SFX_MODULE)
if (Cmd->SetCompressedAttr &&
(Arc.FileHead.FileAttr & FILE_ATTRIBUTE_COMPRESSED)!=0)
SetFileCompression(CurFile.FileName,true);
@@ -966,7 +966,7 @@ void CmdExtract::ExtrCreateDir(CommandData *Cmd,Archive &Arc,const wchar *ArcFil }
if (PrevExtracted)
{
-#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE)
+#if defined(_WIN_ALL) && !defined(SFX_MODULE)
if (Cmd->SetCompressedAttr &&
(Arc.FileHead.FileAttr & FILE_ATTRIBUTE_COMPRESSED)!=0 && WinNT())
SetFileCompression(DestFileName,true);
diff --git a/src/thirdparty/unrar/filcreat.hpp b/src/thirdparty/unrar/filcreat.hpp index d2084debf..a7d10a2df 100644 --- a/src/thirdparty/unrar/filcreat.hpp +++ b/src/thirdparty/unrar/filcreat.hpp @@ -7,7 +7,7 @@ bool FileCreate(RAROptions *Cmd,File *NewFile,wchar *Name,size_t MaxNameSize, bool GetAutoRenamedName(wchar *Name,size_t MaxNameSize); -#if defined(_WIN_ALL) && !defined(_WIN_CE) +#ifdef _WIN_ALL bool UpdateExistingShortName(const wchar *Name); #endif diff --git a/src/thirdparty/unrar/file.cpp b/src/thirdparty/unrar/file.cpp index 2c4de580c..4bfafe05a 100644 --- a/src/thirdparty/unrar/file.cpp +++ b/src/thirdparty/unrar/file.cpp @@ -250,7 +250,6 @@ void File::Write(const void *Data,size_t Size) { if (Size==0) return; -#ifndef _WIN_CE if (HandleType!=FILE_HANDLENORMAL) switch(HandleType) { @@ -269,7 +268,6 @@ void File::Write(const void *Data,size_t Size) #endif break; } -#endif while (1) { bool Success=false; @@ -364,7 +362,6 @@ int File::DirectRead(void *Data,size_t Size) const size_t MaxDeviceRead=20000; const size_t MaxLockedRead=32768; #endif -#ifndef _WIN_CE if (HandleType==FILE_HANDLESTD) { #ifdef _WIN_ALL @@ -375,7 +372,6 @@ int File::DirectRead(void *Data,size_t Size) hFile=stdin; #endif } -#endif #ifdef _WIN_ALL DWORD Read; if (!ReadFile(hFile,Data,(DWORD)Size,&Read,NULL)) diff --git a/src/thirdparty/unrar/filefn.cpp b/src/thirdparty/unrar/filefn.cpp index d7809399c..2654fee6a 100644 --- a/src/thirdparty/unrar/filefn.cpp +++ b/src/thirdparty/unrar/filefn.cpp @@ -310,7 +310,7 @@ bool SetFileAttr(const wchar *Name,uint Attr) void CalcFileSum(File *SrcFile,uint *CRC32,byte *Blake2,uint Threads,int64 Size,uint Flags) { SaveFilePos SavePos(*SrcFile); -#if !defined(SILENT) && !defined(_WIN_CE) +#ifndef SILENT int64 FileLength=SrcFile->FileLength(); if ((Flags & (CALCFSUM_SHOWTEXT|CALCFSUM_SHOWALL))!=0) { @@ -345,7 +345,7 @@ void CalcFileSum(File *SrcFile,uint *CRC32,byte *Blake2,uint Threads,int64 Size, if ((++BlockCount & 0xf)==0) { -#if !defined(SILENT) && !defined(_WIN_CE) +#ifndef SILENT if ((Flags & CALCFSUM_SHOWALL)!=0) mprintf(L"\b\b\b\b%3d%%",ToPercent(BlockCount*int64(BufSize),FileLength)); #endif @@ -419,7 +419,7 @@ bool DelFile(const wchar *Name) -#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE) +#if defined(_WIN_ALL) && !defined(SFX_MODULE) bool SetFileCompression(const wchar *Name,bool State) { HANDLE hFile=CreateFile(Name,FILE_READ_DATA|FILE_WRITE_DATA, diff --git a/src/thirdparty/unrar/filefn.hpp b/src/thirdparty/unrar/filefn.hpp index eaf3fcc5f..d89329471 100644 --- a/src/thirdparty/unrar/filefn.hpp +++ b/src/thirdparty/unrar/filefn.hpp @@ -33,7 +33,7 @@ bool RenameFile(const wchar *SrcName,const wchar *DestName); bool DelFile(const wchar *Name); bool DelDir(const wchar *Name); -#if defined(_WIN_ALL) && !defined(_WIN_CE) +#if defined(_WIN_ALL) && !defined(SFX_MODULE) bool SetFileCompression(const wchar *Name,bool State); #endif diff --git a/src/thirdparty/unrar/filestr.cpp b/src/thirdparty/unrar/filestr.cpp index d4b844960..74d8977a4 100644 --- a/src/thirdparty/unrar/filestr.cpp +++ b/src/thirdparty/unrar/filestr.cpp @@ -17,7 +17,7 @@ bool ReadTextFile( if (Name!=NULL) if (Config) - GetConfigName(Name,FileName,ASIZE(FileName),true); + GetConfigName(Name,FileName,ASIZE(FileName),true,false); else wcsncpyz(FileName,Name,ASIZE(FileName)); @@ -93,7 +93,7 @@ bool ReadTextFile( } bool Expanded=false; -#if defined(_WIN_ALL) && !defined(_WIN_CE) +#ifdef _WIN_ALL if (ExpandEnvStr && *CurStr=='%') { // Expanding environment variables in Windows version. diff --git a/src/thirdparty/unrar/find.cpp b/src/thirdparty/unrar/find.cpp index 58e3c243c..ff9c58662 100644 --- a/src/thirdparty/unrar/find.cpp +++ b/src/thirdparty/unrar/find.cpp @@ -161,7 +161,7 @@ bool FindFile::FastFind(const wchar *FindMask,FindData *fd,bool GetSymLink) #ifdef _WIN_ALL HANDLE FindFile::Win32Find(HANDLE hFind,const wchar *Mask,FindData *fd) { - WIN32_FIND_DATAW FindData; + WIN32_FIND_DATA FindData; if (hFind==INVALID_HANDLE_VALUE) { hFind=FindFirstFile(Mask,&FindData); diff --git a/src/thirdparty/unrar/global.cpp b/src/thirdparty/unrar/global.cpp index 593a057cb..3975813a9 100644 --- a/src/thirdparty/unrar/global.cpp +++ b/src/thirdparty/unrar/global.cpp @@ -1,4 +1,7 @@ #define INCLUDEGLOBAL +#if defined(__BORLANDC__) || defined(_MSC_VER) +#pragma hdrstop +#endif #include "rar.hpp" diff --git a/src/thirdparty/unrar/hardlinks.cpp b/src/thirdparty/unrar/hardlinks.cpp index f41d3e8ac..a83fcd980 100644 --- a/src/thirdparty/unrar/hardlinks.cpp +++ b/src/thirdparty/unrar/hardlinks.cpp @@ -2,6 +2,8 @@ bool ExtractHardlink(wchar *NameNew,wchar *NameExisting,size_t NameExistingSize) { if (!FileExist(NameExisting)) return false; + CreatePath(NameNew,true); + #ifdef _WIN_ALL UnixSlashToDos(NameExisting,NameExisting,NameExistingSize); diff --git a/src/thirdparty/unrar/os.hpp b/src/thirdparty/unrar/os.hpp index c7ee35248..ed76a1935 100644 --- a/src/thirdparty/unrar/os.hpp +++ b/src/thirdparty/unrar/os.hpp @@ -233,7 +233,7 @@ #endif #endif -#if !defined(BIG_ENDIAN) && !defined(_WIN_CE) && defined(_WIN_ALL) +#if !defined(BIG_ENDIAN) && defined(_WIN_ALL) // Allow not aligned integer access, increases speed in some operations. #define ALLOW_NOT_ALIGNED_INT #endif diff --git a/src/thirdparty/unrar/pathfn.cpp b/src/thirdparty/unrar/pathfn.cpp index d4396d819..7cd485842 100644 --- a/src/thirdparty/unrar/pathfn.cpp +++ b/src/thirdparty/unrar/pathfn.cpp @@ -200,8 +200,8 @@ void RemoveNameFromPath(wchar *Path) } -#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE) -static void GetAppDataPath(wchar *Path,size_t MaxSize) +#if defined(_WIN_ALL) && !defined(SFX_MODULE) +static void GetAppDataPath(wchar *Path,size_t MaxSize,bool Create) { LPMALLOC g_pMalloc; SHGetMalloc(&g_pMalloc); @@ -213,7 +213,9 @@ static void GetAppDataPath(wchar *Path,size_t MaxSize) { AddEndSlash(Path,MaxSize); wcsncatz(Path,L"WinRAR",MaxSize); - Success=FileExist(Path) || MakeDir(Path,false,0)==MKDIR_SUCCESS; + Success=FileExist(Path); + if (!Success && Create) + Success=MakeDir(Path,false,0)==MKDIR_SUCCESS; } if (!Success) { @@ -226,27 +228,27 @@ static void GetAppDataPath(wchar *Path,size_t MaxSize) #if defined(_WIN_ALL) && !defined(SFX_MODULE) -void GetRarDataPath(wchar *Path,size_t MaxSize) +void GetRarDataPath(wchar *Path,size_t MaxSize,bool Create) { *Path=0; HKEY hKey; - if (RegOpenKeyExW(HKEY_CURRENT_USER,L"Software\\WinRAR\\Paths",0, - KEY_QUERY_VALUE,&hKey)==ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_CURRENT_USER,L"Software\\WinRAR\\Paths",0, + KEY_QUERY_VALUE,&hKey)==ERROR_SUCCESS) { DWORD DataSize=(DWORD)MaxSize,Type; - RegQueryValueExW(hKey,L"AppData",0,&Type,(BYTE *)Path,&DataSize); + RegQueryValueEx(hKey,L"AppData",0,&Type,(BYTE *)Path,&DataSize); RegCloseKey(hKey); } if (*Path==0 || !FileExist(Path)) - GetAppDataPath(Path,MaxSize); + GetAppDataPath(Path,MaxSize,Create); } #endif #ifndef SFX_MODULE -bool EnumConfigPaths(uint Number,wchar *Path,size_t MaxSize) +bool EnumConfigPaths(uint Number,wchar *Path,size_t MaxSize,bool Create) { #ifdef _UNIX static const wchar *ConfPath[]={ @@ -270,10 +272,10 @@ bool EnumConfigPaths(uint Number,wchar *Path,size_t MaxSize) if (Number>1) return false; if (Number==0) - GetRarDataPath(Path,MaxSize); + GetRarDataPath(Path,MaxSize,Create); else { - GetModuleFileNameW(NULL,Path,(DWORD)MaxSize); + GetModuleFileName(NULL,Path,(DWORD)MaxSize); RemoveNameFromPath(Path); } return true; @@ -285,10 +287,10 @@ bool EnumConfigPaths(uint Number,wchar *Path,size_t MaxSize) #ifndef SFX_MODULE -void GetConfigName(const wchar *Name,wchar *FullName,size_t MaxSize,bool CheckExist) +void GetConfigName(const wchar *Name,wchar *FullName,size_t MaxSize,bool CheckExist,bool Create) { *FullName=0; - for (uint I=0;EnumConfigPaths(I,FullName,MaxSize);I++) + for (uint I=0;EnumConfigPaths(I,FullName,MaxSize,Create);I++) { AddEndSlash(FullName,MaxSize); wcsncatz(FullName,Name,MaxSize); @@ -919,6 +921,8 @@ wchar* GetWideName(const char *Name,const wchar *NameW,wchar *DestW,size_t DestS // characters, even if their path length is normal. bool GetWinLongPath(const wchar *Src,wchar *Dest,size_t MaxSize) { + if (*Src==0) + return false; const wchar *Prefix=L"\\\\?\\"; const size_t PrefixLength=4; bool FullPath=IsDiskLetter(Src) && IsPathDiv(Src[2]); diff --git a/src/thirdparty/unrar/pathfn.hpp b/src/thirdparty/unrar/pathfn.hpp index 755c8b646..7914997de 100644 --- a/src/thirdparty/unrar/pathfn.hpp +++ b/src/thirdparty/unrar/pathfn.hpp @@ -17,9 +17,9 @@ void AddEndSlash(wchar *Path,size_t MaxLength); void MakeName(const wchar *Path,const wchar *Name,wchar *Pathname,size_t MaxSize); void GetFilePath(const wchar *FullName,wchar *Path,size_t MaxLength); void RemoveNameFromPath(wchar *Path); -void GetRarDataPath(wchar *Path,size_t MaxSize); -bool EnumConfigPaths(uint Number,wchar *Path,size_t MaxSize); -void GetConfigName(const wchar *Name,wchar *FullName,size_t MaxSize,bool CheckExist); +void GetRarDataPath(wchar *Path,size_t MaxSize,bool Create); +bool EnumConfigPaths(uint Number,wchar *Path,size_t MaxSize,bool Create); +void GetConfigName(const wchar *Name,wchar *FullName,size_t MaxSize,bool CheckExist,bool Create); wchar* GetVolNumPart(const wchar *ArcName); void NextVolumeName(wchar *ArcName,uint MaxLength,bool OldNumbering); bool IsNameUsable(const wchar *Name); diff --git a/src/thirdparty/unrar/rar.hpp b/src/thirdparty/unrar/rar.hpp index 2cdf4db49..0fb4757d4 100644 --- a/src/thirdparty/unrar/rar.hpp +++ b/src/thirdparty/unrar/rar.hpp @@ -8,9 +8,7 @@ #include "dll.hpp" #endif -#ifndef _WIN_CE #include "version.hpp" -#endif #include "rartypes.hpp" #include "rardefs.hpp" #include "rarlang.hpp" diff --git a/src/thirdparty/unrar/raros.hpp b/src/thirdparty/unrar/raros.hpp index c560b2e6f..7a8f6af4a 100644 --- a/src/thirdparty/unrar/raros.hpp +++ b/src/thirdparty/unrar/raros.hpp @@ -19,16 +19,6 @@ #endif #endif -#ifdef _WIN32_WCE - #define _WIN_ALL - #define _WIN_CE - #ifdef WM_FILECHANGEINFO - #define PC2002 - #else - #undef PC2002 - #endif -#endif - #ifdef __APPLE__ #define _UNIX #define _APPLE diff --git a/src/thirdparty/unrar/resource.cpp b/src/thirdparty/unrar/resource.cpp index 7c1af04cf..496f098c9 100644 --- a/src/thirdparty/unrar/resource.cpp +++ b/src/thirdparty/unrar/resource.cpp @@ -16,4 +16,3 @@ const wchar *St(MSGID StringId) } #endif - diff --git a/src/thirdparty/unrar/system.cpp b/src/thirdparty/unrar/system.cpp index 64a8e130f..dc858744a 100644 --- a/src/thirdparty/unrar/system.cpp +++ b/src/thirdparty/unrar/system.cpp @@ -1,16 +1,14 @@ #include "rar.hpp" -#ifndef _WIN_CE static int SleepTime=0; void InitSystemOptions(int SleepTime) { ::SleepTime=SleepTime; } -#endif -#if !defined(SFX_MODULE) && !defined(_WIN_CE) && !defined(SETUP) +#if !defined(SFX_MODULE) && !defined(SETUP) void SetPriority(int Priority) { #ifdef _WIN_ALL @@ -74,7 +72,7 @@ void Wait() { if (ErrHandler.UserBreak) ErrHandler.Exit(RARX_USERBREAK); -#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE) +#if defined(_WIN_ALL) && !defined(SFX_MODULE) if (SleepTime!=0) Sleep(SleepTime); #endif @@ -84,7 +82,7 @@ void Wait() -#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE) && !defined(SHELL_EXT) && !defined(SETUP) +#if defined(_WIN_ALL) && !defined(SFX_MODULE) && !defined(SHELL_EXT) && !defined(SETUP) void Shutdown() { HANDLE hToken; diff --git a/src/thirdparty/unrar/timefn.cpp b/src/thirdparty/unrar/timefn.cpp index 1d6d5d16d..76712eedb 100644 --- a/src/thirdparty/unrar/timefn.cpp +++ b/src/thirdparty/unrar/timefn.cpp @@ -272,17 +272,17 @@ void RarTime::SetCurrentTime() } -#if !defined(SFX_MODULE) && !defined(_WIN_CE) +#ifndef SFX_MODULE const wchar *GetMonthName(int Month) { #ifdef SILENT - return(L""); + return L""; #else static MSGID MonthID[]={ MMonthJan,MMonthFeb,MMonthMar,MMonthApr,MMonthMay,MMonthJun, MMonthJul,MMonthAug,MMonthSep,MMonthOct,MMonthNov,MMonthDec }; - return(St(MonthID[Month])); + return St(MonthID[Month]); #endif } #endif @@ -290,5 +290,5 @@ const wchar *GetMonthName(int Month) bool IsLeapYear(int Year) { - return((Year&3)==0 && (Year%100!=0 || Year%400==0)); + return (Year&3)==0 && (Year%100!=0 || Year%400==0); } diff --git a/src/thirdparty/unrar/ulinks.cpp b/src/thirdparty/unrar/ulinks.cpp index 5b67bbdfa..fd82840c4 100644 --- a/src/thirdparty/unrar/ulinks.cpp +++ b/src/thirdparty/unrar/ulinks.cpp @@ -15,7 +15,6 @@ static bool UnixSymlink(const char *Target,const wchar *LinkName) Log(NULL,St(MErrCreateLnkS),LinkName); ErrHandler.SetErrorCode(RARX_WARNING); } - mprintf(L" "); // Provide space for "OK" message. return false; } // We do not set time of created symlink, because utime changes diff --git a/src/thirdparty/unrar/version.hpp b/src/thirdparty/unrar/version.hpp index d2aa82979..d2a226274 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 6 -#define RARVER_DAY 19 -#define RARVER_MONTH 6 +#define RARVER_BETA 7 +#define RARVER_DAY 13 +#define RARVER_MONTH 7 #define RARVER_YEAR 2013 diff --git a/src/thirdparty/unrar/volume.cpp b/src/thirdparty/unrar/volume.cpp index dd3811231..de9d2424f 100644 --- a/src/thirdparty/unrar/volume.cpp +++ b/src/thirdparty/unrar/volume.cpp @@ -83,7 +83,7 @@ bool MergeArchive(Archive &Arc,ComprDataIO *DataIO,bool ShowFileName,wchar Comma } #else // !RARDLL -#if !defined(SFX_MODULE) && !defined(_WIN_CE) +#ifndef SFX_MODULE if (!RecoveryDone) { RecVolumesRestore(Cmd,Arc.FileName,true); @@ -112,7 +112,7 @@ bool MergeArchive(Archive &Arc,ComprDataIO *DataIO,bool ShowFileName,wchar Comma if (FailedOpen) { -#if !defined(SILENT) && !defined(_WIN_CE) +#ifndef SILENT Log(Arc.FileName,St(MAbsNextVol),NextName); #endif Arc.Open(Arc.FileName,0); |