Merged PR 904854: Merge helpphil to master
Adding a bunch of stuff
This commit is contained in:
Thomas Olsen
Phil Smith
Коммит
b82103b7b7
|
|
@ -9,21 +9,34 @@
|
|||
|
||||
namespace xPlat {
|
||||
|
||||
class ZipException : public ExceptionBase
|
||||
{
|
||||
public:
|
||||
enum Error : std::uint32_t
|
||||
{
|
||||
InvalidHeader = 1,
|
||||
FieldOutOfRange = 2,
|
||||
};
|
||||
|
||||
ZipException(std::string message, Error error) : reason(message), ExceptionBase(ExceptionBase::Facility::ZIP)
|
||||
{
|
||||
SetLastError(error);
|
||||
}
|
||||
|
||||
std::string reason;
|
||||
class ZipException : public ExceptionBase
|
||||
|
||||
{
|
||||
|
||||
public:
|
||||
|
||||
enum Error : std::uint32_t
|
||||
|
||||
{
|
||||
|
||||
InvalidHeader = 1,
|
||||
|
||||
FieldOutOfRange = 2,
|
||||
}
|
||||
|
||||
|
||||
|
||||
ZipException(std::string message, Error error) : reason(message), ExceptionBase(ExceptionBase::Facility::ZIP)
|
||||
|
||||
{
|
||||
|
||||
SetLastError(error);
|
||||
|
||||
}
|
||||
|
||||
|
||||
std::string reason;
|
||||
|
||||
};
|
||||
|
||||
namespace Meta
|
||||
|
|
@ -156,5 +169,178 @@ namespace xPlat {
|
|||
}
|
||||
};
|
||||
|
||||
|
||||
class Zip64EndOfCentralDirectoryRecord : public StructuredObject
|
||||
{
|
||||
public:
|
||||
std::uint32_t GetSignature() { return Field(0).Value<std::uint32_t>(); }
|
||||
void GetSignature(std::uint32_t value) { Field(0).SetValue(value); }
|
||||
|
||||
std::uint64_t GetSizeOfZip64CDRecord() { return Field(1).Value<std::uint64_t>(); }
|
||||
void SetGetSizeOfZip64CDRecord(std::uint64_t value) { Field(1).SetValue(value); }
|
||||
|
||||
std::uint16_t GetVersionMadeBy() { return Field(2).Value<std::uint16_t>(); }
|
||||
void SetNumberOfDisk(std::uint16_t value) { Field(3).SetValue(value); }
|
||||
|
||||
std::uint16_t GetVersionNeededToExtract() { return Field(3).Value<std::uint16_t>(); }
|
||||
void SetVersionNeededToExtract(std::uint16_t value) { Field(3).SetValue(value); }
|
||||
|
||||
std::uint32_t GetNumberOfThisDisk() { return Field(4).Value<std::uint32_t>(); }
|
||||
void SetNumberOfThisDisk(std::uint32_t value) { Field(4).SetValue(value); }
|
||||
|
||||
std::uint32_t GetNumberOfTheDiskWithStart() { return Field(5).Value<std::uint32_t>(); }
|
||||
void SetNumberOfTheDiskWithStart(std::uint32_t value) { Field(5).SetValue(value); }
|
||||
|
||||
std::uint64_t GetTotalNumberOfEntriesOnDisk() { return Field(5).Value<std::uint64_t>(); }
|
||||
void SetTotalNumberOfEntriesOnDisk(std::uint64_t value) { Field(5).SetValue(value); }
|
||||
|
||||
std::uint64_t GetTotalNumberOfEntries() { return Field(6).Value<std::uint64_t>(); }
|
||||
void SetTotalNumberOfEntries(std::uint64_t value) { Field(6).SetValue(value); }
|
||||
|
||||
std::uint64_t GetTotalNumberOfEntriesInCD() { return Field(7).Value<std::uint64_t>(); }
|
||||
void SetTotalNumberOfEntriesInCD(std::uint64_t value) { Field(7).SetValue(value); }
|
||||
|
||||
std::uint64_t GetSizeOfCD() { return Field(8).Value<std::uint64_t>(); }
|
||||
void SetSizeOfCD(std::uint64_t value) { Field(8).SetValue(value); }
|
||||
|
||||
std::uint64_t GetOffsetfStartOfCD() { return Field(9).Value<std::uint64_t>(); }
|
||||
void SetOffsetfStartOfCD(std::uint64_t value) { Field(9).SetValue(value); }
|
||||
|
||||
Zip64EndOfCentralDirectoryRecord(StreamBase& stream) : StructuredObject(
|
||||
{
|
||||
// 0 - zip64 end of central dir signature 4 bytes(0x06064b50)
|
||||
Meta::Field4Bytes(stream,[](std::uint32_t& v)
|
||||
{
|
||||
if (v != Signatures::Zip64EndOfCD)
|
||||
{
|
||||
throw ZipException("end of central directory locator does not match signature", ZipException::Error::InvalidHeader);
|
||||
}
|
||||
}),
|
||||
// 1 - size of zip64 end of central directory record 8 bytes
|
||||
Meta::Field8Bytes(stream,[](std::uint64_t& v) {}),
|
||||
// 2 - version made by 2 bytes
|
||||
Meta::Field2Bytes(stream,[](std::uint16_t& v) {}),
|
||||
// 3 - version needed to extract 2 bytes
|
||||
Meta::Field2Bytes(stream,[](std::uint16_t& v) {}),
|
||||
// 4 - number of this disk 4 bytes
|
||||
Meta::Field4Bytes(stream,[](std::uint32_t& v) {}),
|
||||
// 5 - number of the disk with the start of the central directory 4 bytes
|
||||
Meta::Field4Bytes(stream,[](std::uint32_t& v) {}),
|
||||
// 6 - total number of entries in the central directory on this disk 8 bytes
|
||||
Meta::Field8Bytes(stream,[](std::uint64_t& v) {}),
|
||||
// 7 - total number of entries in the central directory 8 bytes
|
||||
Meta::Field8Bytes(stream,[](std::uint64_t& v) {}),
|
||||
// 8 - size of the central directory 8 bytes
|
||||
Meta::Field8Bytes(stream,[](std::uint64_t& v) {}),
|
||||
// 9 - offset of start of central directory with respect to the starting disk number 8 bytes
|
||||
Meta::Field8Bytes(stream,[](std::uint64_t& v) {}),
|
||||
//10 - zip64 extensible data sector(variable size)
|
||||
Meta::FieldNBytes(stream, [](std::vector<std::uint8_t>& data) {}), //???
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
class Zip64EndOfCentralDirectoryLocator : public StructuredObject
|
||||
{
|
||||
public:
|
||||
std::uint16_t GetSignature() { return Field(0).Value<std::uint32_t>(); }
|
||||
void GetSignature(std::uint32_t value) { Field(0).SetValue(value); }
|
||||
|
||||
std::uint16_t GetNumberOfDisk() { return Field(1).Value<std::uint32_t>(); }
|
||||
void SetNumberOfDisk(std::uint32_t value) { Field(1).SetValue(value); }
|
||||
|
||||
std::uint16_t GetRelativeOffset() { return Field(2).Value<std::uint64_t>(); }
|
||||
void SetTotalNumberOfEntries(std::uint64_t value) { Field(2).SetValue(value); }
|
||||
|
||||
std::uint32_t GetTotalNumberOfDisks() { return Field(3).Value<std::uint32_t>(); }
|
||||
void SetTotalNumberOfDisks(std::uint32_t value) { Field(3).SetValue(value); }
|
||||
|
||||
Zip64EndOfCentralDirectoryLocator(StreamBase& stream) : StructuredObject(
|
||||
{
|
||||
// 0 - zip64 end of central dir locator signature 4 bytes(0x07064b50)
|
||||
Meta::Field4Bytes(stream, [](std::uint32_t& v)
|
||||
{
|
||||
if (v != Signatures::Zip64EndOfCDLocator)
|
||||
{
|
||||
throw ZipException("end of central directory locator does not match signature", ZipException::Error::InvalidHeader);
|
||||
}
|
||||
}),
|
||||
// 1 - number of the disk with the start of the zip64 end of central directory 4 bytes
|
||||
Meta::Field4Bytes(stream, [](std::uint32_t& v) {}),
|
||||
// 2 - relative offset of the zip64 end of central directory record 8 bytes
|
||||
Meta::Field8Bytes(stream, [](std::uint64_t& v) {}),
|
||||
// 3 - total number of disks 4 bytes
|
||||
Meta::Field4Bytes(stream, [](std::uint32_t& v) {}),
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
class EndCentralDirectoryRecord : public StructuredObject
|
||||
{
|
||||
public:
|
||||
std::uint16_t GetNumberOfDisk() { return Field(1).Value<std::uint16_t>(); }
|
||||
void SetNumberOfDisk(std::uint16_t value) { Field(1).SetValue(value); }
|
||||
|
||||
std::uint16_t GetNumberOfDisk() { return Field(1).Value<std::uint16_t>(); }
|
||||
void SetNumberOfDisk(std::uint16_t value) { Field(1).SetValue(value); }
|
||||
|
||||
std::uint16_t GetTotalNumberOfEntries() { return Field(3).Value<std::uint16_t>(); }
|
||||
void SetTotalNumberOfEntries(std::uint16_t value) { Field(3).SetValue(value); }
|
||||
|
||||
std::uint32_t GetSizeOfCentralDirectory() { return Field(4).Value<std::uint32_t>(); }
|
||||
void SetSizeOfCentralDirectory(std::uint32_t value) { Field(4).SetValue(value); }
|
||||
|
||||
std::uint32_t GetOffsetOfCentralDirectory() { return Field(6).Value<std::uint32_t>(); }
|
||||
void SetOffsetOfCentralDirectory(std::uint32_t value) { Field(6).SetValue(value); }
|
||||
|
||||
std::uint16_t GetCommentLength() { return Field(7).Value<std::uint16_t>(); }
|
||||
void SetCommentLength(std::uint16_t value) { Field(7).SetValue(value); }
|
||||
|
||||
std::string GetComment()
|
||||
{
|
||||
auto data = Field(8).Value<std::vector<std::uint8_t>>();
|
||||
return std::string(data.begin(), data.end());
|
||||
}
|
||||
|
||||
void SetComment(std::string comment)
|
||||
{
|
||||
auto data = Field(8).Value<std::vector<std::uint8_t>>();
|
||||
data.resize(comment.size());
|
||||
data.assign(comment.begin(), comment.end());
|
||||
SetCommentLength(static_cast<std::uint16_t>(comment.size()));
|
||||
}
|
||||
|
||||
EndCentralDirectoryRecord(StreamBase& stream) : StructuredObject(
|
||||
{
|
||||
// 0 - end of central dir signature 4 bytes (0x06054b50)
|
||||
Meta::Field4Bytes(stream, [](std::uint32_t& v)
|
||||
{ if (v != Signatures::EndOfCentralDirectory)
|
||||
{ throw ZipException("file header does not match signature", ZipException::Error::InvalidHeader);
|
||||
}
|
||||
}),
|
||||
// 1 - number of this disk 2 bytes
|
||||
Meta::Field2Bytes(stream, [](std::uint16_t& v) {}),
|
||||
// 2 - number of the disk with the start of the central directory 2 bytes
|
||||
Meta::Field2Bytes(stream, [](std::uint16_t& v) {}),
|
||||
// 3 - total number of entries in the central directory on this disk 2 bytes
|
||||
Meta::Field2Bytes(stream, [](std::uint16_t& v) {}),
|
||||
// 4 - total number of entries in the central directory 2 bytes
|
||||
Meta::Field2Bytes(stream, [](std::uint16_t& v) {}),
|
||||
// 5 - size of the central directory 4 bytes
|
||||
Meta::Field4Bytes(stream, [](std::uint32_t& v) {}),
|
||||
// 6 - offset of start of centraldirectory with respect to the starting disk number 4 bytes
|
||||
Meta::Field4Bytes(stream, [](std::uint32_t& v) {}),
|
||||
// 7 - .ZIP file comment length 2 bytes
|
||||
Meta::Field2Bytes(stream, [](std::uint16_t& v)
|
||||
{
|
||||
if (GetCommentLength() > std::numeric_limits<std::uint16_t>::max())
|
||||
{
|
||||
throw ZipException("commentfield exceeds max size", ZipException::Error::FieldOutOfRange);
|
||||
}
|
||||
Field(8).Value<std::vector<std::uint8_t>>().resize(GetCommentLength(), 0);
|
||||
}),
|
||||
// 8 - .ZIP file comment (variable size)
|
||||
Meta::FieldNBytes(stream, [](std::vector<std::uint8_t>& data) {}),
|
||||
};
|
||||
};
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче