Make ZipSharp work on Windows

This patch adds the zlib functions needed by ZipSharp to the VS
MonoPosixHelper.def export file.

This patch also changes the ZipSharp code to use different code paths
depending on the size of the C long type on the underlying platform. On
gcc/clang the C long type follows the bitness of the targeted architecture,
it's 32-bit on 32-bit systems and 64-bit on 64-bit systems. With the VS
compiler however, the C long type is always 32-bit regardless of the target
architecture. zlib and minizip uses C long in a number of different function
signatures and structs.

1 files changed, 15 insertions, 4 deletions

diff --git a/msvc/monoposixhelper.vcxproj b/msvc/monoposixhelper.vcxproj
index 83304969ab2..de0276892fa 100644
--- a/msvc/monoposixhelper.vcxproj
+++ b/msvc/monoposixhelper.vcxproj
@@ -87,7 +87,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;_WIN32_WINNT=0x0600;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -96,6 +95,7 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <CompileAs>CompileAsC</CompileAs>

+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -120,7 +120,6 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;__x86_64__;_WIN32_WINNT=0x0600;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -129,6 +128,7 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <CompileAs>CompileAsC</CompileAs>

+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

@@ -147,13 +147,13 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>MinSpace</Optimization>

-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;_WIN32_WINNT=0x0600;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <CompileAs>CompileAsC</CompileAs>

+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <AdditionalDependencies>eglib.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -180,13 +180,13 @@
     </Midl>

     <ClCompile>

       <Optimization>MinSpace</Optimization>

-      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;__x86_64__;_WIN32_WINNT=0x0600;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <CompileAs>CompileAsC</CompileAs>

+      <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_DIR)/support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

@@ -215,6 +215,11 @@
     <ClCompile Include="..\support\inflate.c" />

     <ClCompile Include="..\support\inftrees.c" />

     <ClCompile Include="..\support\map.c" />

+    <ClCompile Include="..\support\minizip\ioapi.c" />

+    <ClCompile Include="..\support\minizip\iowin32.c" />

+    <ClCompile Include="..\support\minizip\minizip.c" />

+    <ClCompile Include="..\support\minizip\unzip.c" />

+    <ClCompile Include="..\support\minizip\zip.c" />

     <ClCompile Include="..\support\signal.c" />

     <ClCompile Include="..\support\stdio.c" />

     <ClCompile Include="..\support\stdlib.c" />

@@ -232,9 +237,15 @@
     <ClInclude Include="..\support\inflate.h" />

     <ClInclude Include="..\support\inftrees.h" />

     <ClInclude Include="..\support\map.h" />

+    <ClInclude Include="..\support\minizip\crypt.h" />

+    <ClInclude Include="..\support\minizip\ioapi.h" />

+    <ClInclude Include="..\support\minizip\iowin32.h" />

+    <ClInclude Include="..\support\minizip\unzip.h" />

+    <ClInclude Include="..\support\minizip\zip.h" />

     <ClInclude Include="..\support\mph.h" />

     <ClInclude Include="..\support\trees.h" />

     <ClInclude Include="..\support\zconf.h" />

+    <ClInclude Include="..\support\zlib.h" />

     <ClInclude Include="..\support\zutil.h" />

   </ItemGroup>

   <ItemGroup>