5 files changed, 153 insertions, 86 deletions
diff --git a/src/Common/Zip.vcxproj b/src/Common/Zip.vcxproj
index ec907d94..a9d567a7 100644
--- a/src/Common/Zip.vcxproj
+++ b/src/Common/Zip.vcxproj
@@ -25,6 +25,7 @@
     <ClCompile Include="libzip\zip_algorithm_deflate.c" />
     <ClCompile Include="libzip\zip_buffer.c" />
     <ClCompile Include="libzip\zip_close.c" />
+    <ClCompile Include="libzip\zip_crypto_win.c" />
     <ClCompile Include="libzip\zip_delete.c" />
     <ClCompile Include="libzip\zip_dirent.c" />
     <ClCompile Include="libzip\zip_dir_add.c" />
@@ -35,12 +36,12 @@
     <ClCompile Include="libzip\zip_error_get.c" />
     <ClCompile Include="libzip\zip_error_get_sys_type.c" />
     <ClCompile Include="libzip\zip_error_strerror.c" />
+    <ClCompile Include="libzip\zip_error_to_str.c" />
     <ClCompile Include="libzip\zip_err_str.c" />
     <ClCompile Include="libzip\zip_extra_field.c" />
     <ClCompile Include="libzip\zip_extra_field_api.c" />
     <ClCompile Include="libzip\zip_fclose.c" />
     <ClCompile Include="libzip\zip_fdopen.c" />
-    <ClCompile Include="libzip\zip_filerange_crc.c" />
     <ClCompile Include="libzip\zip_file_add.c" />
     <ClCompile Include="libzip\zip_file_error_clear.c" />
     <ClCompile Include="libzip\zip_file_error_get.c" />
@@ -50,6 +51,7 @@
     <ClCompile Include="libzip\zip_file_rename.c" />
     <ClCompile Include="libzip\zip_file_replace.c" />
     <ClCompile Include="libzip\zip_file_set_comment.c" />
+    <ClCompile Include="libzip\zip_file_set_encryption.c" />
     <ClCompile Include="libzip\zip_file_set_external_attributes.c" />
     <ClCompile Include="libzip\zip_file_set_mtime.c" />
     <ClCompile Include="libzip\zip_file_strerror.c" />
@@ -58,6 +60,8 @@
     <ClCompile Include="libzip\zip_fopen_index.c" />
     <ClCompile Include="libzip\zip_fopen_index_encrypted.c" />
     <ClCompile Include="libzip\zip_fread.c" />
+    <ClCompile Include="libzip\zip_fseek.c" />
+    <ClCompile Include="libzip\zip_ftell.c" />
     <ClCompile Include="libzip\zip_get_archive_comment.c" />
     <ClCompile Include="libzip\zip_get_archive_flag.c" />
     <ClCompile Include="libzip\zip_get_encryption_implementation.c" />
@@ -67,12 +71,14 @@
     <ClCompile Include="libzip\zip_get_num_files.c" />
     <ClCompile Include="libzip\zip_hash.c" />
     <ClCompile Include="libzip\zip_io_util.c" />
+    <ClCompile Include="libzip\zip_libzip_version.c" />
     <ClCompile Include="libzip\zip_memdup.c" />
     <ClCompile Include="libzip\zip_name_locate.c" />
     <ClCompile Include="libzip\zip_new.c" />
     <ClCompile Include="libzip\zip_open.c" />
     <ClCompile Include="libzip\zip_pkware.c" />
     <ClCompile Include="libzip\zip_progress.c" />
+    <ClCompile Include="libzip\zip_random_win32.c" />
     <ClCompile Include="libzip\zip_rename.c" />
     <ClCompile Include="libzip\zip_replace.c" />
     <ClCompile Include="libzip\zip_set_archive_comment.c" />
@@ -94,6 +100,7 @@
     <ClCompile Include="libzip\zip_source_file_common.c" />
     <ClCompile Include="libzip\zip_source_file_stdio.c" />
     <ClCompile Include="libzip\zip_source_file_win32.c" />
+    <ClCompile Include="libzip\zip_source_file_win32_ansi.c" />
     <ClCompile Include="libzip\zip_source_file_win32_named.c" />
     <ClCompile Include="libzip\zip_source_file_win32_utf16.c" />
     <ClCompile Include="libzip\zip_source_file_win32_utf8.c" />
@@ -115,6 +122,8 @@
     <ClCompile Include="libzip\zip_source_tell.c" />
     <ClCompile Include="libzip\zip_source_tell_write.c" />
     <ClCompile Include="libzip\zip_source_window.c" />
+    <ClCompile Include="libzip\zip_source_winzip_aes_decode.c" />
+    <ClCompile Include="libzip\zip_source_winzip_aes_encode.c" />
     <ClCompile Include="libzip\zip_source_write.c" />
     <ClCompile Include="libzip\zip_source_zip.c" />
     <ClCompile Include="libzip\zip_source_zip_new.c" />
@@ -128,6 +137,7 @@
     <ClCompile Include="libzip\zip_unchange_archive.c" />
     <ClCompile Include="libzip\zip_unchange_data.c" />
     <ClCompile Include="libzip\zip_utf-8.c" />
+    <ClCompile Include="libzip\zip_winzip_aes.c" />
     <ClCompile Include="zlib\adler32.c" />
     <ClCompile Include="zlib\compress.c" />
     <ClCompile Include="zlib\crc32.c" />
diff --git a/src/Common/Zip.vcxproj.filters b/src/Common/Zip.vcxproj.filters
index 88c8ff6f..209a93d6 100644
--- a/src/Common/Zip.vcxproj.filters
+++ b/src/Common/Zip.vcxproj.filters
@@ -66,9 +66,6 @@
     <ClCompile Include="libzip\zip_fdopen.c">
       <Filter>libzip</Filter>
     </ClCompile>
-    <ClCompile Include="libzip\zip_filerange_crc.c">
-      <Filter>libzip</Filter>
-    </ClCompile>
     <ClCompile Include="libzip\zip_file_add.c">
       <Filter>libzip</Filter>
     </ClCompile>
@@ -366,6 +363,39 @@
     <ClCompile Include="libzip\zip_err_str.c">
       <Filter>libzip</Filter>
     </ClCompile>
+    <ClCompile Include="libzip\zip_source_winzip_aes_decode.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_winzip_aes_encode.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_crypto_win.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_error_to_str.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_set_encryption.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_fseek.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_ftell.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_libzip_version.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_random_win32.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_file_win32_ansi.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_winzip_aes.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="libzip\compat.h">
diff --git a/src/Common/Zip_vs2019.vcxproj b/src/Common/Zip_vs2019.vcxproj
index f9bb543f..d60b4981 100644
--- a/src/Common/Zip_vs2019.vcxproj
+++ b/src/Common/Zip_vs2019.vcxproj
@@ -33,6 +33,7 @@
     <ClCompile Include="libzip\zip_algorithm_deflate.c" />
     <ClCompile Include="libzip\zip_buffer.c" />
     <ClCompile Include="libzip\zip_close.c" />
+    <ClCompile Include="libzip\zip_crypto_win.c" />
     <ClCompile Include="libzip\zip_delete.c" />
     <ClCompile Include="libzip\zip_dirent.c" />
     <ClCompile Include="libzip\zip_dir_add.c" />
@@ -43,12 +44,12 @@
     <ClCompile Include="libzip\zip_error_get.c" />
     <ClCompile Include="libzip\zip_error_get_sys_type.c" />
     <ClCompile Include="libzip\zip_error_strerror.c" />
+    <ClCompile Include="libzip\zip_error_to_str.c" />
     <ClCompile Include="libzip\zip_err_str.c" />
     <ClCompile Include="libzip\zip_extra_field.c" />
     <ClCompile Include="libzip\zip_extra_field_api.c" />
     <ClCompile Include="libzip\zip_fclose.c" />
     <ClCompile Include="libzip\zip_fdopen.c" />
-    <ClCompile Include="libzip\zip_filerange_crc.c" />
     <ClCompile Include="libzip\zip_file_add.c" />
     <ClCompile Include="libzip\zip_file_error_clear.c" />
     <ClCompile Include="libzip\zip_file_error_get.c" />
@@ -58,6 +59,7 @@
     <ClCompile Include="libzip\zip_file_rename.c" />
     <ClCompile Include="libzip\zip_file_replace.c" />
     <ClCompile Include="libzip\zip_file_set_comment.c" />
+    <ClCompile Include="libzip\zip_file_set_encryption.c" />
     <ClCompile Include="libzip\zip_file_set_external_attributes.c" />
     <ClCompile Include="libzip\zip_file_set_mtime.c" />
     <ClCompile Include="libzip\zip_file_strerror.c" />
@@ -66,6 +68,8 @@
     <ClCompile Include="libzip\zip_fopen_index.c" />
     <ClCompile Include="libzip\zip_fopen_index_encrypted.c" />
     <ClCompile Include="libzip\zip_fread.c" />
+    <ClCompile Include="libzip\zip_fseek.c" />
+    <ClCompile Include="libzip\zip_ftell.c" />
     <ClCompile Include="libzip\zip_get_archive_comment.c" />
     <ClCompile Include="libzip\zip_get_archive_flag.c" />
     <ClCompile Include="libzip\zip_get_encryption_implementation.c" />
@@ -75,12 +79,14 @@
     <ClCompile Include="libzip\zip_get_num_files.c" />
     <ClCompile Include="libzip\zip_hash.c" />
     <ClCompile Include="libzip\zip_io_util.c" />
+    <ClCompile Include="libzip\zip_libzip_version.c" />
     <ClCompile Include="libzip\zip_memdup.c" />
     <ClCompile Include="libzip\zip_name_locate.c" />
     <ClCompile Include="libzip\zip_new.c" />
     <ClCompile Include="libzip\zip_open.c" />
     <ClCompile Include="libzip\zip_pkware.c" />
     <ClCompile Include="libzip\zip_progress.c" />
+    <ClCompile Include="libzip\zip_random_win32.c" />
     <ClCompile Include="libzip\zip_rename.c" />
     <ClCompile Include="libzip\zip_replace.c" />
     <ClCompile Include="libzip\zip_set_archive_comment.c" />
@@ -102,6 +108,7 @@
     <ClCompile Include="libzip\zip_source_file_common.c" />
     <ClCompile Include="libzip\zip_source_file_stdio.c" />
     <ClCompile Include="libzip\zip_source_file_win32.c" />
+    <ClCompile Include="libzip\zip_source_file_win32_ansi.c" />
     <ClCompile Include="libzip\zip_source_file_win32_named.c" />
     <ClCompile Include="libzip\zip_source_file_win32_utf16.c" />
     <ClCompile Include="libzip\zip_source_file_win32_utf8.c" />
@@ -123,6 +130,8 @@
     <ClCompile Include="libzip\zip_source_tell.c" />
     <ClCompile Include="libzip\zip_source_tell_write.c" />
     <ClCompile Include="libzip\zip_source_window.c" />
+    <ClCompile Include="libzip\zip_source_winzip_aes_decode.c" />
+    <ClCompile Include="libzip\zip_source_winzip_aes_encode.c" />
     <ClCompile Include="libzip\zip_source_write.c" />
     <ClCompile Include="libzip\zip_source_zip.c" />
     <ClCompile Include="libzip\zip_source_zip_new.c" />
@@ -136,6 +145,7 @@
     <ClCompile Include="libzip\zip_unchange_archive.c" />
     <ClCompile Include="libzip\zip_unchange_data.c" />
     <ClCompile Include="libzip\zip_utf-8.c" />
+    <ClCompile Include="libzip\zip_winzip_aes.c" />
     <ClCompile Include="zlib\adler32.c" />
     <ClCompile Include="zlib\compress.c" />
     <ClCompile Include="zlib\crc32.c" />
@@ -272,6 +282,10 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <Lib>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <ClCompile>
@@ -287,6 +301,10 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <Lib>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -302,6 +320,10 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <Lib>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -321,6 +343,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
+    <Lib>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <ClCompile>
@@ -340,6 +366,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
+    <Lib>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -359,6 +389,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
+    <Lib>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/Common/libzip/zip_err_str.c b/src/Common/libzip/zip_err_str.c
index e0a04a94..c9b1504e 100644
--- a/src/Common/libzip/zip_err_str.c
+++ b/src/Common/libzip/zip_err_str.c
@@ -1,84 +1,77 @@
 /*
-   This file was generated automatically by ./make_zip_err_str.sh
-   from ./zip.h; make changes there.
- */
+  This file was generated automatically by CMake
+  from zip.h and zipint.h; make changes there.
+*/
 
 #include "zipint.h"
 
-const char * const _zip_err_str[] = {
-    "No error",
-    "Multi-disk zip archives not supported",
-    "Renaming temporary file failed",
-    "Closing zip archive failed",
-    "Seek error",
-    "Read error",
-    "Write error",
-    "CRC error",
-    "Containing zip archive was closed",
-    "No such file",
-    "File already exists",
-    "Can't open file",
-    "Failure to create temporary file",
-    "Zlib error",
-    "Malloc failure",
-    "Entry has been changed",
-    "Compression method not supported",
-    "Premature end of file",
-    "Invalid argument",
-    "Not a zip archive",
-    "Internal error",
-    "Zip archive inconsistent",
-    "Can't remove file",
-    "Entry has been deleted",
-    "Encryption method not supported",
-    "Read-only archive",
-    "No password provided",
-    "Wrong password provided",
-    "Operation not supported",
-    "Resource still in use",
-    "Tell error",
-    "Compressed data invalid",
-    "Operation cancelled",
-};
-
-const int _zip_nerr_str = sizeof(_zip_err_str)/sizeof(_zip_err_str[0]);
-
+#define L ZIP_ET_LIBZIP
 #define N ZIP_ET_NONE
 #define S ZIP_ET_SYS
 #define Z ZIP_ET_ZLIB
 
-const int _zip_err_type[] = {
-    N,
-    N,
-    S,
-    S,
-    S,
-    S,
-    S,
-    N,
-    N,
-    N,
-    N,
-    S,
-    S,
-    Z,
-    N,
-    N,
-    N,
-    N,
-    N,
-    N,
-    N,
-    N,
-    S,
-    N,
-    N,
-    N,
-    N,
-    N,
-    N,
-    N,
-    S,
-    N,
-    N,
+#define E ZIP_DETAIL_ET_ENTRY
+#define G ZIP_DETAIL_ET_GLOBAL
+
+const struct _zip_err_info _zip_err_str[] = {
+    { N, "No error" },
+    { N, "Multi-disk zip archives not supported" },
+    { S, "Renaming temporary file failed" },
+    { S, "Closing zip archive failed" },
+    { S, "Seek error" },
+    { S, "Read error" },
+    { S, "Write error" },
+    { N, "CRC error" },
+    { N, "Containing zip archive was closed" },
+    { N, "No such file" },
+    { N, "File already exists" },
+    { S, "Can't open file" },
+    { S, "Failure to create temporary file" },
+    { Z, "Zlib error" },
+    { N, "Malloc failure" },
+    { N, "Entry has been changed" },
+    { N, "Compression method not supported" },
+    { N, "Premature end of file" },
+    { N, "Invalid argument" },
+    { N, "Not a zip archive" },
+    { N, "Internal error" },
+    { L, "Zip archive inconsistent" },
+    { S, "Can't remove file" },
+    { N, "Entry has been deleted" },
+    { N, "Encryption method not supported" },
+    { N, "Read-only archive" },
+    { N, "No password provided" },
+    { N, "Wrong password provided" },
+    { N, "Operation not supported" },
+    { N, "Resource still in use" },
+    { S, "Tell error" },
+    { N, "Compressed data invalid" },
+    { N, "Operation cancelled" },
 };
+
+const int _zip_err_str_count = sizeof(_zip_err_str)/sizeof(_zip_err_str[0]);
+
+const struct _zip_err_info _zip_err_details[] = {
+    { G, "no detail" },
+    { G, "central directory overlaps EOCD, or there is space between them" },
+    { G, "archive comment length incorrect" },
+    { G, "central directory length invalid" },
+    { E, "central header invalid" },
+    { G, "central directory count of entries is incorrect" },
+    { E, "local and central headers do not match" },
+    { G, "wrong EOCD length" },
+    { G, "EOCD64 overlaps EOCD, or there is space between them" },
+    { G, "EOCD64 magic incorrect" },
+    { G, "EOCD64 and EOCD do not match" },
+    { G, "invalid value in central directory" },
+    { E, "variable size fields overflow header" },
+    { E, "invalid UTF-8 in filename" },
+    { E, "invalid UTF-8 in comment" },
+    { E, "invalid Zip64 extra field" },
+    { E, "invalid WinZip AES extra field" },
+    { E, "garbage at end of extra fields" },
+    { E, "extra field length is invalid" },
+    { E, "file length in header doesn't match actual file length" },
+};
+
+const int _zip_err_details_count = sizeof(_zip_err_details)/sizeof(_zip_err_details[0]);
diff --git a/src/ExpandVolume/ExpandVolume_vs2019.vcxproj b/src/ExpandVolume/ExpandVolume_vs2019.vcxproj
index c2db2f65..835a4d3b 100644
--- a/src/ExpandVolume/ExpandVolume_vs2019.vcxproj
+++ b/src/ExpandVolume/ExpandVolume_vs2019.vcxproj
@@ -49,22 +49,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -74,7 +74,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -84,7 +84,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>