xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-09 08:07:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to 7-Zip Version 21.06

Browse Source 
See https://sourceforge.net/p/sevenzip/discussion/45797/thread/b463f34259/
This commit is contained in:
Tino Reichardt
2022-08-07 09:41:55 +02:00
parent 3e0e78700e
commit e3067bf67b
43 changed files with 1394 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
CPP/7zip/UI/FileManager/VerCtrl.cpp
View File

@@ -126,6 +126,18 @@ static void WriteFile(const FString &path, bool createAlways, const CFileDataInf
}
static UInt64 FILETIME_to_UInt64(const FILETIME &ft)
{
return ft.dwLowDateTime | ((UInt64)ft.dwHighDateTime << 32);
}
static void UInt64_TO_FILETIME(UInt64 v, FILETIME &ft)
{
ft.dwLowDateTime = (DWORD)v;
ft.dwHighDateTime = (DWORD)(v >> 32);
}
void CApp::VerCtrl(unsigned id)
{
const CPanel &panel = GetFocusedPanel();
@@ -297,6 +309,55 @@ void CApp::VerCtrl(unsigned id)
return;
}
}
const UInt64 timeStampOriginal = FILETIME_to_UInt64(fdi.Info.ftLastWriteTime);
UInt64 timeStamp2 = 0;
if (fdi2.IsOpen)
timeStamp2 = FILETIME_to_UInt64(fdi2.Info.ftLastWriteTime);
if (timeStampOriginal > timeStamp2)
{
const UInt64 k_Ntfs_prec = 10000000;
UInt64 timeStamp = timeStampOriginal;
const UInt32 k_precs[] = { 60 * 60, 60, 2, 1 };
for (unsigned i = 0; i < ARRAY_SIZE(k_precs); i++)
{
timeStamp = timeStampOriginal;
const UInt64 prec = k_Ntfs_prec * k_precs[i];
// timeStamp += prec - 1; // for rounding up
timeStamp /= prec;
timeStamp *= prec;
if (timeStamp > timeStamp2)
break;
}
if (timeStamp != timeStampOriginal
&& timeStamp > timeStamp2)
{
FILETIME mTime;
UInt64_TO_FILETIME(timeStamp, mTime);
// NDir::SetFileAttrib(path, 0);
{
NIO::COutFile outFile;
if (!outFile.Open(path, OPEN_EXISTING))
{
panel.MessageBox_LastError();
return;
// if (::GetLastError() != ERROR_SUCCESS)
// throw "open error";
}
else
{
const UInt64 cTime = FILETIME_to_UInt64(fdi.Info.ftCreationTime);
if (cTime > timeStamp)
outFile.SetTime(&mTime, NULL, &mTime);
else
outFile.SetMTime(&mTime);
}
}
}
}
if (!SetFileAttrib(path, fdi.Info.dwFileAttributes | FILE_ATTRIBUTE_READONLY))
{
panel.MessageBox_LastError();