xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2026-02-01 00:24:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to 7-Zip Version 22.00

Browse Source 
See: https://sourceforge.net/p/sevenzip/discussion/45797/thread/9c2d9061ce/
This commit is contained in:
Tino Reichardt
2022-08-07 09:59:33 +02:00
parent 6a4fe97fc3
commit 57558682a8
211 changed files with 15251 additions and 2482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CPP/7zip/UI/Common/HashCalc.cpp
+73 -12
View File
@@ -15,6 +15,7 @@
#include "../../Common/StreamUtils.h"
#include "../../Archive/Common/ItemNameUtils.h"
#include "../../Archive/IArchive.h"
#ifdef WANT_OPTIONAL_LOWERCASE
#include "../FileManager/RegistryUtils.h"
@@ -313,8 +314,6 @@ static unsigned GetColumnWidth(unsigned digestSize)
}
void HashHexToString(char *dest, const Byte *data, UInt32 size);
static void AddHashResultLine(
AString &_s,
// bool showHash,
@@ -467,10 +466,7 @@ HRESULT HashCalc(
{
CDirItem di;
di.Size = (UInt64)(Int64)-1;
di.Attrib = 0;
di.MTime.dwLowDateTime = 0;
di.MTime.dwHighDateTime = 0;
di.CTime = di.ATime = di.MTime;
di.SetAsFile();
dirItems.Items.Add(di);
}
else
@@ -482,6 +478,8 @@ HRESULT HashCalc(
dirItems.ExcludeDirItems = censor.ExcludeDirItems;
dirItems.ExcludeFileItems = censor.ExcludeFileItems;
dirItems.ShareForWrite = options.OpenShareForWrite;
HRESULT res = EnumerateItems(censor,
options.PathMode,
UString(),
@@ -502,14 +500,16 @@ HRESULT HashCalc(
// hb.Init();
hb.NumErrors = dirItems.Stat.NumErrors;
UInt64 totalSize = 0;
if (options.StdInMode)
{
RINOK(callback->SetNumFiles(1));
}
else
{
RINOK(callback->SetTotal(dirItems.Stat.GetTotalBytes()));
totalSize = dirItems.Stat.GetTotalBytes();
RINOK(callback->SetTotal(totalSize));
}
const UInt32 kBufSize = 1 << 15;
@@ -541,7 +541,9 @@ HRESULT HashCalc(
{
path = dirItems.GetLogPath(i);
const CDirItem &di = dirItems.Items[i];
#ifdef _WIN32
isAltStream = di.IsAltStream;
#endif
#ifndef UNDER_CE
// if (di.AreReparseData())
@@ -555,7 +557,7 @@ HRESULT HashCalc(
#endif
{
CInFileStream *inStreamSpec = new CInFileStream;
inStreamSpec->File.PreserveATime = options.PreserveATime;
inStreamSpec->Set_PreserveATime(options.PreserveATime);
inStream = inStreamSpec;
isDir = di.IsDir();
if (!isDir)
@@ -569,6 +571,20 @@ HRESULT HashCalc(
return res;
continue;
}
if (!options.StdInMode)
{
UInt64 curSize = 0;
if (inStreamSpec->GetSize(&curSize) == S_OK)
{
if (curSize > di.Size)
{
totalSize += curSize - di.Size;
RINOK(callback->SetTotal(totalSize));
// printf("\ntotal = %d MiB\n", (unsigned)(totalSize >> 20));
}
}
}
// inStreamSpec->ReloadProps();
}
}
}
@@ -584,6 +600,7 @@ HRESULT HashCalc(
{
if ((step & 0xFF) == 0)
{
// printf("\ncompl = %d\n", (unsigned)(completeValue >> 20));
RINOK(callback->SetCompleted(&completeValue));
}
UInt32 size;
@@ -1689,8 +1706,11 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
if (_isArc && !CanUpdate())
return E_NOTIMPL;
// const UINT codePage = CP_UTF8; // // (_forceCodePage ? _specifiedCodePage : _openCodePage);
// const unsigned utfFlags = g_Unicode_To_UTF8_Flags;
/*
CMyComPtr<IArchiveUpdateCallbackArcProp> reportArcProp;
callback->QueryInterface(IID_IArchiveUpdateCallbackArcProp, (void **)&reportArcProp);
*/
CObjectVector<CUpdateItem> updateItems;
UInt64 complexity = 0;
@@ -1837,6 +1857,8 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
if (ui.NewData)
{
UInt64 currentComplexity = ui.Size;
UInt64 fileSize = 0;
CMyComPtr<ISequentialInStream> fileInStream;
bool needWrite = true;
{
@@ -1850,6 +1872,15 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
if (fileInStream)
{
CMyComPtr<IStreamGetSize> streamGetSize;
fileInStream->QueryInterface(IID_IStreamGetSize, (void **)&streamGetSize);
if (streamGetSize)
{
UInt64 size;
if (streamGetSize->GetSize(&size) == S_OK)
currentComplexity = size;
}
/*
CMyComPtr<IStreamGetProps> getProps;
fileInStream->QueryInterface(IID_IStreamGetProps, (void **)&getProps);
if (getProps)
@@ -1862,6 +1893,7 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
// item.MTime = NWindows::NTime::FileTimeToUnixTime64(mTime);;
}
}
*/
}
else
{
@@ -1875,7 +1907,6 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
if (needWrite && fileInStream && !isDir)
{
UInt64 fileSize = 0;
for (UInt32 step = 0;; step++)
{
if ((step & 0xFF) == 0)
@@ -1911,6 +1942,36 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
}
complexity += currentComplexity;
/*
if (reportArcProp)
{
PROPVARIANT prop;
prop.vt = VT_EMPTY;
prop.wReserved1 = 0;
NCOM::PropVarEm_Set_UInt64(&prop, fileSize);
RINOK(reportArcProp->ReportProp(NArchive::NEventIndexType::kOutArcIndex, ui.IndexInClient, kpidSize, &prop));
for (unsigned k = 0; k < hb.Hashers.Size(); k++)
{
const CHasherState &hs = hb.Hashers[k];
if (hs.DigestSize == 4 && hs.Name.IsEqualTo_Ascii_NoCase("crc32"))
{
NCOM::PropVarEm_Set_UInt32(&prop, GetUi32(hs.Digests[k_HashCalc_Index_Current]));
RINOK(reportArcProp->ReportProp(NArchive::NEventIndexType::kOutArcIndex, ui.IndexInClient, kpidCRC, &prop));
}
else
{
RINOK(reportArcProp->ReportRawProp(NArchive::NEventIndexType::kOutArcIndex, ui.IndexInClient,
kpidChecksum, hs.Digests[k_HashCalc_Index_Current],
hs.DigestSize, NPropDataType::kRaw));
}
RINOK(reportArcProp->ReportFinished(NArchive::NEventIndexType::kOutArcIndex, ui.IndexInClient, NArchive::NUpdate::NOperationResult::kOK));
}
}
*/
RINOK(callback->SetOperationResult(NArchive::NUpdate::NOperationResult::kOK));
}
else