diff options
author | Underground78 <underground78@users.sourceforge.net> | 2015-01-25 15:47:48 +0300 |
---|---|---|
committer | Underground78 <underground78@users.sourceforge.net> | 2015-01-25 15:47:48 +0300 |
commit | 6fcba1bead7608fb480ab943ab9689bc66f4e009 (patch) | |
tree | ef5a968e7749e8f80f310fd44a43fc5b1d394193 /src/thirdparty/unrar/uiconsole.cpp | |
parent | 46ce9d630e7891230c9648afb0c17088681573e6 (diff) | |
parent | 013ebae50427b2e985939439202e206373ed5aee (diff) |
Merge branch 'release-1.7.8'1.7.8
Diffstat (limited to 'src/thirdparty/unrar/uiconsole.cpp')
-rw-r--r-- | src/thirdparty/unrar/uiconsole.cpp | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/thirdparty/unrar/uiconsole.cpp b/src/thirdparty/unrar/uiconsole.cpp index 5ddaf09f4..b9129c4f7 100644 --- a/src/thirdparty/unrar/uiconsole.cpp +++ b/src/thirdparty/unrar/uiconsole.cpp @@ -1,8 +1,20 @@ // Purely user interface function. Gets and returns user input. UIASKREP_RESULT uiAskReplace(wchar *Name,size_t MaxNameSize,int64 FileSize,RarTime *FileTime,uint Flags) { + wchar SizeText1[20],DateStr1[50],SizeText2[20],DateStr2[50]; + + FindData ExistingFD; + memset(&ExistingFD,0,sizeof(ExistingFD)); // In case find fails. + FindFile::FastFind(Name,&ExistingFD); + itoa(ExistingFD.Size,SizeText1); + ExistingFD.mtime.GetText(DateStr1,ASIZE(DateStr1),true,false); + + itoa(FileSize,SizeText2); + FileTime->GetText(DateStr2,ASIZE(DateStr2),true,false); + + eprintf(St(MAskReplace),Name,SizeText1,DateStr1,SizeText2,DateStr2); + bool AllowRename=(Flags & UIASKREP_F_NORENAME)==0; - eprintf(St(MFileExists),Name); int Choice=0; do { @@ -299,11 +311,14 @@ void uiMsgStore::Msg() case UIMSG_CHECKSUM: mprintf(St(MCRCFailed),Str[0]); break; + case UIMSG_FAT32SIZE: + mprintf(St(MFAT32Size)); + mprintf(L" "); // For progress percent. + break; - - case UIEVENT_RRTESTING: + case UIEVENT_RRTESTINGSTART: mprintf(L"%s ",St(MTestingRR)); break; } |