zlib-1.2.7

4 files changed, 42 insertions, 11 deletions

diff --git a/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj b/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj
index 2d62815..bcb08ff 100644
--- a/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj
@@ -139,7 +139,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

       <SubSystem>Console</SubSystem>

@@ -169,7 +169,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

@@ -200,7 +200,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

       <SubSystem>Console</SubSystem>

@@ -227,7 +227,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>

       <SubSystem>Console</SubSystem>

@@ -257,7 +257,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

@@ -288,7 +288,7 @@
     </ClCompile>

     <Link>

       <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>

+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

diff --git a/compat/zlib/contrib/vstudio/vc10/zlib.rc b/compat/zlib/contrib/vstudio/vc10/zlib.rc
index f822450..8eca4db 100644
--- a/compat/zlib/contrib/vstudio/vc10/zlib.rc
+++ b/compat/zlib/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
 

 #define IDR_VERSION1  1

 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION	 1,2,5,0

-  PRODUCTVERSION 1,2,5,0

+  FILEVERSION	 1.2.7,0

+  PRODUCTVERSION 1.2.7,0

   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK

   FILEFLAGS	0

   FILEOS	VOS_DOS_WINDOWS32

@@ -17,12 +17,12 @@ BEGIN
 

     BEGIN

       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"

-      VALUE "FileVersion",	"1.2.5\0"

+      VALUE "FileVersion",	"1.2.7\0"

       VALUE "InternalName",	"zlib\0"

       VALUE "OriginalFilename",	"zlib.dll\0"

       VALUE "ProductName",	"ZLib.DLL\0"

       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"

-      VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0"

+      VALUE "LegalCopyright", "(C) 1995-2012 Jean-loup Gailly & Mark Adler\0"

     END

   END

   BLOCK "VarFileInfo"

diff --git a/compat/zlib/contrib/vstudio/vc10/zlibvc.def b/compat/zlib/contrib/vstudio/vc10/zlibvc.def
index 0269ef7..18ddf50 100644
--- a/compat/zlib/contrib/vstudio/vc10/zlibvc.def
+++ b/compat/zlib/contrib/vstudio/vc10/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY

 ; zlib data compression and ZIP file I/O library

 

-VERSION		1.24

+VERSION		1.2.7

 

 EXPORTS

         adler32                                  @1

@@ -55,6 +55,7 @@ EXPORTS
         gzungetc                                 @49

         zlibCompileFlags                         @50

         deflatePrime                             @51

+        deflatePending                           @52

 

         unzOpen                                  @61

         unzClose                                 @62

@@ -128,3 +129,11 @@ EXPORTS
         inflatePrime                            @158

         inflateReset2                           @159

         inflateUndermine                        @160

+

+; zlib1 v1.2.6 added:

+        gzgetc_                                 @161

+        inflateResetKeep                        @163

+        deflateResetKeep                        @164

+
+; zlib1 v1.2.7 added:
+        gzopen_w                                @165
diff --git a/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj b/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
index 9862398..9218fdc 100644
--- a/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
+++ b/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -180,6 +180,12 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>

+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <Midl>

@@ -227,6 +233,10 @@
       </DataExecutionPrevention>

       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

     </Link>

+    <PreBuildEvent>

+      <Command>cd ..\..\masmx86

+bld_ml32.bat</Command>

+    </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">

     <Midl>

@@ -324,6 +334,10 @@
       </DataExecutionPrevention>

       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

     </Link>

+    <PreBuildEvent>

+      <Command>cd ..\..\masmx86

+bld_ml32.bat</Command>

+    </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <Midl>

@@ -368,6 +382,10 @@
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

+    <PreBuildEvent>

+      <Command>cd ..\..\contrib\masmx64

+bld_ml64.bat</Command>

+    </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

     <Midl>

@@ -547,6 +565,10 @@
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

       <TargetMachine>MachineX64</TargetMachine>

     </Link>

+    <PreBuildEvent>

+      <Command>cd ..\..\masmx64

+bld_ml64.bat</Command>

+    </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

     <Midl>