2 files changed, 530 insertions, 16 deletions
diff --git a/src/Setup/Setup.vcxproj b/src/Setup/Setup.vcxproj
index c319dc1f..af2221aa 100644
--- a/src/Setup/Setup.vcxproj
+++ b/src/Setup/Setup.vcxproj
@@ -55,8 +55,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SETUP;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SETUP;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -65,7 +65,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4057;4100;4127;4201;4505;4701;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalOptions>/NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions>
@@ -93,8 +93,8 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" &gt;NUL
     <ClCompile>
       <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SETUP;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>SETUP;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>true</BufferSecurityCheck>
       <PrecompiledHeader>
@@ -104,7 +104,7 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" &gt;NUL
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>
       </DebugInformationFormat>
-      <DisableSpecificWarnings>4057;4100;4127;4201;4505;4701;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalOptions>/IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
@@ -129,8 +129,120 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" &gt;NUL
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\Common\XUnzip.cpp" />
-    <ClCompile Include="..\Common\XZip.cpp" />
+    <ClCompile Include="..\Common\libzip\mkstemp.c" />
+    <ClCompile Include="..\Common\libzip\zip_add.c" />
+    <ClCompile Include="..\Common\libzip\zip_add_dir.c" />
+    <ClCompile Include="..\Common\libzip\zip_add_entry.c" />
+    <ClCompile Include="..\Common\libzip\zip_buffer.c" />
+    <ClCompile Include="..\Common\libzip\zip_close.c" />
+    <ClCompile Include="..\Common\libzip\zip_delete.c" />
+    <ClCompile Include="..\Common\libzip\zip_dirent.c" />
+    <ClCompile Include="..\Common\libzip\zip_dir_add.c" />
+    <ClCompile Include="..\Common\libzip\zip_discard.c" />
+    <ClCompile Include="..\Common\libzip\zip_entry.c" />
+    <ClCompile Include="..\Common\libzip\zip_error.c" />
+    <ClCompile Include="..\Common\libzip\zip_error_clear.c" />
+    <ClCompile Include="..\Common\libzip\zip_error_get.c" />
+    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c" />
+    <ClCompile Include="..\Common\libzip\zip_error_strerror.c" />
+    <ClCompile Include="..\Common\libzip\zip_error_to_str.c" />
+    <ClCompile Include="..\Common\libzip\zip_err_str.c" />
+    <ClCompile Include="..\Common\libzip\zip_extra_field.c" />
+    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c" />
+    <ClCompile Include="..\Common\libzip\zip_fclose.c" />
+    <ClCompile Include="..\Common\libzip\zip_fdopen.c" />
+    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_add.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_error_get.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_rename.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_replace.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c" />
+    <ClCompile Include="..\Common\libzip\zip_file_strerror.c" />
+    <ClCompile Include="..\Common\libzip\zip_fopen.c" />
+    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c" />
+    <ClCompile Include="..\Common\libzip\zip_fopen_index.c" />
+    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c" />
+    <ClCompile Include="..\Common\libzip\zip_fread.c" />
+    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c" />
+    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c" />
+    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c" />
+    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c" />
+    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c" />
+    <ClCompile Include="..\Common\libzip\zip_get_name.c" />
+    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c" />
+    <ClCompile Include="..\Common\libzip\zip_get_num_files.c" />
+    <ClCompile Include="..\Common\libzip\zip_hash.c" />
+    <ClCompile Include="..\Common\libzip\zip_io_util.c" />
+    <ClCompile Include="..\Common\libzip\zip_memdup.c" />
+    <ClCompile Include="..\Common\libzip\zip_name_locate.c" />
+    <ClCompile Include="..\Common\libzip\zip_new.c" />
+    <ClCompile Include="..\Common\libzip\zip_open.c" />
+    <ClCompile Include="..\Common\libzip\zip_rename.c" />
+    <ClCompile Include="..\Common\libzip\zip_replace.c" />
+    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c" />
+    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c" />
+    <ClCompile Include="..\Common\libzip\zip_set_default_password.c" />
+    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c" />
+    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c" />
+    <ClCompile Include="..\Common\libzip\zip_set_name.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_buffer.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_call.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_close.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_crc.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_deflate.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_error.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_filep.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_free.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_function.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_layered.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_open.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_pkware.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_read.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_remove.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_seek.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_stat.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_supports.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_tell.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_win32a.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_win32w.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_window.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_write.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_zip.c" />
+    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c" />
+    <ClCompile Include="..\Common\libzip\zip_stat.c" />
+    <ClCompile Include="..\Common\libzip\zip_stat_index.c" />
+    <ClCompile Include="..\Common\libzip\zip_stat_init.c" />
+    <ClCompile Include="..\Common\libzip\zip_strerror.c" />
+    <ClCompile Include="..\Common\libzip\zip_string.c" />
+    <ClCompile Include="..\Common\libzip\zip_unchange.c" />
+    <ClCompile Include="..\Common\libzip\zip_unchange_all.c" />
+    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c" />
+    <ClCompile Include="..\Common\libzip\zip_unchange_data.c" />
+    <ClCompile Include="..\Common\libzip\zip_utf-8.c" />
+    <ClCompile Include="..\Common\zlib\adler32.c" />
+    <ClCompile Include="..\Common\zlib\compress.c" />
+    <ClCompile Include="..\Common\zlib\crc32.c" />
+    <ClCompile Include="..\Common\zlib\deflate.c" />
+    <ClCompile Include="..\Common\zlib\inffast.c" />
+    <ClCompile Include="..\Common\zlib\inflate.c" />
+    <ClCompile Include="..\Common\zlib\inftrees.c" />
+    <ClCompile Include="..\Common\zlib\trees.c" />
+    <ClCompile Include="..\Common\zlib\uncompr.c" />
+    <ClCompile Include="..\Common\zlib\zutil.c" />
     <ClCompile Include="ComSetup.cpp" />
     <ClCompile Include="Dir.c" />
     <ClCompile Include="SelfExtract.c" />
@@ -154,7 +266,6 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" &gt;NUL
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
     </ClCompile>
     <ClCompile Include="..\Common\Endian.c" />
-    <ClCompile Include="..\Common\Inflate.c" />
     <ClCompile Include="..\Common\Language.c" />
     <ClCompile Include="..\Common\Registry.c" />
   </ItemGroup>
@@ -174,8 +285,24 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" &gt;NUL
   <ItemGroup>
     <ClInclude Include="..\Common\Apidrvr.h" />
     <ClInclude Include="..\Common\Combo.h" />
+    <ClInclude Include="..\Common\libzip\compat.h" />
+    <ClInclude Include="..\Common\libzip\config.h" />
+    <ClInclude Include="..\Common\libzip\zconf.h" />
+    <ClInclude Include="..\Common\libzip\zip.h" />
+    <ClInclude Include="..\Common\libzip\zipint.h" />
+    <ClInclude Include="..\Common\libzip\zipwin32.h" />
     <ClInclude Include="..\Common\XUnzip.h" />
     <ClInclude Include="..\Common\XZip.h" />
+    <ClInclude Include="..\Common\zlib\crc32.h" />
+    <ClInclude Include="..\Common\zlib\deflate.h" />
+    <ClInclude Include="..\Common\zlib\inffast.h" />
+    <ClInclude Include="..\Common\zlib\inffixed.h" />
+    <ClInclude Include="..\Common\zlib\inflate.h" />
+    <ClInclude Include="..\Common\zlib\inftrees.h" />
+    <ClInclude Include="..\Common\zlib\trees.h" />
+    <ClInclude Include="..\Common\zlib\zconf.h" />
+    <ClInclude Include="..\Common\zlib\zlib.h" />
+    <ClInclude Include="..\Common\zlib\zutil.h" />
     <ClInclude Include="ComSetup.h" />
     <ClInclude Include="..\Common\Crc.h" />
     <ClInclude Include="Dir.h" />
diff --git a/src/Setup/Setup.vcxproj.filters b/src/Setup/Setup.vcxproj.filters
index 6f288370..18728ab8 100644
--- a/src/Setup/Setup.vcxproj.filters
+++ b/src/Setup/Setup.vcxproj.filters
@@ -19,6 +19,12 @@
     <Filter Include="Resource Files\Common">
       <UniqueIdentifier>{a540fb0a-850b-4cb9-85f9-ade0112ebb50}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Common\libzip">
+      <UniqueIdentifier>{72792e98-38ea-4b68-a06e-140c3941d057}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Common\zlib">
+      <UniqueIdentifier>{25bed244-7b06-46a3-8912-a3493143f281}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ComSetup.cpp">
@@ -54,20 +60,353 @@
     <ClCompile Include="..\Common\Endian.c">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\Inflate.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
     <ClCompile Include="..\Common\Language.c">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
     <ClCompile Include="..\Common\Registry.c">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\XZip.cpp">
-      <Filter>Source Files\Common</Filter>
+    <ClCompile Include="..\Common\libzip\mkstemp.c">
+      <Filter>Source Files\Common\libzip</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\XUnzip.cpp">
-      <Filter>Source Files\Common</Filter>
+    <ClCompile Include="..\Common\libzip\zip_add.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_add_entry.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_buffer.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_close.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_delete.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_dirent.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_discard.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_entry.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_err_str.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_error.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_error_clear.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_error_get.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_error_strerror.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_error_to_str.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_extra_field.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_fclose.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_add.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_error_get.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_rename.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_replace.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_file_strerror.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_fopen.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_fopen_index.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_fread.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_get_name.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_get_num_files.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_hash.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_io_util.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_memdup.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_name_locate.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_new.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_open.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_rename.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_replace.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_set_default_password.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_set_name.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_buffer.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_call.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_close.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_crc.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_deflate.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_error.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_free.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_function.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_layered.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_open.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_pkware.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_read.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_remove.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_seek.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_stat.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_supports.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_tell.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_win32a.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_win32w.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_window.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_write.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_zip.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_stat.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_stat_index.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_stat_init.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_strerror.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_string.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_unchange.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_unchange_all.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_unchange_data.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\libzip\zip_utf-8.c">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\zlib\adler32.c">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\zlib\compress.c">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\zlib\crc32.c">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\zlib\deflate.c">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\zlib\inffast.c">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\zlib\inflate.c">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\zlib\inftrees.c">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\zlib\trees.c">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\zlib\uncompr.c">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\zlib\zutil.c">
+      <Filter>Source Files\Common\zlib</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -160,6 +499,54 @@
     <ClInclude Include="..\Common\XUnzip.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\Common\libzip\compat.h">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\libzip\config.h">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\libzip\zconf.h">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\libzip\zip.h">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\libzip\zipint.h">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\libzip\zipwin32.h">
+      <Filter>Source Files\Common\libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\zlib\crc32.h">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\zlib\deflate.h">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\zlib\inffast.h">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\zlib\inffixed.h">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\zlib\inflate.h">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\zlib\inftrees.h">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\zlib\trees.h">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\zlib\zconf.h">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\zlib\zlib.h">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\zlib\zutil.h">
+      <Filter>Source Files\Common\zlib</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Manifest Include="Setup.manifest">