mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-12 14:11:33 -06:00
Update to 7-Zip Version 22.00
See: https://sourceforge.net/p/sevenzip/discussion/45797/thread/9c2d9061ce/
This commit is contained in:
@@ -75,6 +75,8 @@ extern const CHasherInfo *g_Hashers[];
|
||||
const CExternalCodecs *g_ExternalCodecs_Ptr;
|
||||
#endif
|
||||
|
||||
DECLARE_AND_SET_CLIENT_VERSION_VAR
|
||||
|
||||
#if defined(PROG_VARIANT_Z)
|
||||
#define PROG_POSTFIX "z"
|
||||
#define PROG_POSTFIX_2 " (z)"
|
||||
@@ -510,7 +512,7 @@ static void PrintStat()
|
||||
, &creationTimeFT, &exitTimeFT, &kernelTimeFT, &userTimeFT))
|
||||
return;
|
||||
FILETIME curTimeFT;
|
||||
NTime::GetCurUtcFileTime(curTimeFT);
|
||||
NTime::GetCurUtc_FiTime(curTimeFT);
|
||||
|
||||
#ifndef UNDER_CE
|
||||
|
||||
@@ -845,7 +847,7 @@ int Main2(
|
||||
#if !defined(UNDER_CE)
|
||||
CONSOLE_SCREEN_BUFFER_INFO consoleInfo;
|
||||
if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &consoleInfo))
|
||||
consoleWidth = (unsigned)consoleInfo.dwSize.X;
|
||||
consoleWidth = (unsigned)(unsigned short)consoleInfo.dwSize.X;
|
||||
#endif
|
||||
|
||||
#else
|
||||
@@ -859,7 +861,7 @@ int Main2(
|
||||
|
||||
CREATE_CODECS_OBJECT
|
||||
|
||||
codecs->CaseSensitiveChange = options.CaseSensitiveChange;
|
||||
codecs->CaseSensitive_Change = options.CaseSensitive_Change;
|
||||
codecs->CaseSensitive = options.CaseSensitive;
|
||||
ThrowException_if_Error(codecs->Load());
|
||||
Codecs_AddHashArcHandler(codecs);
|
||||
@@ -952,9 +954,11 @@ int Main2(
|
||||
|
||||
so << endl << "Formats:" << endl;
|
||||
|
||||
const char * const kArcFlags = "KSNFMGOPBELHXC";
|
||||
const char * const kArcFlags = "KSNFMGOPBELHXCc+a+m+r+";
|
||||
const char * const kArcTimeFlags = "wudn";
|
||||
const unsigned kNumArcFlags = (unsigned)strlen(kArcFlags);
|
||||
|
||||
const unsigned kNumArcTimeFlags = (unsigned)strlen(kArcTimeFlags);
|
||||
|
||||
for (i = 0; i < codecs->Formats.Size(); i++)
|
||||
{
|
||||
const CArcInfoEx &arc = codecs->Formats[i];
|
||||
@@ -967,12 +971,22 @@ int Main2(
|
||||
|
||||
so << (char)(arc.UpdateEnabled ? 'C' : ' ');
|
||||
|
||||
for (unsigned b = 0; b < kNumArcFlags; b++)
|
||||
{
|
||||
so << (char)
|
||||
((arc.Flags & ((UInt32)1 << b)) != 0 ? kArcFlags[b] : ' ');
|
||||
unsigned b;
|
||||
for (b = 0; b < kNumArcFlags; b++)
|
||||
so << (char)((arc.Flags & ((UInt32)1 << b)) != 0 ? kArcFlags[b] : '.');
|
||||
so << ' ';
|
||||
}
|
||||
|
||||
|
||||
if (arc.TimeFlags != 0)
|
||||
{
|
||||
unsigned b;
|
||||
for (b = 0; b < kNumArcTimeFlags; b++)
|
||||
so << (char)((arc.TimeFlags & ((UInt32)1 << b)) != 0 ? kArcTimeFlags[b] : '.');
|
||||
so << arc.Get_DefaultTimePrec();
|
||||
so << ' ';
|
||||
}
|
||||
|
||||
so << ' ';
|
||||
PrintString(so, arc.Name, 8);
|
||||
so << ' ';
|
||||
|
||||
Reference in New Issue
Block a user