godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60943 from bruvzg/fix_zipio

This commit is contained in:
Rémi Verschelde 2022-05-11 16:59:31 +02:00 committed by GitHub
parent d68c355145 d36c5514d3
commit 2fd73bd32e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 70 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
core/io/zip_io.cpp
View File

@ -31,18 +31,19 @@
#include "zip_io.h" #include "zip_io.h"
void *zipio_open(voidpf opaque, const char *p_fname, int mode) { void *zipio_open(voidpf opaque, const char *p_fname, int mode) {
ZipIOData *zd = (ZipIOData *)opaque; Ref<FileAccess> *fa = reinterpret_cast<Ref<FileAccess> *>(opaque);
ERR_FAIL_COND_V(fa == nullptr, nullptr);
String fname; String fname;
fname.parse_utf8(p_fname); fname.parse_utf8(p_fname);
if (mode & ZLIB_FILEFUNC_MODE_WRITE) { if (mode & ZLIB_FILEFUNC_MODE_WRITE) {
zd->f = FileAccess::open(fname, FileAccess::WRITE); (*fa) = FileAccess::open(fname, FileAccess::WRITE);
} else { } else {
zd->f = FileAccess::open(fname, FileAccess::READ); (*fa) = FileAccess::open(fname, FileAccess::READ);
} }
if (zd->f.is_null()) { if (fa->is_null()) {
return nullptr; return nullptr;
} }
@ -50,49 +51,66 @@ void *zipio_open(voidpf opaque, const char *p_fname, int mode) {
} }
uLong zipio_read(voidpf opaque, voidpf stream, void *buf, uLong size) { uLong zipio_read(voidpf opaque, voidpf stream, void *buf, uLong size) {
ZipIOData *zd = (ZipIOData *)opaque; Ref<FileAccess> *fa = reinterpret_cast<Ref<FileAccess> *>(opaque);
return zd->f->get_buffer((uint8_t *)buf, size); ERR_FAIL_COND_V(fa == nullptr, 0);
ERR_FAIL_COND_V(fa->is_null(), 0);
return (*fa)->get_buffer((uint8_t *)buf, size);
} }
uLong zipio_write(voidpf opaque, voidpf stream, const void *buf, uLong size) { uLong zipio_write(voidpf opaque, voidpf stream, const void *buf, uLong size) {
ZipIOData *zd = (ZipIOData *)opaque; Ref<FileAccess> *fa = reinterpret_cast<Ref<FileAccess> *>(opaque);
zd->f->store_buffer((uint8_t *)buf, size); ERR_FAIL_COND_V(fa == nullptr, 0);
ERR_FAIL_COND_V(fa->is_null(), 0);
(*fa)->store_buffer((uint8_t *)buf, size);
return size; return size;
} }
long zipio_tell(voidpf opaque, voidpf stream) { long zipio_tell(voidpf opaque, voidpf stream) {
ZipIOData *zd = (ZipIOData *)opaque; Ref<FileAccess> *fa = reinterpret_cast<Ref<FileAccess> *>(opaque);
return zd->f->get_position(); ERR_FAIL_COND_V(fa == nullptr, 0);
ERR_FAIL_COND_V(fa->is_null(), 0);
return (*fa)->get_position();
} }
long zipio_seek(voidpf opaque, voidpf stream, uLong offset, int origin) { long zipio_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
ZipIOData *zd = (ZipIOData *)opaque; Ref<FileAccess> *fa = reinterpret_cast<Ref<FileAccess> *>(opaque);
ERR_FAIL_COND_V(fa == nullptr, 0);
ERR_FAIL_COND_V(fa->is_null(), 0);
uint64_t pos = offset; uint64_t pos = offset;
switch (origin) { switch (origin) {
case ZLIB_FILEFUNC_SEEK_CUR: case ZLIB_FILEFUNC_SEEK_CUR:
pos = zd->f->get_position() + offset; pos = (*fa)->get_position() + offset;
break; break;
case ZLIB_FILEFUNC_SEEK_END: case ZLIB_FILEFUNC_SEEK_END:
pos = zd->f->get_length() + offset; pos = (*fa)->get_length() + offset;
break; break;
default: default:
break; break;
} }
zd->f->seek(pos); (*fa)->seek(pos);
return 0; return 0;
} }
int zipio_close(voidpf opaque, voidpf stream) { int zipio_close(voidpf opaque, voidpf stream) {
ZipIOData *zd = (ZipIOData *)opaque; Ref<FileAccess> *fa = reinterpret_cast<Ref<FileAccess> *>(opaque);
memdelete(zd); ERR_FAIL_COND_V(fa == nullptr, 0);
ERR_FAIL_COND_V(fa->is_null(), 0);
fa->unref();
return 0; return 0;
} }
int zipio_testerror(voidpf opaque, voidpf stream) { int zipio_testerror(voidpf opaque, voidpf stream) {
ZipIOData *zd = (ZipIOData *)opaque; Ref<FileAccess> *fa = reinterpret_cast<Ref<FileAccess> *>(opaque);
return (zd->f.is_valid() && zd->f->get_error() != OK) ? 1 : 0; ERR_FAIL_COND_V(fa == nullptr, 1);
ERR_FAIL_COND_V(fa->is_null(), 0);
return (fa->is_valid() && (*fa)->get_error() != OK) ? 1 : 0;
} }
voidpf zipio_alloc(voidpf opaque, uInt items, uInt size) { voidpf zipio_alloc(voidpf opaque, uInt items, uInt size) {
@ -105,9 +123,9 @@ void zipio_free(voidpf opaque, voidpf address) {
memfree(address); memfree(address);
} }
zlib_filefunc_def zipio_create_io() { zlib_filefunc_def zipio_create_io(Ref<FileAccess> *p_data) {
zlib_filefunc_def io; zlib_filefunc_def io;
io.opaque = (void *)memnew(ZipIOData); io.opaque = (void *)p_data;
io.zopen_file = zipio_open; io.zopen_file = zipio_open;
io.zread_file = zipio_read; io.zread_file = zipio_read;
io.zwrite_file = zipio_write; io.zwrite_file = zipio_write;

6
core/io/zip_io.h
View File

@ -39,10 +39,6 @@
#include "thirdparty/minizip/unzip.h" #include "thirdparty/minizip/unzip.h"
#include "thirdparty/minizip/zip.h" #include "thirdparty/minizip/zip.h"
struct ZipIOData {
Ref<FileAccess> f;
};
void *zipio_open(voidpf opaque, const char *p_fname, int mode); void *zipio_open(voidpf opaque, const char *p_fname, int mode);
uLong zipio_read(voidpf opaque, voidpf stream, void *buf, uLong size); uLong zipio_read(voidpf opaque, voidpf stream, void *buf, uLong size);
uLong zipio_write(voidpf opaque, voidpf stream, const void *buf, uLong size); uLong zipio_write(voidpf opaque, voidpf stream, const void *buf, uLong size);
@ -57,6 +53,6 @@ int zipio_testerror(voidpf opaque, voidpf stream);
voidpf zipio_alloc(voidpf opaque, uInt items, uInt size); voidpf zipio_alloc(voidpf opaque, uInt items, uInt size);
void zipio_free(voidpf opaque, voidpf address); void zipio_free(voidpf opaque, voidpf address);
zlib_filefunc_def zipio_create_io(); zlib_filefunc_def zipio_create_io(Ref<FileAccess> *p_data);
#endif // ZIP_IO_H #endif // ZIP_IO_H

6
editor/editor_asset_installer.cpp
View File

@ -64,7 +64,8 @@ void EditorAssetInstaller::open(const String &p_path, int p_depth) {
package_path = p_path; package_path = p_path;
Set<String> files_sorted; Set<String> files_sorted;
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
unzFile pkg = unzOpen2(p_path.utf8().get_data(), &io); unzFile pkg = unzOpen2(p_path.utf8().get_data(), &io);
if (!pkg) { if (!pkg) {
@ -237,7 +238,8 @@ void EditorAssetInstaller::open(const String &p_path, int p_depth) {
} }
void EditorAssetInstaller::ok_pressed() { void EditorAssetInstaller::ok_pressed() {
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
unzFile pkg = unzOpen2(package_path.utf8().get_data(), &io); unzFile pkg = unzOpen2(package_path.utf8().get_data(), &io);
if (!pkg) { if (!pkg) {

3
editor/editor_export.cpp
View File

@ -1334,7 +1334,8 @@ Error EditorExportPlatform::save_pack(const Ref<EditorExportPreset> &p_preset, b
Error EditorExportPlatform::save_zip(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path) { Error EditorExportPlatform::save_zip(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path) {
EditorProgress ep("savezip", TTR("Packing"), 102, true); EditorProgress ep("savezip", TTR("Packing"), 102, true);
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
zipFile zip = zipOpen2(p_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io); zipFile zip = zipOpen2(p_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io);
ZipData zd; ZipData zd;

6
editor/export_template_manager.cpp
View File

@ -374,7 +374,8 @@ void ExportTemplateManager::_install_file() {
} }
bool ExportTemplateManager::_install_file_selected(const String &p_file, bool p_skip_progress) { bool ExportTemplateManager::_install_file_selected(const String &p_file, bool p_skip_progress) {
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
unzFile pkg = unzOpen2(p_file.utf8().get_data(), &io); unzFile pkg = unzOpen2(p_file.utf8().get_data(), &io);
if (!pkg) { if (!pkg) {
@ -676,7 +677,8 @@ Error ExportTemplateManager::install_android_template_from_file(const String &p_
// Uncompress source template. // Uncompress source template.
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
unzFile pkg = unzOpen2(p_file.utf8().get_data(), &io); unzFile pkg = unzOpen2(p_file.utf8().get_data(), &io);
ERR_FAIL_COND_V_MSG(!pkg, ERR_CANT_OPEN, "Android sources not in ZIP format."); ERR_FAIL_COND_V_MSG(!pkg, ERR_CANT_OPEN, "Android sources not in ZIP format.");

6
editor/project_manager.cpp
View File

@ -186,7 +186,8 @@ private:
if (mode == MODE_IMPORT || mode == MODE_RENAME) { if (mode == MODE_IMPORT || mode == MODE_RENAME) {
if (!valid_path.is_empty() && !d->file_exists("project.godot")) { if (!valid_path.is_empty() && !d->file_exists("project.godot")) {
if (valid_path.ends_with(".zip")) { if (valid_path.ends_with(".zip")) {
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
unzFile pkg = unzOpen2(valid_path.utf8().get_data(), &io); unzFile pkg = unzOpen2(valid_path.utf8().get_data(), &io);
if (!pkg) { if (!pkg) {
@ -499,7 +500,8 @@ private:
zip_path = project_path->get_text(); zip_path = project_path->get_text();
} }
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
unzFile pkg = unzOpen2(zip_path.utf8().get_data(), &io); unzFile pkg = unzOpen2(zip_path.utf8().get_data(), &io);
if (!pkg) { if (!pkg) {

8
platform/android/export/export_plugin.cpp
View File

@ -2775,7 +2775,8 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
return ERR_FILE_BAD_PATH; return ERR_FILE_BAD_PATH;
} }
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
if (ep.step(TTR("Creating APK..."), 0)) { if (ep.step(TTR("Creating APK..."), 0)) {
return ERR_SKIP; return ERR_SKIP;
@ -2789,7 +2790,8 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
int ret = unzGoToFirstFile(pkg); int ret = unzGoToFirstFile(pkg);
zlib_filefunc_def io2 = zipio_create_io(); Ref<FileAccess> io2_fa;
zlib_filefunc_def io2 = zipio_create_io(&io2_fa);
String tmp_unaligned_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpexport-unaligned." + uitos(OS::get_singleton()->get_unix_time()) + ".apk"); String tmp_unaligned_path = EditorPaths::get_singleton()->get_cache_dir().plus_file("tmpexport-unaligned." + uitos(OS::get_singleton()->get_unix_time()) + ".apk");
@ -2985,7 +2987,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
ret = unzGoToFirstFile(tmp_unaligned); ret = unzGoToFirstFile(tmp_unaligned);
io2 = zipio_create_io(); io2 = zipio_create_io(&io2_fa);
zipFile final_apk = zipOpen2(p_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io2); zipFile final_apk = zipOpen2(p_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io2);
// Take files from the unaligned APK and write them out to the aligned one // Take files from the unaligned APK and write them out to the aligned one

3
platform/iphone/export/export_plugin.cpp
View File

@ -1488,7 +1488,8 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
ERR_FAIL_COND_V(tmp_app_path.is_null(), ERR_CANT_CREATE); ERR_FAIL_COND_V(tmp_app_path.is_null(), ERR_CANT_CREATE);
print_line("Unzipping..."); print_line("Unzipping...");
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
unzFile src_pkg_zip = unzOpen2(src_pkg_name.utf8().get_data(), &io); unzFile src_pkg_zip = unzOpen2(src_pkg_name.utf8().get_data(), &io);
if (!src_pkg_zip) { if (!src_pkg_zip) {
EditorNode::add_io_error("Could not open export template (not a zip file?):\n" + src_pkg_name); EditorNode::add_io_error("Could not open export template (not a zip file?):\n" + src_pkg_name);

3
platform/javascript/api/javascript_tools_editor_plugin.cpp
View File

@ -64,7 +64,8 @@ void JavaScriptToolsEditorPlugin::_download_zip(Variant p_v) {
} }
String resource_path = ProjectSettings::get_singleton()->get_resource_path(); String resource_path = ProjectSettings::get_singleton()->get_resource_path();
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
// Name the downloaded ZIP file to contain the project name and download date for easier organization. // Name the downloaded ZIP file to contain the project name and download date for easier organization.
// Replace characters not allowed (or risky) in Windows file names with safe characters. // Replace characters not allowed (or risky) in Windows file names with safe characters.

3
platform/javascript/export/export_plugin.cpp
View File

@ -33,7 +33,8 @@
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
Error EditorExportPlatformJavaScript::_extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa) { Error EditorExportPlatformJavaScript::_extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa) {
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
unzFile pkg = unzOpen2(p_template.utf8().get_data(), &io); unzFile pkg = unzOpen2(p_template.utf8().get_data(), &io);
if (!pkg) { if (!pkg) {

6
platform/osx/export/export_plugin.cpp
View File

@ -722,7 +722,8 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
return ERR_FILE_BAD_PATH; return ERR_FILE_BAD_PATH;
} }
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
if (ep.step(TTR("Creating app bundle"), 0)) { if (ep.step(TTR("Creating app bundle"), 0)) {
return ERR_SKIP; return ERR_SKIP;
@ -1327,7 +1328,8 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
OS::get_singleton()->move_to_trash(p_path); OS::get_singleton()->move_to_trash(p_path);
} }
zlib_filefunc_def io_dst = zipio_create_io(); Ref<FileAccess> io_fa_dst;
zlib_filefunc_def io_dst = zipio_create_io(&io_fa_dst);
zipFile zip = zipOpen2(p_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io_dst); zipFile zip = zipOpen2(p_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io_dst);
_zip_folder_recursive(zip, tmp_base_path_name, "", pkg_name); _zip_folder_recursive(zip, tmp_base_path_name, "", pkg_name);

3
platform/uwp/export/export_plugin.cpp
View File

@ -301,7 +301,8 @@ Error EditorExportPlatformUWP::export_project(const Ref<EditorExportPreset> &p_p
AppxPackager packager; AppxPackager packager;
packager.init(fa_pack); packager.init(fa_pack);
zlib_filefunc_def io = zipio_create_io(); Ref<FileAccess> io_fa;
zlib_filefunc_def io = zipio_create_io(&io_fa);
if (ep.step("Creating package...", 0)) { if (ep.step("Creating package...", 0)) {
return ERR_SKIP; return ERR_SKIP;