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

Update to 7-Zip 17.00 Beta

Browse Source
This commit is contained in:
Tino Reichardt
2017-04-30 14:14:14 +02:00
parent 54389d6e2f
commit aa5ba75da0
451 changed files with 15746 additions and 8574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
CPP/7zip/Archive/Rar/Rar5Handler.h
View File

@@ -85,7 +85,7 @@ enum EHostOS
// ---------- Extra ----------
namespace NExtraRecordType
namespace NExtraID
{
enum
{
@@ -99,7 +99,7 @@ namespace NExtraRecordType
};
}
// const unsigned kCryptoAlgo_AES = 0;
const unsigned kCryptoAlgo_AES = 0;
namespace NCryptoFlags
{
@@ -133,8 +133,9 @@ namespace NTimeRecord
{
const unsigned kUnixTime = 1 << 0;
const unsigned kMTime = 1 << 1;
// const unsigned kCTime = 1 << 2;
// const unsigned kATime = 1 << 3;
const unsigned kCTime = 1 << 2;
const unsigned kATime = 1 << 3;
const unsigned kUnixNs = 1 << 4;
}
}
@@ -156,6 +157,17 @@ namespace NLinkFlags
}
struct CLinkInfo
{
UInt64 Type;
UInt64 Flags;
unsigned NameOffset;
unsigned NameLen;
bool Parse(const Byte *p, unsigned size);
};
struct CItem
{
UInt32 CommonFlags;
@@ -230,18 +242,20 @@ struct CItem
bool Is_ACL() const { return IsService() && Name == "ACL"; }
// bool Is_QO() const { return IsService() && Name == "QO"; }
int FindExtra(unsigned type, unsigned &recordDataSize) const;
int FindExtra(unsigned extraID, unsigned &recordDataSize) const;
void PrintInfo(AString &s) const;
bool IsEncrypted() const
{
unsigned size;
return FindExtra(NExtraRecordType::kCrypto, size) >= 0;
return FindExtra(NExtraID::kCrypto, size) >= 0;
}
int FindExtra_Blake() const
{
unsigned size = 0;
int offset = FindExtra(NExtraRecordType::kHash, size);
int offset = FindExtra(NExtraID::kHash, size);
if (offset >= 0
&& size == BLAKE2S_DIGEST_SIZE + 1
&& Extra[(unsigned)offset] == kHashID_Blake2sp)
@@ -251,14 +265,6 @@ struct CItem
bool FindExtra_Version(UInt64 &version) const;
struct CLinkInfo
{
UInt64 Type;
UInt64 Flags;
unsigned NameOffset;
unsigned NameLen;
};
bool FindExtra_Link(CLinkInfo &link) const;
void Link_to_Prop(unsigned linkType, NWindows::NCOM::CPropVariant &prop) const;
bool Is_CopyLink() const;
@@ -313,7 +319,7 @@ struct CInArcInfo
bool Is_Recovery() const { return (Flags & NLocatorFlags::kRecovery) != 0; }
};
int FindExtra(unsigned type, unsigned &recordDataSize) const;
int FindExtra(unsigned extraID, unsigned &recordDataSize) const;
bool FindExtra_Locator(CLocator &locator) const;
*/