Fix ZIP64 creation with individual files larger 4GB

If single files larger than 4GB where added the recorded file sizes
in the local file header where not updated correctly. Additionally
recorded file sizes in the central directory where in the wrong order
making it impossible to extract.

To enable adding files with unknown size which might be larger than 4GB
the new method wxZipOutputStream::SetFormat() is added.

Additionally a check has been added in case a file larger 4GB has been
written without ZIP64 info.
This commit is contained in:
Tobias Taschner
2018-02-13 23:16:58 +01:00
parent dd5d755bc2
commit 29f5eeb69d
3 changed files with 124 additions and 24 deletions

View File

@@ -80,6 +80,19 @@ enum wxZipFlags
wxZIP_RESERVED = 0xF000
};
/**
Zip archive format
@since 3.1.1
*/
enum wxZipArchiveFormat
{
/// Default zip format
wxZIP_FORMAT_DEFAULT,
/// ZIP64 format
wxZIP_FORMAT_ZIP64
};
/**
@class wxZipNotifier
@@ -558,11 +571,17 @@ public:
//@{
/**
Takes ownership of @a entry and uses it to create a new entry in the zip.
If you do not specify a size and plan to put more than 4GB data into the
entry see SetFormat()
*/
bool PutNextEntry(wxZipEntry* entry);
/**
Create a new entry with the given name, timestamp and size.
If you do not specify a size and plan to put more than 4GB data into the
entry see SetFormat()
*/
bool PutNextEntry(const wxString& name,
const wxDateTime& dt = wxDateTime::Now(),
@@ -574,5 +593,30 @@ public:
It is written at the end of the zip.
*/
void SetComment(const wxString& comment);
/**
Set the format of the archive.
The normal zip format is limited to single files and the complete
archive smaller than 4GB with less then 65k files. If any of these
limits are exceed this class will automatically create a ZIP64 file.
However to support single entries with more than 4GB of data
(compressed or original) which sizes are unknown when adding the
entry with PutNextEntry() the format has to be set to
wxZIP_FORMAT_ZIP64 adding such entries.
@since 3.1.1
*/
void SetFormat(wxZipArchiveFormat format);
/**
Get the format of the archive.
@since 3.1.1
@see SetFormat()
*/
wxZipArchiveFormat GetFormat() const;
};