1 files changed, 6777 insertions, 0 deletions

diff --git a/debian/patches/zlib-1.2.8.diff b/debian/patches/zlib-1.2.8.diff
new file mode 100644
index 0000000..ec4ff91
--- /dev/null
+++ b/debian/patches/zlib-1.2.8.diff
@@ -0,0 +1,6777 @@
+diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
+index 7ee3bc4..0c0247c 100644
+--- a/zlib/CMakeLists.txt
++++ b/zlib/CMakeLists.txt
+@@ -3,7 +3,10 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+ 
+ project(zlib C)
+ 
+-set(VERSION "1.2.7")
++set(VERSION "1.2.8")
++
++option(ASM686 "Enable building i686 assembly implementation")
++option(AMD64 "Enable building amd64 assembly implementation")
+ 
+ set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
+ set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
+@@ -121,11 +124,44 @@ set(ZLIB_SRCS
+ )
+ 
+ if(NOT MINGW)
+-    set(ZLIB_SRCS ${ZLIB_SRCS}
++    set(ZLIB_DLL_SRCS
+         win32/zlib1.rc # If present will override custom build rule below.
+     )
+ endif()
+ 
++if(CMAKE_COMPILER_IS_GNUCC)
++    if(ASM686)
++        set(ZLIB_ASMS contrib/asm686/match.S)
++    elseif (AMD64)
++        set(ZLIB_ASMS contrib/amd64/amd64-match.S)
++    endif ()
++
++	if(ZLIB_ASMS)
++		add_definitions(-DASMV)
++		set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
++	endif()
++endif()
++
++if(MSVC)
++    if(ASM686)
++		ENABLE_LANGUAGE(ASM_MASM)
++        set(ZLIB_ASMS
++			contrib/masmx86/inffas32.asm
++			contrib/masmx86/match686.asm
++		)
++    elseif (AMD64)
++		ENABLE_LANGUAGE(ASM_MASM)
++        set(ZLIB_ASMS
++			contrib/masmx64/gvmat64.asm
++			contrib/masmx64/inffasx64.asm
++		)
++    endif()
++
++	if(ZLIB_ASMS)
++		add_definitions(-DASMV -DASMINF)
++	endif()
++endif()
++
+ # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
+ string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+@@ -134,7 +170,7 @@ string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+ if(MINGW)
+     # This gets us DLL resource information when compiling on MinGW.
+     if(NOT CMAKE_RC_COMPILER)
+-        SET(CMAKE_RC_COMPILER windres.exe)
++        set(CMAKE_RC_COMPILER windres.exe)
+     endif()
+ 
+     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+@@ -144,11 +180,11 @@ if(MINGW)
+                             -I ${CMAKE_CURRENT_BINARY_DIR}
+                             -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                             -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+-    set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
++    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+ endif(MINGW)
+ 
+-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
++add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
++add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+ set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
+ 
+@@ -166,7 +202,9 @@ endif()
+ if(UNIX)
+     # On unix-like platforms the library is almost always called libz
+    set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+-   set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map")
++   if(NOT APPLE)
++     set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
++   endif()
+ elseif(BUILD_SHARED_LIBS AND WIN32)
+     # Creates zlib1.dll when building shared library version
+     set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+diff --git a/zlib/ChangeLog b/zlib/ChangeLog
+index 3db202f..47cb65d 100644
+--- a/zlib/ChangeLog
++++ b/zlib/ChangeLog
+@@ -1,5 +1,68 @@
+ 
+-	        ChangeLog file for zlib
++                ChangeLog file for zlib
++
++Changes in 1.2.8 (28 Apr 2013)
++- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
++- Do not force Z_CONST for C++
++- Clean up contrib/vstudio [Ro§]
++- Correct spelling error in zlib.h
++- Fix mixed line endings in contrib/vstudio
++
++Changes in 1.2.7.3 (13 Apr 2013)
++- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
++
++Changes in 1.2.7.2 (13 Apr 2013)
++- Change check for a four-byte type back to hexadecimal
++- Fix typo in win32/Makefile.msc
++- Add casts in gzwrite.c for pointer differences
++
++Changes in 1.2.7.1 (24 Mar 2013)
++- Replace use of unsafe string functions with snprintf if available
++- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
++- Fix gzgetc undefine when Z_PREFIX set [Turk]
++- Eliminate use of mktemp in Makefile (not always available)
++- Fix bug in 'F' mode for gzopen()
++- Add inflateGetDictionary() function
++- Correct comment in deflate.h
++- Use _snprintf for snprintf in Microsoft C
++- On Darwin, only use /usr/bin/libtool if libtool is not Apple
++- Delete "--version" file if created by "ar --version" [Richard G.]
++- Fix configure check for veracity of compiler error return codes
++- Fix CMake compilation of static lib for MSVC2010 x64
++- Remove unused variable in infback9.c
++- Fix argument checks in gzlog_compress() and gzlog_write()
++- Clean up the usage of z_const and respect const usage within zlib
++- Clean up examples/gzlog.[ch] comparisons of different types
++- Avoid shift equal to bits in type (caused endless loop)
++- Fix unintialized value bug in gzputc() introduced by const patches
++- Fix memory allocation error in examples/zran.c [Nor]
++- Fix bug where gzopen(), gzclose() would write an empty file
++- Fix bug in gzclose() when gzwrite() runs out of memory
++- Check for input buffer malloc failure in examples/gzappend.c
++- Add note to contrib/blast to use binary mode in stdio
++- Fix comparisons of differently signed integers in contrib/blast
++- Check for invalid code length codes in contrib/puff
++- Fix serious but very rare decompression bug in inftrees.c
++- Update inflateBack() comments, since inflate() can be faster
++- Use underscored I/O function names for WINAPI_FAMILY
++- Add _tr_flush_bits to the external symbols prefixed by --zprefix
++- Add contrib/vstudio/vc10 pre-build step for static only
++- Quote --version-script argument in CMakeLists.txt
++- Don't specify --version-script on Apple platforms in CMakeLists.txt
++- Fix casting error in contrib/testzlib/testzlib.c
++- Fix types in contrib/minizip to match result of get_crc_table()
++- Simplify contrib/vstudio/vc10 with 'd' suffix
++- Add TOP support to win32/Makefile.msc
++- Suport i686 and amd64 assembler builds in CMakeLists.txt
++- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
++- Add vc11 and vc12 build files to contrib/vstudio
++- Add gzvprintf() as an undocumented function in zlib
++- Fix configure for Sun shell
++- Remove runtime check in configure for four-byte integer type
++- Add casts and consts to ease user conversion to C++
++- Add man pages for minizip and miniunzip
++- In Makefile uninstall, don't rm if preceding cd fails
++- Do not return Z_BUF_ERROR if deflateParam() has nothing to write
+ 
+ Changes in 1.2.7 (2 May 2012)
+ - Replace use of memmove() with a simple copy for portability
+@@ -1112,15 +1175,15 @@ Changes in 1.0.6 (19 Jan 1998)
+ - added Makefile.nt (thanks to Stephen Williams)
+ - added the unsupported "contrib" directory:
+    contrib/asm386/ by Gilles Vollant <info@winimage.com>
+-	386 asm code replacing longest_match().
++        386 asm code replacing longest_match().
+    contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
+-	A C++ I/O streams interface to the zlib gz* functions
++        A C++ I/O streams interface to the zlib gz* functions
+    contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
+-	Another C++ I/O streams interface
++        Another C++ I/O streams interface
+    contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+-	A very simple tar.gz file extractor using zlib
++        A very simple tar.gz file extractor using zlib
+    contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
+-	How to use compress(), uncompress() and the gz* functions from VB.
++        How to use compress(), uncompress() and the gz* functions from VB.
+ - pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
+   level) in minigzip (thanks to Tom Lane)
+ 
+diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
+index 736be14..252f229 100644
+--- a/zlib/ChangeLog.gcj
++++ b/zlib/ChangeLog.gcj
+@@ -1,8 +1,12 @@
+-2015-03-31  H.J. Lu  <hongjiu.lu@intel.com>
++2015-11-23  Matthias Klose  <doko@ubuntu.com>
+ 
+-	* configure.ac (AM_ENABLE_MULTILIB): Use only if
+-	${with_target_subdir} isn't empty.
+-	* configure: Regenerated.
++	* Imported zlib 1.2.8; merged local changes.
++
++2015-05-13  Michael Haubenwallner  <michael.haubenwallner@ssi-schaefer.com>
++
++	* Makefile.in: Regenerated with automake-1.11.6.
++	* aclocal.m4: Likewise.
++	* configure: Likewise.
+ 
+ 2014-11-11  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+ 
+diff --git a/zlib/Makefile.in b/zlib/Makefile.in
+index 3c8fd59..82b72a1 100644
+--- a/zlib/Makefile.in
++++ b/zlib/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,23 @@
+ 
+ 
+ VPATH = @srcdir@
++am__make_dryrun = \
++  { \
++    am__dry=no; \
++    case $$MAKEFLAGS in \
++      *\\[\ \	]*) \
++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++      *) \
++        for am__flg in $$MAKEFLAGS; do \
++          case $$am__flg in \
++            *=*|--*) ;; \
++            *n*) am__dry=yes; break;; \
++          esac; \
++        done;; \
++    esac; \
++    test $$am__dry = yes; \
++  }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -77,6 +94,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++  test -z "$$files" \
++    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++         $(am__cd) "$$dir" && rm -f $$files; }; \
++  }
+ am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
+ LIBRARIES = $(toolexeclib_LIBRARIES)
+ ARFLAGS = cru
+@@ -120,6 +143,11 @@ MULTIDIRS =
+ MULTISUBDIR = 
+ MULTIDO = true
+ MULTICLEAN = true
++am__can_run_installinfo = \
++  case $$AM_UPDATE_INFO_DIR in \
++    n|no|NO) false;; \
++    *) (install-info --version) >/dev/null 2>&1;; \
++  esac
+ ETAGS = etags
+ CTAGS = ctags
+ ACLOCAL = @ACLOCAL@
+@@ -303,7 +331,7 @@ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+-am--refresh:
++am--refresh: Makefile
+ 	@:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+@@ -339,7 +367,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ install-toolexeclibLIBRARIES: $(toolexeclib_LIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(toolexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibdir)"
+ 	@list='$(toolexeclib_LIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \
+ 	list2=; for p in $$list; do \
+ 	  if test -f $$p; then \
+@@ -347,6 +374,8 @@ install-toolexeclibLIBRARIES: $(toolexeclib_LIBRARIES)
+ 	  else :; fi; \
+ 	done; \
+ 	test -z "$$list2" || { \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(toolexeclibdir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(toolexeclibdir)" || exit 1; \
+ 	  echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(toolexeclibdir)'"; \
+ 	  $(INSTALL_DATA) $$list2 "$(DESTDIR)$(toolexeclibdir)" || exit $$?; }
+ 	@$(POST_INSTALL)
+@@ -363,13 +392,11 @@ uninstall-toolexeclibLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(toolexeclib_LIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	test -n "$$files" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(toolexeclibdir)' && rm -f "$$files" )"; \
+-	cd "$(DESTDIR)$(toolexeclibdir)" && rm -f $$files
++	dir='$(DESTDIR)$(toolexeclibdir)'; $(am__uninstall_files_from_dir)
+ 
+ clean-toolexeclibLIBRARIES:
+ 	-test -z "$(toolexeclib_LIBRARIES)" || rm -f $(toolexeclib_LIBRARIES)
+-libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) 
++libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES) 
+ 	-rm -f libz.a
+ 	$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD)
+ 	$(RANLIB) libz.a
+@@ -382,7 +409,7 @@ clean-noinstLTLIBRARIES:
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-libzgcj_convenience.la: $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_DEPENDENCIES) 
++libzgcj_convenience.la: $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_DEPENDENCIES) $(EXTRA_libzgcj_convenience_la_DEPENDENCIES) 
+ 	$(LINK) $(am_libzgcj_convenience_la_rpath) $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+@@ -584,10 +611,15 @@ install-am: all-am
+ 
+ installcheck: installcheck-am
+ install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+-	  `test -z '$(STRIP)' || \
+-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++	if test -z '$(STRIP)'; then \
++	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	      install; \
++	else \
++	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++	fi
+ mostlyclean-generic:
+ 
+ clean-generic:
+diff --git a/zlib/README b/zlib/README
+index 7e50f19..9e98215 100644
+--- a/zlib/README
++++ b/zlib/README
+@@ -3,7 +3,7 @@ shipped with GCC as convenience.
+ 
+ ZLIB DATA COMPRESSION LIBRARY
+ 
+-zlib 1.2.7 is a general purpose data compression library.  All the code is
++zlib 1.2.8 is a general purpose data compression library.  All the code is
+ thread safe.  The data format used by the zlib library is described by RFCs
+ (Request for Comments) 1950 to 1952 in the files
+ http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
+@@ -34,7 +34,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
+ issue of Dr.  Dobb's Journal; a copy of the article is available at
+ http://marknelson.us/1997/01/01/zlib-engine/ .
+ 
+-The changes made in version 1.2.7 are documented in the file ChangeLog.
++The changes made in version 1.2.8 are documented in the file ChangeLog.
+ 
+ Unsupported third party contributions are provided in directory contrib/ .
+ 
+@@ -87,7 +87,7 @@ Acknowledgments:
+ 
+ Copyright notice:
+ 
+- (C) 1995-2012 Jean-loup Gailly and Mark Adler
++ (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ 
+   This software is provided 'as-is', without any express or implied
+   warranty.  In no event will the authors be held liable for any damages
+diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4
+index b79c935..fab04ed 100644
+--- a/zlib/aclocal.m4
++++ b/zlib/aclocal.m4
+@@ -1,7 +1,8 @@
+-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
++# Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -19,12 +20,15 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+ 
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
++# Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
++# serial 1
++
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+@@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.11.1], [],
++m4_if([$1], [1.11.6], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11.1])dnl
++[AM_AUTOMAKE_VERSION([1.11.6])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
++# serial 1
++
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+ # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+@@ -144,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+ 
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+-# Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
++# 2010, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 10
++# serial 12
+ 
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -191,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
+   # instance it was reported that on HP-UX the gcc test will end up
+   # making a dummy file named `D' -- because `-MD' means `put the output
+   # in D'.
++  rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+   # using a relative directory.
+@@ -255,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
+ 	break
+       fi
+       ;;
+-    msvisualcpp | msvcmsys)
++    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+       # This compiler won't grok `-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+@@ -320,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK],
+ if test "x$enable_dependency_tracking" != xno; then
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
++  am__nodep='_no'
+ fi
+ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+ AC_SUBST([AMDEPBACKSLASH])dnl
+ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
++AC_SUBST([am__nodep])dnl
++_AM_SUBST_NOTMAKE([am__nodep])dnl
+ ])
+ 
+ # Generate code to set up dependency tracking.              -*- Autoconf -*-
+@@ -545,12 +555,15 @@ for _am_header in $config_headers :; do
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+ 
+-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
++# Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
++# serial 1
++
+ # AM_PROG_INSTALL_SH
+ # ------------------
+ # Define $install_sh.
+@@ -569,8 +582,8 @@ AC_SUBST(install_sh)])
+ # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+ # From Jim Meyering
+ 
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
++# 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -590,7 +603,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
+        [disable], [m4_define([am_maintainer_other], [enable])],
+        [m4_define([am_maintainer_other], [enable])
+         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
++AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+   AC_ARG_ENABLE([maintainer-mode],
+ [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
+@@ -701,12 +714,15 @@ else
+ fi
+ ])
+ 
+-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
++# Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
++# serial 1
++
+ # AM_PROG_MKDIR_P
+ # ---------------
+ # Check for `mkdir -p'.
+@@ -729,13 +745,14 @@ esac
+ 
+ # Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
++# Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 4
++# serial 5
+ 
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -743,13 +760,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
+ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+ 
+ # _AM_SET_OPTION(NAME)
+-# ------------------------------
++# --------------------
+ # Set option NAME.  Presently that only means defining a flag for this option.
+ AC_DEFUN([_AM_SET_OPTION],
+ [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+ 
+ # _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
++# ------------------------
+ # OPTIONS is a space-separated list of Automake options.
+ AC_DEFUN([_AM_SET_OPTIONS],
+ [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+@@ -825,12 +842,14 @@ Check your system clock])
+ fi
+ AC_MSG_RESULT(yes)])
+ 
+-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
++# serial 1
++
+ # AM_PROG_INSTALL_STRIP
+ # ---------------------
+ # One issue with vendor `install' (even GNU) is that you can't
+@@ -853,13 +872,13 @@ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ 
+-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
++# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 2
++# serial 3
+ 
+ # _AM_SUBST_NOTMAKE(VARIABLE)
+ # ---------------------------
+@@ -868,13 +887,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ AC_DEFUN([_AM_SUBST_NOTMAKE])
+ 
+ # AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
++# --------------------------
+ # Public sister of _AM_SUBST_NOTMAKE.
+ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+ 
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ 
+-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -896,10 +915,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+ # a tarball read from stdin.
+ #     $(am__untar) < result.tar
+ AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
++[# Always define AMTAR for backward compatibility.  Yes, it's still used
++# in the wild :-(  We should find a proper way to deprecate it ...
++AC_SUBST([AMTAR], ['$${TAR-tar}'])
+ m4_if([$1], [v7],
+-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+      [m4_case([$1], [ustar],, [pax],,
+               [m4_fatal([Unknown tar format])])
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+diff --git a/zlib/as400/bndsrc b/zlib/as400/bndsrc
+index 52cc661..98814fd 100644
+--- a/zlib/as400/bndsrc
++++ b/zlib/as400/bndsrc
+@@ -202,4 +202,14 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
+ 
+   EXPORT SYMBOL("inflateResetKeep")
+ 
++/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
++/*   Version 1.2.8 additional entry points.                         */
++/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
++
++/********************************************************************/
++/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
++/********************************************************************/
++
++  EXPORT SYMBOL("inflateGetDictionary")
++
+ ENDPGMEXP
+diff --git a/zlib/as400/compile.clp b/zlib/as400/compile.clp
+index 8d0c58f..e3f47c6 100644
+--- a/zlib/as400/compile.clp
++++ b/zlib/as400/compile.clp
+@@ -105,6 +105,6 @@
+                                  &MODLIB/TREES       &MODLIB/UNCOMPR     +
+                                  &MODLIB/ZUTIL)                          +
+                           SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC)       +
+-                          TEXT('ZLIB 1.2.7') TGTRLS(&TGTRLS)
++                          TEXT('ZLIB 1.2.8') TGTRLS(&TGTRLS)
+ 
+              ENDPGM
+diff --git a/zlib/as400/readme.txt b/zlib/as400/readme.txt
+index 23cd1b8..7b5d93b 100644
+--- a/zlib/as400/readme.txt
++++ b/zlib/as400/readme.txt
+@@ -1,4 +1,4 @@
+-        ZLIB version 1.2.7 for AS400 installation instructions
++        ZLIB version 1.2.8 for AS400 installation instructions
+ 
+ I) From an AS400 *SAVF file:
+ 
+diff --git a/zlib/as400/zlib.inc b/zlib/as400/zlib.inc
+index 747c598..7341a6d 100644
+--- a/zlib/as400/zlib.inc
++++ b/zlib/as400/zlib.inc
+@@ -1,7 +1,7 @@
+       *  ZLIB.INC - Interface to the general purpose compression library
+       *
+       *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
+-      *  Version 1.2.7
++      *  Version 1.2.8
+       *
+       *
+       *  WARNING:
+@@ -22,12 +22,12 @@
+       *
+       *  Versioning information.
+       *
+-     D ZLIB_VERSION    C                   '1.2.7'
+-     D ZLIB_VERNUM     C                   X'1270'
++     D ZLIB_VERSION    C                   '1.2.8'
++     D ZLIB_VERNUM     C                   X'1280'
+      D ZLIB_VER_MAJOR  C                   1
+      D ZLIB_VER_MINOR  C                   2
+      D ZLIB_VER_REVISION...
+-     D                 C                   7
++     D                 C                   8
+      D ZLIB_VER_SUBREVISION...
+      D                 C                   0
+       *
+@@ -359,6 +359,12 @@
+      D  dictionary                65535    const options(*varsize)              Dictionary bytes
+      D  dictLength                   10U 0 value                                Dictionary length
+       *
++     D inflateGetDictionary...
++     D                 PR            10I 0 extproc('inflateGetDictionary')      Get dictionary
++     D  strm                               like(z_stream)                       Expansion stream
++     D  dictionary                65535    options(*varsize)                    Dictionary bytes
++     D  dictLength                   10U 0                                      Dictionary length
++      *
+      D inflateSync     PR            10I 0 extproc('inflateSync')               Sync. expansion
+      D  strm                               like(z_stream)                       Expansion stream
+       *
+diff --git a/zlib/compress.c b/zlib/compress.c
+index 7de9766..5dfe73b 100644
+--- a/zlib/compress.c
++++ b/zlib/compress.c
+@@ -29,7 +29,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+     z_stream stream;
+     int err;
+ 
+-    stream.next_in = (Bytef*)source;
++    stream.next_in = (z_const Bytef *)source;
+     stream.avail_in = (uInt)sourceLen;
+ #ifdef MAXSEG_64K
+     /* Check for source > 64K on 16-bit machine: */
+diff --git a/zlib/configure b/zlib/configure
+index 8378857..9f7b1c6 100755
+--- a/zlib/configure
++++ b/zlib/configure
+@@ -630,6 +630,7 @@ LIBTOOL
+ am__fastdepCC_FALSE
+ am__fastdepCC_TRUE
+ CCDEPMODE
++am__nodep
+ AMDEPBACKSLASH
+ AMDEP_FALSE
+ AMDEP_TRUE
+@@ -2828,11 +2829,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+-# Always define AMTAR for backward compatibility.
++# Always define AMTAR for backward compatibility.  Yes, it's still used
++# in the wild :-(  We should find a proper way to deprecate it ...
++AMTAR='$${TAR-tar}'
+ 
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
+-
+-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
++am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+ 
+ 
+ 
+@@ -3757,6 +3758,7 @@ fi
+ if test "x$enable_dependency_tracking" != xno; then
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
++  am__nodep='_no'
+ fi
+  if test "x$enable_dependency_tracking" != xno; then
+   AMDEP_TRUE=
+@@ -3781,6 +3783,7 @@ else
+   # instance it was reported that on HP-UX the gcc test will end up
+   # making a dummy file named `D' -- because `-MD' means `put the output
+   # in D'.
++  rm -rf conftest.dir
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+   # using a relative directory.
+@@ -3840,7 +3843,7 @@ else
+ 	break
+       fi
+       ;;
+-    msvisualcpp | msvcmsys)
++    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+       # This compiler won't grok `-c -o', but also, the minuso test has
+       # not run yet.  These depmodes are late enough in the game, and
+       # so weak that their functioning should not be impacted.
+@@ -10405,7 +10408,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10408 "configure"
++#line 10411 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10511,7 +10514,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10514 "configure"
++#line 10517 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+diff --git a/zlib/contrib/README.contrib b/zlib/contrib/README.contrib
+index dd2285d..c66349b 100644
+--- a/zlib/contrib/README.contrib
++++ b/zlib/contrib/README.contrib
+@@ -75,3 +75,4 @@ untgz/      by Pedro A. Aranda Gutierrez <paag@tid.es>
+ 
+ vstudio/    by Gilles Vollant <info@winimage.com>
+         Building a minizip-enhanced zlib with Microsoft Visual Studio
++        Includes vc11 from kreuzerkrieg and vc12 from davispuh
+diff --git a/zlib/contrib/blast/blast.c b/zlib/contrib/blast/blast.c
+index 4ce697a..69ef0fe 100644
+--- a/zlib/contrib/blast/blast.c
++++ b/zlib/contrib/blast/blast.c
+@@ -1,7 +1,7 @@
+ /* blast.c
+- * Copyright (C) 2003 Mark Adler
++ * Copyright (C) 2003, 2012 Mark Adler
+  * For conditions of distribution and use, see copyright notice in blast.h
+- * version 1.1, 16 Feb 2003
++ * version 1.2, 24 Oct 2012
+  *
+  * blast.c decompresses data compressed by the PKWare Compression Library.
+  * This function provides functionality similar to the explode() function of
+@@ -22,6 +22,8 @@
+  *
+  * 1.0  12 Feb 2003     - First version
+  * 1.1  16 Feb 2003     - Fixed distance check for > 4 GB uncompressed data
++ * 1.2  24 Oct 2012     - Add note about using binary mode in stdio
++ *                      - Fix comparisons of differently signed integers
+  */
+ 
+ #include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
+@@ -279,7 +281,7 @@ local int decomp(struct state *s)
+     int dict;           /* log2(dictionary size) - 6 */
+     int symbol;         /* decoded symbol, extra bits for distance */
+     int len;            /* length for copy */
+-    int dist;           /* distance for copy */
++    unsigned dist;      /* distance for copy */
+     int copy;           /* copy counter */
+     unsigned char *from, *to;   /* copy pointers */
+     static int virgin = 1;                              /* build tables once */
+diff --git a/zlib/contrib/blast/blast.h b/zlib/contrib/blast/blast.h
+index ce9e541..658cfd3 100644
+--- a/zlib/contrib/blast/blast.h
++++ b/zlib/contrib/blast/blast.h
+@@ -1,6 +1,6 @@
+ /* blast.h -- interface for blast.c
+-  Copyright (C) 2003 Mark Adler
+-  version 1.1, 16 Feb 2003
++  Copyright (C) 2003, 2012 Mark Adler
++  version 1.2, 24 Oct 2012
+ 
+   This software is provided 'as-is', without any express or implied
+   warranty.  In no event will the author be held liable for any damages
+@@ -28,6 +28,10 @@
+  * that library.  (Note: PKWare overused the "implode" verb, and the format
+  * used by their library implode() function is completely different and
+  * incompatible with the implode compression method supported by PKZIP.)
++ *
++ * The binary mode for stdio functions should be used to assure that the
++ * compressed data is not corrupted when read or written.  For example:
++ * fopen(..., "rb") and fopen(..., "wb").
+  */
+ 
+ 
+diff --git a/zlib/contrib/delphi/ZLib.pas b/zlib/contrib/delphi/ZLib.pas
+index f24bb3e..a579974 100644
+--- a/zlib/contrib/delphi/ZLib.pas
++++ b/zlib/contrib/delphi/ZLib.pas
+@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
+   const OutBuf: Pointer; BufSize: Integer);
+ 
+ const
+-  zlib_version = '1.2.7';
++  zlib_version = '1.2.8';
+ 
+ type
+   EZlibError = class(Exception);
+diff --git a/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+index 1090288..b273d54 100644
+--- a/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
++++ b/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+@@ -1,5 +1,5 @@
+ //

+-// © Copyright Henrik Ravn 2004

++// © Copyright Henrik Ravn 2004

+ //

+ // Use, modification and distribution are subject to the Boost Software License, Version 1.0.

+ // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

+@@ -156,7 +156,7 @@ namespace DotZLibTests
+         public void Info_Version()

+         {

+             Info info = new Info();

+-            Assert.AreEqual("1.2.7", Info.Version);

++            Assert.AreEqual("1.2.8", Info.Version);

+             Assert.AreEqual(32, info.SizeOfUInt);

+             Assert.AreEqual(32, info.SizeOfULong);

+             Assert.AreEqual(32, info.SizeOfPointer);

+diff --git a/zlib/contrib/infback9/infback9.c b/zlib/contrib/infback9/infback9.c
+index 7bbe90c..05fb3e3 100644
+--- a/zlib/contrib/infback9/infback9.c
++++ b/zlib/contrib/infback9/infback9.c
+@@ -222,14 +222,13 @@ out_func out;
+ void FAR *out_desc;
+ {
+     struct inflate_state FAR *state;
+-    unsigned char FAR *next;    /* next input */
++    z_const unsigned char FAR *next;    /* next input */
+     unsigned char FAR *put;     /* next output */
+     unsigned have;              /* available input */
+     unsigned long left;         /* available output */
+     inflate_mode mode;          /* current inflate mode */
+     int lastblock;              /* true if processing last block */
+     int wrap;                   /* true if the window has wrapped */
+-    unsigned long write;        /* window write index */
+     unsigned char FAR *window;  /* allocated sliding window, if needed */
+     unsigned long hold;         /* bit buffer */
+     unsigned bits;              /* bits in bit buffer */
+@@ -259,7 +258,6 @@ void FAR *out_desc;
+     strm->msg = Z_NULL;
+     mode = TYPE;
+     lastblock = 0;
+-    write = 0;
+     wrap = 0;
+     window = state->window;
+     next = strm->next_in;
+diff --git a/zlib/contrib/infback9/inftree9.c b/zlib/contrib/infback9/inftree9.c
+index 5a0b328..4a73ad2 100644
+--- a/zlib/contrib/infback9/inftree9.c
++++ b/zlib/contrib/infback9/inftree9.c
+@@ -1,5 +1,5 @@
+ /* inftree9.c -- generate Huffman trees for efficient decoding
+- * Copyright (C) 1995-2012 Mark Adler
++ * Copyright (C) 1995-2013 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -9,7 +9,7 @@
+ #define MAXBITS 15
+ 
+ const char inflate9_copyright[] =
+-   " inflate9 1.2.7 Copyright 1995-2012 Mark Adler ";
++   " inflate9 1.2.8 Copyright 1995-2013 Mark Adler ";
+ /*
+   If you use the zlib library in a product, an acknowledgment is welcome
+   in the documentation of your product. If for some reason you cannot
+@@ -64,7 +64,7 @@ unsigned short FAR *work;
+     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+         128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
+         130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
+-        133, 133, 133, 133, 144, 78, 68};
++        133, 133, 133, 133, 144, 72, 78};
+     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
+         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
+         65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
+diff --git a/zlib/contrib/minizip/configure.ac b/zlib/contrib/minizip/configure.ac
+index 6a9af21..827a4e0 100644
+--- a/zlib/contrib/minizip/configure.ac
++++ b/zlib/contrib/minizip/configure.ac
+@@ -1,7 +1,7 @@
+ #                                               -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT([minizip], [1.2.7], [bugzilla.redhat.com])
++AC_INIT([minizip], [1.2.8], [bugzilla.redhat.com])
+ AC_CONFIG_SRCDIR([minizip.c])
+ AM_INIT_AUTOMAKE([foreign])
+ LT_INIT
+diff --git a/zlib/contrib/minizip/crypt.h b/zlib/contrib/minizip/crypt.h
+index a01d08d..1e9e820 100644
+--- a/zlib/contrib/minizip/crypt.h
++++ b/zlib/contrib/minizip/crypt.h
+@@ -32,7 +32,7 @@
+ /***********************************************************************
+  * Return the next byte in the pseudo-random sequence
+  */
+-static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
++static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab)
+ {
+     unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
+                      * unpredictable manner on 16-bit systems; not a problem
+@@ -45,7 +45,7 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
+ /***********************************************************************
+  * Update the encryption keys with the next byte of plain text
+  */
+-static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
++static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
+ {
+     (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
+     (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+@@ -62,7 +62,7 @@ static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int
+  * Initialize the encryption keys and the random header according to
+  * the given password.
+  */
+-static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
++static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab)
+ {
+     *(pkeys+0) = 305419896L;
+     *(pkeys+1) = 591751049L;
+@@ -91,7 +91,7 @@ static int crypthead(const char* passwd,      /* password string */
+                      unsigned char* buf,      /* where to write header */
+                      int bufSize,
+                      unsigned long* pkeys,
+-                     const unsigned long* pcrc_32_tab,
++                     const z_crc_t* pcrc_32_tab,
+                      unsigned long crcForCrypting)
+ {
+     int n;                       /* index in random header */
+diff --git a/zlib/contrib/minizip/iowin32.c b/zlib/contrib/minizip/iowin32.c
+index 6a2a883..a46d96c 100644
+--- a/zlib/contrib/minizip/iowin32.c
++++ b/zlib/contrib/minizip/iowin32.c
+@@ -25,6 +25,13 @@
+ #define INVALID_SET_FILE_POINTER ((DWORD)-1)
+ #endif
+ 
++
++#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
++#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
++#define IOWIN32_USING_WINRT_API 1
++#endif
++#endif
++
+ voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
+ uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+@@ -93,8 +100,22 @@ voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int
+ 
+     win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+ 
++#ifdef IOWIN32_USING_WINRT_API
++#ifdef UNICODE
++    if ((filename!=NULL) && (dwDesiredAccess != 0))
++        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
++#else
++    if ((filename!=NULL) && (dwDesiredAccess != 0))
++    {
++        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
++        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
++        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
++    }
++#endif
++#else
+     if ((filename!=NULL) && (dwDesiredAccess != 0))
+         hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
++#endif
+ 
+     return win32_build_iowin(hFile);
+ }
+@@ -108,8 +129,17 @@ voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int
+ 
+     win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+ 
++#ifdef IOWIN32_USING_WINRT_API
++    if ((filename!=NULL) && (dwDesiredAccess != 0))
++    {
++        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
++        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
++        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
++    }
++#else
+     if ((filename!=NULL) && (dwDesiredAccess != 0))
+         hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
++#endif
+ 
+     return win32_build_iowin(hFile);
+ }
+@@ -123,8 +153,13 @@ voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int
+ 
+     win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+ 
++#ifdef IOWIN32_USING_WINRT_API
++    if ((filename!=NULL) && (dwDesiredAccess != 0))
++        hFile = CreateFile2((LPCWSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition,NULL);
++#else
+     if ((filename!=NULL) && (dwDesiredAccess != 0))
+         hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
++#endif
+ 
+     return win32_build_iowin(hFile);
+ }
+@@ -138,8 +173,22 @@ voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mo
+ 
+     win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+ 
++#ifdef IOWIN32_USING_WINRT_API
++#ifdef UNICODE
++    if ((filename!=NULL) && (dwDesiredAccess != 0))
++        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
++#else
++    if ((filename!=NULL) && (dwDesiredAccess != 0))
++    {
++        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
++        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
++        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
++    }
++#endif
++#else
+     if ((filename!=NULL) && (dwDesiredAccess != 0))
+         hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
++#endif
+ 
+     return win32_build_iowin(hFile);
+ }
+@@ -188,6 +237,26 @@ uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* b
+     return ret;
+ }
+ 
++static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos,  DWORD dwMoveMethod)
++{
++#ifdef IOWIN32_USING_WINRT_API
++    return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod);
++#else
++    LONG lHigh = pos.HighPart;
++    DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, FILE_CURRENT);
++    BOOL fOk = TRUE;
++    if (dwNewPos == 0xFFFFFFFF)
++        if (GetLastError() != NO_ERROR)
++            fOk = FALSE;
++    if ((newPos != NULL) && (fOk))
++    {
++        newPos->LowPart = dwNewPos;
++        newPos->HighPart = lHigh;
++    }
++    return fOk;
++#endif
++}
++
+ long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
+ {
+     long ret=-1;
+@@ -196,15 +265,17 @@ long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
+         hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+     if (hFile != NULL)
+     {
+-        DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
+-        if (dwSet == INVALID_SET_FILE_POINTER)
++        LARGE_INTEGER pos;
++        pos.QuadPart = 0;
++
++        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
+         {
+             DWORD dwErr = GetLastError();
+             ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+             ret = -1;
+         }
+         else
+-            ret=(long)dwSet;
++            ret=(long)pos.LowPart;
+     }
+     return ret;
+ }
+@@ -218,17 +289,17 @@ ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
+ 
+     if (hFile)
+     {
+-        LARGE_INTEGER li;
+-        li.QuadPart = 0;
+-        li.u.LowPart = SetFilePointer(hFile, li.u.LowPart, &li.u.HighPart, FILE_CURRENT);
+-        if ( (li.LowPart == 0xFFFFFFFF) && (GetLastError() != NO_ERROR))
++        LARGE_INTEGER pos;
++        pos.QuadPart = 0;
++
++        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
+         {
+             DWORD dwErr = GetLastError();
+             ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+             ret = (ZPOS64_T)-1;
+         }
+         else
+-            ret=li.QuadPart;
++            ret=pos.QuadPart;
+     }
+     return ret;
+ }
+@@ -258,8 +329,9 @@ long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,in
+ 
+     if (hFile != NULL)
+     {
+-        DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod);
+-        if (dwSet == INVALID_SET_FILE_POINTER)
++        LARGE_INTEGER pos;
++        pos.QuadPart = offset;
++        if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
+         {
+             DWORD dwErr = GetLastError();
+             ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+@@ -296,9 +368,9 @@ long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T off
+ 
+     if (hFile)
+     {
+-        LARGE_INTEGER* li = (LARGE_INTEGER*)&offset;
+-        DWORD dwSet = SetFilePointer(hFile, li->u.LowPart, &li->u.HighPart, dwMoveMethod);
+-        if (dwSet == INVALID_SET_FILE_POINTER)
++        LARGE_INTEGER pos;
++        pos.QuadPart = offset;
++        if (!MySetFilePointerEx(hFile, pos, NULL, FILE_CURRENT))
+         {
+             DWORD dwErr = GetLastError();
+             ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+diff --git a/zlib/contrib/minizip/miniunzip.1 b/zlib/contrib/minizip/miniunzip.1
+new file mode 100644
+index 0000000..111ac69
+--- /dev/null
++++ b/zlib/contrib/minizip/miniunzip.1
+@@ -0,0 +1,63 @@
++.\"                                      Hey, EMACS: -*- nroff -*-
++.TH miniunzip 1 "Nov 7, 2001"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh        disable hyphenation
++.\" .hy        enable hyphenation
++.\" .ad l      left justify
++.\" .ad b      justify to both left and right margins
++.\" .nf        disable filling
++.\" .fi        enable filling
++.\" .br        insert line break
++.\" .sp <n>    insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++miniunzip - uncompress and examine ZIP archives
++.SH SYNOPSIS
++.B miniunzip
++.RI [ -exvlo ]
++zipfile [ files_to_extract ] [-d tempdir]
++.SH DESCRIPTION
++.B minizip
++is a simple tool which allows the extraction of compressed file
++archives in the ZIP format used by the MS-DOS utility PKZIP.  It was
++written as a demonstration of the
++.IR zlib (3)
++library and therefore lack many of the features of the
++.IR unzip (1)
++program.
++.SH OPTIONS
++A number of options are supported.  With the exception of
++.BI \-d\  tempdir
++these must be supplied before any
++other arguments and are:
++.TP
++.BI \-l\ ,\ \-\-v
++List the files in the archive without extracting them.
++.TP
++.B \-o
++Overwrite files without prompting for confirmation.
++.TP
++.B \-x
++Extract files (default).
++.PP
++The
++.I zipfile
++argument is the name of the archive to process. The next argument can be used
++to specify a single file to extract from the archive.
++
++Lastly, the following option can be specified at the end of the command-line:
++.TP
++.BI \-d\  tempdir
++Extract the archive in the directory
++.I tempdir
++rather than the current directory.
++.SH SEE ALSO
++.BR minizip (1),
++.BR zlib (3),
++.BR unzip (1).
++.SH AUTHOR
++This program was written by Gilles Vollant.  This manual page was
++written by Mark Brown <broonie@sirena.org.uk>. The -d tempdir option
++was added by Dirk Eddelbuettel <edd@debian.org>.
+diff --git a/zlib/contrib/minizip/minizip.1 b/zlib/contrib/minizip/minizip.1
+new file mode 100644
+index 0000000..1154484
+--- /dev/null
++++ b/zlib/contrib/minizip/minizip.1
+@@ -0,0 +1,46 @@
++.\"                                      Hey, EMACS: -*- nroff -*-
++.TH minizip 1 "May 2, 2001"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh        disable hyphenation
++.\" .hy        enable hyphenation
++.\" .ad l      left justify
++.\" .ad b      justify to both left and right margins
++.\" .nf        disable filling
++.\" .fi        enable filling
++.\" .br        insert line break
++.\" .sp <n>    insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++minizip - create ZIP archives
++.SH SYNOPSIS
++.B minizip
++.RI [ -o ]
++zipfile [ " files" ... ]
++.SH DESCRIPTION
++.B minizip
++is a simple tool which allows the creation of compressed file archives
++in the ZIP format used by the MS-DOS utility PKZIP.  It was written as
++a demonstration of the
++.IR zlib (3)
++library and therefore lack many of the features of the
++.IR zip (1)
++program.
++.SH OPTIONS
++The first argument supplied is the name of the ZIP archive to create or
++.RI -o
++in which case it is ignored and the second argument treated as the
++name of the ZIP file.  If the ZIP file already exists it will be
++overwritten.
++.PP
++Subsequent arguments specify a list of files to place in the ZIP
++archive.  If none are specified then an empty archive will be created.
++.SH SEE ALSO
++.BR miniunzip (1),
++.BR zlib (3),
++.BR zip (1).
++.SH AUTHOR
++This program was written by Gilles Vollant.  This manual page was
++written by Mark Brown <broonie@sirena.org.uk>.
++
+diff --git a/zlib/contrib/minizip/unzip.c b/zlib/contrib/minizip/unzip.c
+index affad4b..9093504 100644
+--- a/zlib/contrib/minizip/unzip.c
++++ b/zlib/contrib/minizip/unzip.c
+@@ -188,7 +188,7 @@ typedef struct
+ 
+ #    ifndef NOUNCRYPT
+     unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+-    const unsigned long* pcrc_32_tab;
++    const z_crc_t* pcrc_32_tab;
+ #    endif
+ } unz64_s;
+ 
+@@ -801,9 +801,9 @@ extern unzFile ZEXPORT unzOpen64 (const void *path)
+ }
+ 
+ /*
+-  Close a ZipFile opened with unzipOpen.
+-  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
+-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
++  Close a ZipFile opened with unzOpen.
++  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
++    these files MUST be closed with unzCloseCurrentFile before call unzClose.
+   return UNZ_OK if there is no problem. */
+ extern int ZEXPORT unzClose (unzFile file)
+ {
+@@ -1223,7 +1223,7 @@ extern int ZEXPORT unzGoToNextFile (unzFile  file)
+ 
+ /*
+   Try locate the file szFileName in the zipfile.
+-  For the iCaseSensitivity signification, see unzipStringFileNameCompare
++  For the iCaseSensitivity signification, see unzStringFileNameCompare
+ 
+   return value :
+   UNZ_OK if the file is found. It becomes the current file.
+@@ -1998,7 +1998,7 @@ extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
+ }
+ 
+ /*
+-  Close the file in zip opened with unzipOpenCurrentFile
++  Close the file in zip opened with unzOpenCurrentFile
+   Return UNZ_CRCERROR if all the file was read but the CRC is not good
+ */
+ extern int ZEXPORT unzCloseCurrentFile (unzFile file)
+diff --git a/zlib/contrib/minizip/unzip.h b/zlib/contrib/minizip/unzip.h
+index 3183968..2104e39 100644
+--- a/zlib/contrib/minizip/unzip.h
++++ b/zlib/contrib/minizip/unzip.h
+@@ -197,9 +197,9 @@ extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
+ 
+ extern int ZEXPORT unzClose OF((unzFile file));
+ /*
+-  Close a ZipFile opened with unzipOpen.
++  Close a ZipFile opened with unzOpen.
+   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
++    these files MUST be closed with unzCloseCurrentFile before call unzClose.
+   return UNZ_OK if there is no problem. */
+ 
+ extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
+diff --git a/zlib/contrib/minizip/zip.c b/zlib/contrib/minizip/zip.c
+index 147934c..ea54853 100644
+--- a/zlib/contrib/minizip/zip.c
++++ b/zlib/contrib/minizip/zip.c
+@@ -157,7 +157,7 @@ typedef struct
+     ZPOS64_T totalUncompressedData;
+ #ifndef NOCRYPT
+     unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+-    const unsigned long* pcrc_32_tab;
++    const z_crc_t* pcrc_32_tab;
+     int crypt_header_size;
+ #endif
+ } curfile64_info;
+diff --git a/zlib/contrib/pascal/zlibpas.pas b/zlib/contrib/pascal/zlibpas.pas
+index 7abd862..e6a0782 100644
+--- a/zlib/contrib/pascal/zlibpas.pas
++++ b/zlib/contrib/pascal/zlibpas.pas
+@@ -10,8 +10,8 @@ unit zlibpas;
+ interface
+ 
+ const
+-  ZLIB_VERSION = '1.2.7';
+-  ZLIB_VERNUM  = $1270;
++  ZLIB_VERSION = '1.2.8';
++  ZLIB_VERNUM  = $1280;
+ 
+ type
+   alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
+diff --git a/zlib/contrib/puff/puff.c b/zlib/contrib/puff/puff.c
+index df8470c..ba58483 100644
+--- a/zlib/contrib/puff/puff.c
++++ b/zlib/contrib/puff/puff.c
+@@ -1,8 +1,8 @@
+ /*
+  * puff.c
+- * Copyright (C) 2002-2010 Mark Adler
++ * Copyright (C) 2002-2013 Mark Adler
+  * For conditions of distribution and use, see copyright notice in puff.h
+- * version 2.2, 25 Apr 2010
++ * version 2.3, 21 Jan 2013
+  *
+  * puff.c is a simple inflate written to be an unambiguous way to specify the
+  * deflate format.  It is not written for speed but rather simplicity.  As a
+@@ -76,6 +76,7 @@
+  *                      - Move NIL to puff.h
+  *                      - Allow incomplete code only if single code length is 1
+  *                      - Add full code coverage test to Makefile
++ * 2.3  21 Jan 2013     - Check for invalid code length codes in dynamic blocks
+  */
+ 
+ #include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
+@@ -704,6 +705,8 @@ local int dynamic(struct state *s)
+         int len;                /* last length to repeat */
+ 
+         symbol = decode(s, &lencode);
++        if (symbol < 0)
++            return symbol;          /* invalid symbol */
+         if (symbol < 16)                /* length in 0..15 */
+             lengths[index++] = symbol;
+         else {                          /* repeat instruction */
+diff --git a/zlib/contrib/puff/puff.h b/zlib/contrib/puff/puff.h
+index 6a0080a..e23a245 100644
+--- a/zlib/contrib/puff/puff.h
++++ b/zlib/contrib/puff/puff.h
+@@ -1,6 +1,6 @@
+ /* puff.h
+-  Copyright (C) 2002-2010 Mark Adler, all rights reserved
+-  version 2.2, 25 Apr 2010
++  Copyright (C) 2002-2013 Mark Adler, all rights reserved
++  version 2.3, 21 Jan 2013
+ 
+   This software is provided 'as-is', without any express or implied
+   warranty.  In no event will the author be held liable for any damages
+diff --git a/zlib/contrib/puff/pufftest.c b/zlib/contrib/puff/pufftest.c
+index 76e35f6..7764814 100644
+--- a/zlib/contrib/puff/pufftest.c
++++ b/zlib/contrib/puff/pufftest.c
+@@ -1,8 +1,8 @@
+ /*
+  * pufftest.c
+- * Copyright (C) 2002-2010 Mark Adler
++ * Copyright (C) 2002-2013 Mark Adler
+  * For conditions of distribution and use, see copyright notice in puff.h
+- * version 2.2, 25 Apr 2010
++ * version 2.3, 21 Jan 2013
+  */
+ 
+ /* Example of how to use puff().
+diff --git a/zlib/contrib/testzlib/testzlib.c b/zlib/contrib/testzlib/testzlib.c
+index 135888e..5f659de 100644
+--- a/zlib/contrib/testzlib/testzlib.c
++++ b/zlib/contrib/testzlib/testzlib.c
+@@ -116,10 +116,10 @@ DWORD GetMsecSincePerfCounter(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPe
+     return dwRet;

+ }

+ 

+-int ReadFileMemory(const char* filename,long* plFileSize,void** pFilePtr)

++int ReadFileMemory(const char* filename,long* plFileSize,unsigned char** pFilePtr)

+ {

+     FILE* stream;

+-    void* ptr;

++    unsigned char* ptr;

+     int retVal=1;

+     stream=fopen(filename, "rb");

+     if (stream==NULL)

+diff --git a/zlib/contrib/vstudio/readme.txt b/zlib/contrib/vstudio/readme.txt
+index 59c8b8b..bfdcd9d 100644
+--- a/zlib/contrib/vstudio/readme.txt
++++ b/zlib/contrib/vstudio/readme.txt
+@@ -1,4 +1,4 @@
+-Building instructions for the DLL versions of Zlib 1.2.7

++Building instructions for the DLL versions of Zlib 1.2.8

+ ========================================================

+ 

+ This directory contains projects that build zlib and minizip using

+@@ -28,6 +28,11 @@ Build instructions for Visual Studio 2010 (32 bits or 64 bits)
+ - Uncompress current zlib, including all contrib/* files

+ - Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010

+ 

++Build instructions for Visual Studio 2012 (32 bits or 64 bits)

++--------------------------------------------------------------

++- Uncompress current zlib, including all contrib/* files

++- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012

++

+ 

+ Important

+ ---------

+diff --git a/zlib/contrib/vstudio/vc10/miniunz.vcxproj.user b/zlib/contrib/vstudio/vc10/miniunz.vcxproj.user
+deleted file mode 100644
+index 695b5c7..0000000
+--- a/zlib/contrib/vstudio/vc10/miniunz.vcxproj.user
++++ /dev/null
+@@ -1,3 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>

+-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+-</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc10/minizip.vcxproj.user b/zlib/contrib/vstudio/vc10/minizip.vcxproj.user
+deleted file mode 100644
+index 695b5c7..0000000
+--- a/zlib/contrib/vstudio/vc10/minizip.vcxproj.user
++++ /dev/null
+@@ -1,3 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>

+-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+-</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc10/testzlib.vcxproj.user b/zlib/contrib/vstudio/vc10/testzlib.vcxproj.user
+deleted file mode 100644
+index 695b5c7..0000000
+--- a/zlib/contrib/vstudio/vc10/testzlib.vcxproj.user
++++ /dev/null
+@@ -1,3 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>

+-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+-</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.user b/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.user
+deleted file mode 100644
+index 695b5c7..0000000
+--- a/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.user
++++ /dev/null
+@@ -1,3 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>

+-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+-</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc10/zlib.rc b/zlib/contrib/vstudio/vc10/zlib.rc
+index 8eca4db..73f6476 100644
+--- a/zlib/contrib/vstudio/vc10/zlib.rc
++++ b/zlib/contrib/vstudio/vc10/zlib.rc
+@@ -2,8 +2,8 @@
+ 

+ #define IDR_VERSION1  1

+ IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE

+-  FILEVERSION	 1.2.7,0

+-  PRODUCTVERSION 1.2.7,0

++  FILEVERSION	 1,2,8,0

++  PRODUCTVERSION 1,2,8,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.7\0"

++      VALUE "FileVersion",	"1.2.8\0"

+       VALUE "InternalName",	"zlib\0"

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

++      VALUE "OriginalFilename",	"zlibwapi.dll\0"

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

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

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

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

+     END

+   END

+   BLOCK "VarFileInfo"

+diff --git a/zlib/contrib/vstudio/vc10/zlibstat.vcxproj b/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
+index 2682fca..b9f2bbe 100644
+--- a/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
++++ b/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
+@@ -182,6 +182,10 @@
+       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

+       <SuppressStartupBanner>true</SuppressStartupBanner>

+     </Lib>

++    <PreBuildEvent>

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

++bld_ml32.bat</Command>

++    </PreBuildEvent>

+   </ItemDefinitionGroup>

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

+     <ClCompile>

+@@ -210,6 +214,10 @@
+       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

+       <SuppressStartupBanner>true</SuppressStartupBanner>

+     </Lib>

++    <PreBuildEvent>

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

++bld_ml32.bat</Command>

++    </PreBuildEvent>

+   </ItemDefinitionGroup>

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

+     <ClCompile>

+@@ -266,6 +274,10 @@
+       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

+       <SuppressStartupBanner>true</SuppressStartupBanner>

+     </Lib>

++    <PreBuildEvent>

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

++bld_ml64.bat</Command>

++    </PreBuildEvent>

+   </ItemDefinitionGroup>

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

+     <Midl>

+@@ -326,6 +338,10 @@
+       <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

+       <SuppressStartupBanner>true</SuppressStartupBanner>

+     </Lib>

++    <PreBuildEvent>

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

++bld_ml64.bat</Command>

++    </PreBuildEvent>

+   </ItemDefinitionGroup>

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

+     <Midl>

+diff --git a/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.user b/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.user
+deleted file mode 100644
+index 695b5c7..0000000
+--- a/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.user
++++ /dev/null
+@@ -1,3 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>

+-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+-</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc10/zlibvc.def b/zlib/contrib/vstudio/vc10/zlibvc.def
+index 18ddf50..6367046 100644
+--- a/zlib/contrib/vstudio/vc10/zlibvc.def
++++ b/zlib/contrib/vstudio/vc10/zlibvc.def
+@@ -1,7 +1,7 @@
+ LIBRARY

+ ; zlib data compression and ZIP file I/O library

+ 

+-VERSION		1.2.7

++VERSION		1.2.8

+ 

+ EXPORTS

+         adler32                                  @1

+@@ -134,6 +134,10 @@ EXPORTS
+         gzgetc_                                 @161

+         inflateResetKeep                        @163

+         deflateResetKeep                        @164

+-
+-; zlib1 v1.2.7 added:
+-        gzopen_w                                @165
++

++; zlib1 v1.2.7 added:

++        gzopen_w                                @165

++

++; zlib1 v1.2.8 added:

++        inflateGetDictionary                    @166

++        gzvprintf                               @167

+diff --git a/zlib/contrib/vstudio/vc10/zlibvc.vcxproj b/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
+index 9218fdc..6ff9ddb 100644
+--- a/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
++++ b/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
+@@ -180,10 +180,10 @@
+     <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)'=='Debug|Win32'">zlibwapid</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)'=='Debug|x64'">zlibwapid</TargetName>

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

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

+   </PropertyGroup>

+@@ -220,18 +220,14 @@
+     <Link>

+       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+       <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

+-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+       <SuppressStartupBanner>true</SuppressStartupBanner>

+       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+       <GenerateDebugInformation>true</GenerateDebugInformation>

+-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+       <GenerateMapFile>true</GenerateMapFile>

+-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+       <SubSystem>Windows</SubSystem>

+       <RandomizedBaseAddress>false</RandomizedBaseAddress>

+       <DataExecutionPrevention>

+       </DataExecutionPrevention>

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

+     </Link>

+     <PreBuildEvent>

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

+@@ -272,18 +268,14 @@ bld_ml32.bat</Command>
+     </ResourceCompile>

+     <Link>

+       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+       <SuppressStartupBanner>true</SuppressStartupBanner>

+       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+       <GenerateMapFile>true</GenerateMapFile>

+-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+       <SubSystem>Windows</SubSystem>

+       <RandomizedBaseAddress>false</RandomizedBaseAddress>

+       <DataExecutionPrevention>

+       </DataExecutionPrevention>

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

+     </Link>

+   </ItemDefinitionGroup>

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

+@@ -321,18 +313,14 @@ bld_ml32.bat</Command>
+     <Link>

+       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+       <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

+-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+       <SuppressStartupBanner>true</SuppressStartupBanner>

+       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+       <GenerateMapFile>true</GenerateMapFile>

+-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+       <SubSystem>Windows</SubSystem>

+       <RandomizedBaseAddress>false</RandomizedBaseAddress>

+       <DataExecutionPrevention>

+       </DataExecutionPrevention>

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

+     </Link>

+     <PreBuildEvent>

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

+@@ -371,19 +359,15 @@ bld_ml32.bat</Command>
+     </ResourceCompile>

+     <Link>

+       <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

+-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+       <SuppressStartupBanner>true</SuppressStartupBanner>

+       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+       <GenerateDebugInformation>true</GenerateDebugInformation>

+-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+       <GenerateMapFile>true</GenerateMapFile>

+-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+       <SubSystem>Windows</SubSystem>

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

+       <TargetMachine>MachineX64</TargetMachine>

+     </Link>

+     <PreBuildEvent>

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

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

+ bld_ml64.bat</Command>

+     </PreBuildEvent>

+   </ItemDefinitionGroup>

+@@ -463,15 +447,11 @@ bld_ml64.bat</Command>
+       <Culture>0x040c</Culture>

+     </ResourceCompile>

+     <Link>

+-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+       <SuppressStartupBanner>true</SuppressStartupBanner>

+       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+       <GenerateMapFile>true</GenerateMapFile>

+-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+       <SubSystem>Windows</SubSystem>

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

+       <TargetMachine>MachineX64</TargetMachine>

+     </Link>

+   </ItemDefinitionGroup>

+@@ -554,15 +534,11 @@ bld_ml64.bat</Command>
+     </ResourceCompile>

+     <Link>

+       <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

+-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+       <SuppressStartupBanner>true</SuppressStartupBanner>

+       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+       <GenerateMapFile>true</GenerateMapFile>

+-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+       <SubSystem>Windows</SubSystem>

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

+       <TargetMachine>MachineX64</TargetMachine>

+     </Link>

+     <PreBuildEvent>

+diff --git a/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.user b/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.user
+deleted file mode 100644
+index 695b5c7..0000000
+--- a/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.user
++++ /dev/null
+@@ -1,3 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>

+-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+-</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc11/miniunz.vcxproj b/zlib/contrib/vstudio/vc11/miniunz.vcxproj
+new file mode 100644
+index 0000000..8f9f20b
+--- /dev/null
++++ b/zlib/contrib/vstudio/vc11/miniunz.vcxproj
+@@ -0,0 +1,314 @@
++<?xml version="1.0" encoding="utf-8"?>

++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

++  <ItemGroup Label="ProjectConfigurations">

++    <ProjectConfiguration Include="Debug|Itanium">

++      <Configuration>Debug</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|Win32">

++      <Configuration>Debug</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|x64">

++      <Configuration>Debug</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Itanium">

++      <Configuration>Release</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Win32">

++      <Configuration>Release</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|x64">

++      <Configuration>Release</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++  </ItemGroup>

++  <PropertyGroup Label="Globals">

++    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>

++    <Keyword>Win32Proj</Keyword>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>Unicode</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

++  <ImportGroup Label="ExtensionSettings">

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <PropertyGroup Label="UserMacros" />

++  <PropertyGroup>

++    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

++    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++  </PropertyGroup>

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

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>

++      <SubSystem>Console</SubSystem>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

++      <TargetMachine>MachineX86</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

++      <TargetMachine>MachineX86</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>X64</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>

++      <SubSystem>Console</SubSystem>

++      <TargetMachine>MachineX64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>

++      <SubSystem>Console</SubSystem>

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>X64</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <TargetMachine>MachineX64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

++  <ItemGroup>

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

++  </ItemGroup>

++  <ItemGroup>

++    <ProjectReference Include="zlibvc.vcxproj">

++      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>

++    </ProjectReference>

++  </ItemGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

++  <ImportGroup Label="ExtensionTargets">

++  </ImportGroup>

++</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc11/minizip.vcxproj b/zlib/contrib/vstudio/vc11/minizip.vcxproj
+new file mode 100644
+index 0000000..c93d9e6
+--- /dev/null
++++ b/zlib/contrib/vstudio/vc11/minizip.vcxproj
+@@ -0,0 +1,311 @@
++<?xml version="1.0" encoding="utf-8"?>

++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

++  <ItemGroup Label="ProjectConfigurations">

++    <ProjectConfiguration Include="Debug|Itanium">

++      <Configuration>Debug</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|Win32">

++      <Configuration>Debug</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|x64">

++      <Configuration>Debug</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Itanium">

++      <Configuration>Release</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Win32">

++      <Configuration>Release</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|x64">

++      <Configuration>Release</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++  </ItemGroup>

++  <PropertyGroup Label="Globals">

++    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>

++    <Keyword>Win32Proj</Keyword>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>Unicode</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

++  <ImportGroup Label="ExtensionSettings">

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <PropertyGroup Label="UserMacros" />

++  <PropertyGroup>

++    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>

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

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

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

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

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

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

++    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++  </PropertyGroup>

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

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>

++      <SubSystem>Console</SubSystem>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

++      <TargetMachine>MachineX86</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

++      <TargetMachine>MachineX86</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>X64</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>

++      <SubSystem>Console</SubSystem>

++      <TargetMachine>MachineX64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>

++      <SubSystem>Console</SubSystem>

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>X64</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <TargetMachine>MachineX64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

++  <ItemGroup>

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

++  </ItemGroup>

++  <ItemGroup>

++    <ProjectReference Include="zlibvc.vcxproj">

++      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>

++    </ProjectReference>

++  </ItemGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

++  <ImportGroup Label="ExtensionTargets">

++  </ImportGroup>

++</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc11/testzlib.vcxproj b/zlib/contrib/vstudio/vc11/testzlib.vcxproj
+new file mode 100644
+index 0000000..6d55954
+--- /dev/null
++++ b/zlib/contrib/vstudio/vc11/testzlib.vcxproj
+@@ -0,0 +1,426 @@
++<?xml version="1.0" encoding="utf-8"?>

++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

++  <ItemGroup Label="ProjectConfigurations">

++    <ProjectConfiguration Include="Debug|Itanium">

++      <Configuration>Debug</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|Win32">

++      <Configuration>Debug</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|x64">

++      <Configuration>Debug</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

++      <Configuration>ReleaseWithoutAsm</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

++      <Configuration>ReleaseWithoutAsm</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

++      <Configuration>ReleaseWithoutAsm</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Itanium">

++      <Configuration>Release</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Win32">

++      <Configuration>Release</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|x64">

++      <Configuration>Release</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++  </ItemGroup>

++  <PropertyGroup Label="Globals">

++    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>

++    <RootNamespace>testzlib</RootNamespace>

++    <Keyword>Win32Proj</Keyword>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>Unicode</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

++  <ImportGroup Label="ExtensionSettings">

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <PropertyGroup Label="UserMacros" />

++  <PropertyGroup>

++    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

++    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

++    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

++    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++  </PropertyGroup>

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

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

++      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

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

++      <SubSystem>Console</SubSystem>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

++      <TargetMachine>MachineX86</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

++      <TargetMachine>MachineX86</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

++      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

++      <TargetMachine>MachineX86</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <ClCompile>

++      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++    </ClCompile>

++    <Link>

++      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

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

++      <SubSystem>Console</SubSystem>

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <ClCompile>

++      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++    </ClCompile>

++    <Link>

++      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <ClCompile>

++      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++    </ClCompile>

++    <Link>

++      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

++  <ItemGroup>

++    <ClCompile Include="..\..\..\adler32.c" />

++    <ClCompile Include="..\..\..\compress.c" />

++    <ClCompile Include="..\..\..\crc32.c" />

++    <ClCompile Include="..\..\..\deflate.c" />

++    <ClCompile Include="..\..\..\infback.c" />

++    <ClCompile Include="..\..\masmx64\inffas8664.c">

++      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

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

++      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

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

++      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

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

++    </ClCompile>

++    <ClCompile Include="..\..\..\inffast.c" />

++    <ClCompile Include="..\..\..\inflate.c" />

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

++    <ClCompile Include="..\..\testzlib\testzlib.c" />

++    <ClCompile Include="..\..\..\trees.c" />

++    <ClCompile Include="..\..\..\uncompr.c" />

++    <ClCompile Include="..\..\..\zutil.c" />

++  </ItemGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

++  <ImportGroup Label="ExtensionTargets">

++  </ImportGroup>

++</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj b/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj
+new file mode 100644
+index 0000000..9f20c78
+--- /dev/null
++++ b/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj
+@@ -0,0 +1,314 @@
++<?xml version="1.0" encoding="utf-8"?>

++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

++  <ItemGroup Label="ProjectConfigurations">

++    <ProjectConfiguration Include="Debug|Itanium">

++      <Configuration>Debug</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|Win32">

++      <Configuration>Debug</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|x64">

++      <Configuration>Debug</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Itanium">

++      <Configuration>Release</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Win32">

++      <Configuration>Release</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|x64">

++      <Configuration>Release</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++  </ItemGroup>

++  <PropertyGroup Label="Globals">

++    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>

++    <Keyword>Win32Proj</Keyword>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>Unicode</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

++    <ConfigurationType>Application</ConfigurationType>

++    <CharacterSet>MultiByte</CharacterSet>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

++  <ImportGroup Label="ExtensionSettings">

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <PropertyGroup Label="UserMacros" />

++  <PropertyGroup>

++    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

++    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++  </PropertyGroup>

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

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

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

++      <SubSystem>Console</SubSystem>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

++      <TargetMachine>MachineX86</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

++      <TargetMachine>MachineX86</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>X64</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

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

++      <SubSystem>Console</SubSystem>

++      <TargetMachine>MachineX64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MinimalRebuild>true</MinimalRebuild>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

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

++      <SubSystem>Console</SubSystem>

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>X64</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <TargetMachine>MachineX64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>MaxSpeed</Optimization>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <OmitFramePointers>true</OmitFramePointers>

++      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeader>

++      </PrecompiledHeader>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <WarningLevel>Level3</WarningLevel>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <Link>

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

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

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <SubSystem>Console</SubSystem>

++      <OptimizeReferences>true</OptimizeReferences>

++      <EnableCOMDATFolding>true</EnableCOMDATFolding>

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

++  <ItemGroup>

++    <ClCompile Include="..\..\testzlib\testzlib.c" />

++  </ItemGroup>

++  <ItemGroup>

++    <ProjectReference Include="zlibvc.vcxproj">

++      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>

++    </ProjectReference>

++  </ItemGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

++  <ImportGroup Label="ExtensionTargets">

++  </ImportGroup>

++</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc11/zlib.rc b/zlib/contrib/vstudio/vc11/zlib.rc
+new file mode 100644
+index 0000000..73f6476
+--- /dev/null
++++ b/zlib/contrib/vstudio/vc11/zlib.rc
+@@ -0,0 +1,32 @@
++#include <windows.h>

++

++#define IDR_VERSION1  1

++IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE

++  FILEVERSION	 1,2,8,0

++  PRODUCTVERSION 1,2,8,0

++  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK

++  FILEFLAGS	0

++  FILEOS	VOS_DOS_WINDOWS32

++  FILETYPE	VFT_DLL

++  FILESUBTYPE	0	// not used

++BEGIN

++  BLOCK "StringFileInfo"

++  BEGIN

++    BLOCK "040904E4"

++    //language ID = U.S. English, char set = Windows, Multilingual

++

++    BEGIN

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

++      VALUE "FileVersion",	"1.2.8\0"

++      VALUE "InternalName",	"zlib\0"

++      VALUE "OriginalFilename",	"zlibwapi.dll\0"

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

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

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

++    END

++  END

++  BLOCK "VarFileInfo"

++  BEGIN

++    VALUE "Translation", 0x0409, 1252

++  END

++END

+diff --git a/zlib/contrib/vstudio/vc11/zlibstat.vcxproj b/zlib/contrib/vstudio/vc11/zlibstat.vcxproj
+new file mode 100644
+index 0000000..806b76a
+--- /dev/null
++++ b/zlib/contrib/vstudio/vc11/zlibstat.vcxproj
+@@ -0,0 +1,464 @@
++<?xml version="1.0" encoding="utf-8"?>

++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

++  <ItemGroup Label="ProjectConfigurations">

++    <ProjectConfiguration Include="Debug|Itanium">

++      <Configuration>Debug</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|Win32">

++      <Configuration>Debug</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|x64">

++      <Configuration>Debug</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

++      <Configuration>ReleaseWithoutAsm</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

++      <Configuration>ReleaseWithoutAsm</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

++      <Configuration>ReleaseWithoutAsm</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Itanium">

++      <Configuration>Release</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Win32">

++      <Configuration>Release</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|x64">

++      <Configuration>Release</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++  </ItemGroup>

++  <PropertyGroup Label="Globals">

++    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">

++    <ConfigurationType>StaticLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

++    <ConfigurationType>StaticLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

++    <ConfigurationType>StaticLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <PlatformToolset>v110</PlatformToolset>

++    <CharacterSet>Unicode</CharacterSet>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">

++    <ConfigurationType>StaticLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

++    <ConfigurationType>StaticLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

++    <ConfigurationType>StaticLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">

++    <ConfigurationType>StaticLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

++    <ConfigurationType>StaticLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

++    <ConfigurationType>StaticLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

++  <ImportGroup Label="ExtensionSettings">

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <PropertyGroup Label="UserMacros" />

++  <PropertyGroup>

++    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

++    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

++    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

++    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++  </PropertyGroup>

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

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <DebugInformationFormat>OldStyle</DebugInformationFormat>

++    </ClCompile>

++    <ResourceCompile>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Lib>

++      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

++      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </Lib>

++  </ItemDefinitionGroup>

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

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Lib>

++      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

++      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

++      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </Lib>

++  </ItemDefinitionGroup>

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

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Lib>

++      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

++      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </Lib>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>X64</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <DebugInformationFormat>OldStyle</DebugInformationFormat>

++    </ClCompile>

++    <ResourceCompile>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Lib>

++      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

++      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </Lib>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <DebugInformationFormat>OldStyle</DebugInformationFormat>

++    </ClCompile>

++    <ResourceCompile>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Lib>

++      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

++      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </Lib>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>X64</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Lib>

++      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

++      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

++      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </Lib>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Lib>

++      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

++      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </Lib>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>X64</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Lib>

++      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

++      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </Lib>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++    </Midl>

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Lib>

++      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>

++      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </Lib>

++  </ItemDefinitionGroup>

++  <ItemGroup>

++    <ClCompile Include="..\..\..\adler32.c" />

++    <ClCompile Include="..\..\..\compress.c" />

++    <ClCompile Include="..\..\..\crc32.c" />

++    <ClCompile Include="..\..\..\deflate.c" />

++    <ClCompile Include="..\..\..\gzclose.c" />

++    <ClCompile Include="..\..\..\gzlib.c" />

++    <ClCompile Include="..\..\..\gzread.c" />

++    <ClCompile Include="..\..\..\gzwrite.c" />

++    <ClCompile Include="..\..\..\infback.c" />

++    <ClCompile Include="..\..\masmx64\inffas8664.c">

++      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

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

++      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

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

++      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

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

++    </ClCompile>

++    <ClCompile Include="..\..\..\inffast.c" />

++    <ClCompile Include="..\..\..\inflate.c" />

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

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

++    <ClCompile Include="..\..\..\trees.c" />

++    <ClCompile Include="..\..\..\uncompr.c" />

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

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

++    <ClCompile Include="..\..\..\zutil.c" />

++  </ItemGroup>

++  <ItemGroup>

++    <ResourceCompile Include="zlib.rc" />

++  </ItemGroup>

++  <ItemGroup>

++    <None Include="zlibvc.def" />

++  </ItemGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

++  <ImportGroup Label="ExtensionTargets">

++  </ImportGroup>

++</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc11/zlibvc.def b/zlib/contrib/vstudio/vc11/zlibvc.def
+new file mode 100644
+index 0000000..6367046
+--- /dev/null
++++ b/zlib/contrib/vstudio/vc11/zlibvc.def
+@@ -0,0 +1,143 @@
++LIBRARY

++; zlib data compression and ZIP file I/O library

++

++VERSION		1.2.8

++

++EXPORTS

++        adler32                                  @1

++        compress                                 @2

++        crc32                                    @3

++        deflate                                  @4

++        deflateCopy                              @5

++        deflateEnd                               @6

++        deflateInit2_                            @7

++        deflateInit_                             @8

++        deflateParams                            @9

++        deflateReset                             @10

++        deflateSetDictionary                     @11

++        gzclose                                  @12

++        gzdopen                                  @13

++        gzerror                                  @14

++        gzflush                                  @15

++        gzopen                                   @16

++        gzread                                   @17

++        gzwrite                                  @18

++        inflate                                  @19

++        inflateEnd                               @20

++        inflateInit2_                            @21

++        inflateInit_                             @22

++        inflateReset                             @23

++        inflateSetDictionary                     @24

++        inflateSync                              @25

++        uncompress                               @26

++        zlibVersion                              @27

++        gzprintf                                 @28

++        gzputc                                   @29

++        gzgetc                                   @30

++        gzseek                                   @31

++        gzrewind                                 @32

++        gztell                                   @33

++        gzeof                                    @34

++        gzsetparams                              @35

++        zError                                   @36

++        inflateSyncPoint                         @37

++        get_crc_table                            @38

++        compress2                                @39

++        gzputs                                   @40

++        gzgets                                   @41

++        inflateCopy                              @42

++        inflateBackInit_                         @43

++        inflateBack                              @44

++        inflateBackEnd                           @45

++        compressBound                            @46

++        deflateBound                             @47

++        gzclearerr                               @48

++        gzungetc                                 @49

++        zlibCompileFlags                         @50

++        deflatePrime                             @51

++        deflatePending                           @52

++

++        unzOpen                                  @61

++        unzClose                                 @62

++        unzGetGlobalInfo                         @63

++        unzGetCurrentFileInfo                    @64

++        unzGoToFirstFile                         @65

++        unzGoToNextFile                          @66

++        unzOpenCurrentFile                       @67

++        unzReadCurrentFile                       @68

++        unzOpenCurrentFile3                      @69

++        unztell                                  @70

++        unzeof                                   @71

++        unzCloseCurrentFile                      @72

++        unzGetGlobalComment                      @73

++        unzStringFileNameCompare                 @74

++        unzLocateFile                            @75

++        unzGetLocalExtrafield                    @76

++        unzOpen2                                 @77

++        unzOpenCurrentFile2                      @78

++        unzOpenCurrentFilePassword               @79

++

++        zipOpen                                  @80

++        zipOpenNewFileInZip                      @81

++        zipWriteInFileInZip                      @82

++        zipCloseFileInZip                        @83

++        zipClose                                 @84

++        zipOpenNewFileInZip2                     @86

++        zipCloseFileInZipRaw                     @87

++        zipOpen2                                 @88

++        zipOpenNewFileInZip3                     @89

++

++        unzGetFilePos                            @100

++        unzGoToFilePos                           @101

++

++        fill_win32_filefunc                      @110

++

++; zlibwapi v1.2.4 added:

++        fill_win32_filefunc64                   @111

++        fill_win32_filefunc64A                  @112

++        fill_win32_filefunc64W                  @113

++

++        unzOpen64                               @120

++        unzOpen2_64                             @121

++        unzGetGlobalInfo64                      @122

++        unzGetCurrentFileInfo64                 @124

++        unzGetCurrentFileZStreamPos64           @125

++        unztell64                               @126

++        unzGetFilePos64                         @127

++        unzGoToFilePos64                        @128

++

++        zipOpen64                               @130

++        zipOpen2_64                             @131

++        zipOpenNewFileInZip64                   @132

++        zipOpenNewFileInZip2_64                 @133

++        zipOpenNewFileInZip3_64                 @134

++        zipOpenNewFileInZip4_64                 @135

++        zipCloseFileInZipRaw64                  @136

++

++; zlib1 v1.2.4 added:

++        adler32_combine                         @140

++        crc32_combine                           @142

++        deflateSetHeader                        @144

++        deflateTune                             @145

++        gzbuffer                                @146

++        gzclose_r                               @147

++        gzclose_w                               @148

++        gzdirect                                @149

++        gzoffset                                @150

++        inflateGetHeader                        @156

++        inflateMark                             @157

++        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

++

++; zlib1 v1.2.8 added:

++        inflateGetDictionary                    @166

++        gzvprintf                               @167

+diff --git a/zlib/contrib/vstudio/vc11/zlibvc.sln b/zlib/contrib/vstudio/vc11/zlibvc.sln
+new file mode 100644
+index 0000000..9fcbafd
+--- /dev/null
++++ b/zlib/contrib/vstudio/vc11/zlibvc.sln
+@@ -0,0 +1,117 @@
++

++Microsoft Visual Studio Solution File, Format Version 12.00

++# Visual Studio 2012

++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"

++EndProject

++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"

++EndProject

++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

++EndProject

++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"

++EndProject

++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

++EndProject

++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

++EndProject

++Global

++	GlobalSection(SolutionConfigurationPlatforms) = preSolution

++		Debug|Itanium = Debug|Itanium

++		Debug|Win32 = Debug|Win32

++		Debug|x64 = Debug|x64

++		Release|Itanium = Release|Itanium

++		Release|Win32 = Release|Win32

++		Release|x64 = Release|x64

++		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium

++		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32

++		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64

++	EndGlobalSection

++	GlobalSection(ProjectConfigurationPlatforms) = postSolution

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

++		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

++		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

++		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

++		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32

++		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64

++	EndGlobalSection

++	GlobalSection(SolutionProperties) = preSolution

++		HideSolutionNode = FALSE

++	EndGlobalSection

++EndGlobal

+diff --git a/zlib/contrib/vstudio/vc11/zlibvc.vcxproj b/zlib/contrib/vstudio/vc11/zlibvc.vcxproj
+new file mode 100644
+index 0000000..c65b95f
+--- /dev/null
++++ b/zlib/contrib/vstudio/vc11/zlibvc.vcxproj
+@@ -0,0 +1,688 @@
++<?xml version="1.0" encoding="utf-8"?>

++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

++  <ItemGroup Label="ProjectConfigurations">

++    <ProjectConfiguration Include="Debug|Itanium">

++      <Configuration>Debug</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|Win32">

++      <Configuration>Debug</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Debug|x64">

++      <Configuration>Debug</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

++      <Configuration>ReleaseWithoutAsm</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

++      <Configuration>ReleaseWithoutAsm</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

++      <Configuration>ReleaseWithoutAsm</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Itanium">

++      <Configuration>Release</Configuration>

++      <Platform>Itanium</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|Win32">

++      <Configuration>Release</Configuration>

++      <Platform>Win32</Platform>

++    </ProjectConfiguration>

++    <ProjectConfiguration Include="Release|x64">

++      <Configuration>Release</Configuration>

++      <Platform>x64</Platform>

++    </ProjectConfiguration>

++  </ItemGroup>

++  <PropertyGroup Label="Globals">

++    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

++    <ConfigurationType>DynamicLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">

++    <ConfigurationType>DynamicLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

++    <ConfigurationType>DynamicLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <PlatformToolset>v110</PlatformToolset>

++    <CharacterSet>Unicode</CharacterSet>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">

++    <ConfigurationType>DynamicLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">

++    <ConfigurationType>DynamicLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">

++    <ConfigurationType>DynamicLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

++    <ConfigurationType>DynamicLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">

++    <ConfigurationType>DynamicLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <WholeProgramOptimization>true</WholeProgramOptimization>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

++    <ConfigurationType>DynamicLibrary</ConfigurationType>

++    <UseOfMfc>false</UseOfMfc>

++    <PlatformToolset>v110</PlatformToolset>

++  </PropertyGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

++  <ImportGroup Label="ExtensionSettings">

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

++  </ImportGroup>

++  <PropertyGroup Label="UserMacros" />

++  <PropertyGroup>

++    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>

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

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

++    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>

++    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>

++    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>

++    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

++    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

++    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

++    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

++    <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>

++      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MkTypLibCompatible>true</MkTypLibCompatible>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <TargetEnvironment>Win32</TargetEnvironment>

++      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <BrowseInformation>

++      </BrowseInformation>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <ResourceCompile>

++      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Link>

++      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

++      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

++      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

++      <GenerateMapFile>true</GenerateMapFile>

++      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

++      <SubSystem>Windows</SubSystem>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

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

++    </Link>

++    <PreBuildEvent>

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

++bld_ml32.bat</Command>

++    </PreBuildEvent>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MkTypLibCompatible>true</MkTypLibCompatible>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <TargetEnvironment>Win32</TargetEnvironment>

++      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

++    </Midl>

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

++      <AssemblerOutput>All</AssemblerOutput>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <BrowseInformation>

++      </BrowseInformation>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Link>

++      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

++      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

++      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

++      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

++      <GenerateMapFile>true</GenerateMapFile>

++      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

++      <SubSystem>Windows</SubSystem>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

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

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MkTypLibCompatible>true</MkTypLibCompatible>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <TargetEnvironment>Win32</TargetEnvironment>

++      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

++    </Midl>

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

++      <AssemblerOutput>All</AssemblerOutput>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <BrowseInformation>

++      </BrowseInformation>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Link>

++      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

++      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

++      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

++      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

++      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

++      <GenerateMapFile>true</GenerateMapFile>

++      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

++      <SubSystem>Windows</SubSystem>

++      <RandomizedBaseAddress>false</RandomizedBaseAddress>

++      <DataExecutionPrevention>

++      </DataExecutionPrevention>

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

++    </Link>

++    <PreBuildEvent>

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

++bld_ml32.bat</Command>

++    </PreBuildEvent>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MkTypLibCompatible>true</MkTypLibCompatible>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <TargetEnvironment>X64</TargetEnvironment>

++      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <BrowseInformation>

++      </BrowseInformation>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <ResourceCompile>

++      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Link>

++      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

++      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

++      <GenerateMapFile>true</GenerateMapFile>

++      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

++      <SubSystem>Windows</SubSystem>

++      <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>

++      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MkTypLibCompatible>true</MkTypLibCompatible>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

++    </Midl>

++    <ClCompile>

++      <Optimization>Disabled</Optimization>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <BrowseInformation>

++      </BrowseInformation>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

++    </ClCompile>

++    <ResourceCompile>

++      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Link>

++      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

++      <GenerateDebugInformation>true</GenerateDebugInformation>

++      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

++      <GenerateMapFile>true</GenerateMapFile>

++      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

++      <SubSystem>Windows</SubSystem>

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

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MkTypLibCompatible>true</MkTypLibCompatible>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <TargetEnvironment>X64</TargetEnvironment>

++      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

++    </Midl>

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

++      <AssemblerOutput>All</AssemblerOutput>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <BrowseInformation>

++      </BrowseInformation>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Link>

++      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

++      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

++      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

++      <GenerateMapFile>true</GenerateMapFile>

++      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

++      <SubSystem>Windows</SubSystem>

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

++      <TargetMachine>MachineX64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MkTypLibCompatible>true</MkTypLibCompatible>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

++    </Midl>

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

++      <AssemblerOutput>All</AssemblerOutput>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <BrowseInformation>

++      </BrowseInformation>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Link>

++      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

++      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

++      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

++      <GenerateMapFile>true</GenerateMapFile>

++      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

++      <SubSystem>Windows</SubSystem>

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

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

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

++    <Midl>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MkTypLibCompatible>true</MkTypLibCompatible>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <TargetEnvironment>X64</TargetEnvironment>

++      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

++    </Midl>

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

++      <AssemblerOutput>All</AssemblerOutput>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <BrowseInformation>

++      </BrowseInformation>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Link>

++      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

++      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

++      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

++      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

++      <GenerateMapFile>true</GenerateMapFile>

++      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

++      <SubSystem>Windows</SubSystem>

++      <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>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <MkTypLibCompatible>true</MkTypLibCompatible>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <TargetEnvironment>Itanium</TargetEnvironment>

++      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

++    </Midl>

++    <ClCompile>

++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

++      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <StringPooling>true</StringPooling>

++      <ExceptionHandling>

++      </ExceptionHandling>

++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

++      <BufferSecurityCheck>false</BufferSecurityCheck>

++      <FunctionLevelLinking>true</FunctionLevelLinking>

++      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

++      <AssemblerOutput>All</AssemblerOutput>

++      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

++      <ObjectFileName>$(IntDir)</ObjectFileName>

++      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

++      <BrowseInformation>

++      </BrowseInformation>

++      <WarningLevel>Level3</WarningLevel>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++    </ClCompile>

++    <ResourceCompile>

++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++      <Culture>0x040c</Culture>

++    </ResourceCompile>

++    <Link>

++      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

++      <SuppressStartupBanner>true</SuppressStartupBanner>

++      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

++      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

++      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

++      <GenerateMapFile>true</GenerateMapFile>

++      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

++      <SubSystem>Windows</SubSystem>

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

++      <TargetMachine>MachineIA64</TargetMachine>

++    </Link>

++  </ItemDefinitionGroup>

++  <ItemGroup>

++    <ClCompile Include="..\..\..\adler32.c" />

++    <ClCompile Include="..\..\..\compress.c" />

++    <ClCompile Include="..\..\..\crc32.c" />

++    <ClCompile Include="..\..\..\deflate.c" />

++    <ClCompile Include="..\..\..\gzclose.c" />

++    <ClCompile Include="..\..\..\gzlib.c" />

++    <ClCompile Include="..\..\..\gzread.c" />

++    <ClCompile Include="..\..\..\gzwrite.c" />

++    <ClCompile Include="..\..\..\infback.c" />

++    <ClCompile Include="..\..\masmx64\inffas8664.c">

++      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

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

++      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

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

++      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

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

++    </ClCompile>

++    <ClCompile Include="..\..\..\inffast.c" />

++    <ClCompile Include="..\..\..\inflate.c" />

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

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

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

++    <ClCompile Include="..\..\..\trees.c" />

++    <ClCompile Include="..\..\..\uncompr.c" />

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

++      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

++      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

++      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++    </ClCompile>

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

++      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

++      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

++      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

++      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

++    </ClCompile>

++    <ClCompile Include="..\..\..\zutil.c" />

++  </ItemGroup>

++  <ItemGroup>

++    <ResourceCompile Include="zlib.rc" />

++  </ItemGroup>

++  <ItemGroup>

++    <None Include="zlibvc.def" />

++  </ItemGroup>

++  <ItemGroup>

++    <ClInclude Include="..\..\..\deflate.h" />

++    <ClInclude Include="..\..\..\infblock.h" />

++    <ClInclude Include="..\..\..\infcodes.h" />

++    <ClInclude Include="..\..\..\inffast.h" />

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

++    <ClInclude Include="..\..\..\infutil.h" />

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

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

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

++  </ItemGroup>

++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

++  <ImportGroup Label="ExtensionTargets">

++  </ImportGroup>

++</Project>
+\ No newline at end of file
+diff --git a/zlib/contrib/vstudio/vc9/zlib.rc b/zlib/contrib/vstudio/vc9/zlib.rc
+index 8eca4db..73f6476 100644
+--- a/zlib/contrib/vstudio/vc9/zlib.rc
++++ b/zlib/contrib/vstudio/vc9/zlib.rc
+@@ -2,8 +2,8 @@
+ 

+ #define IDR_VERSION1  1

+ IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE

+-  FILEVERSION	 1.2.7,0

+-  PRODUCTVERSION 1.2.7,0

++  FILEVERSION	 1,2,8,0

++  PRODUCTVERSION 1,2,8,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.7\0"

++      VALUE "FileVersion",	"1.2.8\0"

+       VALUE "InternalName",	"zlib\0"

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

++      VALUE "OriginalFilename",	"zlibwapi.dll\0"

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

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

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

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

+     END

+   END

+   BLOCK "VarFileInfo"

+diff --git a/zlib/contrib/vstudio/vc9/zlibvc.def b/zlib/contrib/vstudio/vc9/zlibvc.def
+index 2df8bb3..6367046 100644
+--- a/zlib/contrib/vstudio/vc9/zlibvc.def
++++ b/zlib/contrib/vstudio/vc9/zlibvc.def
+@@ -1,7 +1,7 @@
+ LIBRARY

+ ; zlib data compression and ZIP file I/O library

+ 

+-VERSION		1.2.7

++VERSION		1.2.8

+ 

+ EXPORTS

+         adler32                                  @1

+@@ -133,7 +133,11 @@ EXPORTS
+ ; zlib1 v1.2.6 added:

+         gzgetc_                                 @161

+         inflateResetKeep                        @163

+-        deflateResetKeep                        @164
+-
+-; zlib1 v1.2.7 added:
+-        gzopen_w                                @165
++        deflateResetKeep                        @164

++

++; zlib1 v1.2.7 added:

++        gzopen_w                                @165

++

++; zlib1 v1.2.8 added:

++        inflateGetDictionary                    @166

++        gzvprintf                               @167

+diff --git a/zlib/deflate.c b/zlib/deflate.c
+index 99184ff..03e76ab 100644
+--- a/zlib/deflate.c
++++ b/zlib/deflate.c
+@@ -1,5 +1,5 @@
+ /* deflate.c -- compress data using the deflation algorithm
+- * Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
++ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -52,7 +52,7 @@
+ #include "deflate.h"
+ 
+ const char deflate_copyright[] =
+-   " deflate 1.2.7 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
++   " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
+ /*
+   If you use the zlib library in a product, an acknowledgment is welcome
+   in the documentation of your product. If for some reason you cannot
+@@ -305,7 +305,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+         s->pending_buf == Z_NULL) {
+         s->status = FINISH_STATE;
+-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
++        strm->msg = ERR_MSG(Z_MEM_ERROR);
+         deflateEnd (strm);
+         return Z_MEM_ERROR;
+     }
+@@ -329,7 +329,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+     uInt str, n;
+     int wrap;
+     unsigned avail;
+-    unsigned char *next;
++    z_const unsigned char *next;
+ 
+     if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
+         return Z_STREAM_ERROR;
+@@ -359,7 +359,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+     avail = strm->avail_in;
+     next = strm->next_in;
+     strm->avail_in = dictLength;
+-    strm->next_in = (Bytef *)dictionary;
++    strm->next_in = (z_const Bytef *)dictionary;
+     fill_window(s);
+     while (s->lookahead >= MIN_MATCH) {
+         str = s->strstart;
+@@ -513,6 +513,8 @@ int ZEXPORT deflateParams(strm, level, strategy)
+         strm->total_in != 0) {
+         /* Flush the last buffer: */
+         err = deflate(strm, Z_BLOCK);
++        if (err == Z_BUF_ERROR && s->pending == 0)
++            err = Z_OK;
+     }
+     if (s->level != level) {
+         s->level = level;
+diff --git a/zlib/deflate.h b/zlib/deflate.h
+index da72661..1eba665 100644
+--- a/zlib/deflate.h
++++ b/zlib/deflate.h
+@@ -104,7 +104,7 @@ typedef struct internal_state {
+     int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+     gz_headerp  gzhead;  /* gzip header information to write */
+     uInt   gzindex;      /* where in extra, name, or comment */
+-    Byte  method;        /* STORED (for zip only) or DEFLATED */
++    Byte  method;        /* can only be DEFLATED */
+     int   last_flush;    /* value of flush param for previous deflate call */
+ 
+                 /* used by deflate.c: */
+diff --git a/zlib/examples/enough.c b/zlib/examples/enough.c
+index c40410b..b991144 100644
+--- a/zlib/examples/enough.c
++++ b/zlib/examples/enough.c
+@@ -1,7 +1,7 @@
+ /* enough.c -- determine the maximum size of inflate's Huffman code tables over
+  * all possible valid and complete Huffman codes, subject to a length limit.
+- * Copyright (C) 2007, 2008 Mark Adler
+- * Version 1.3  17 February 2008  Mark Adler
++ * Copyright (C) 2007, 2008, 2012 Mark Adler
++ * Version 1.4  18 August 2012  Mark Adler
+  */
+ 
+ /* Version history:
+@@ -14,6 +14,9 @@
+    1.3  17 Feb 2008  Add argument for initial root table size
+                      Fix bug for initial root table size == max - 1
+                      Use a macro to compute the history index
++   1.4  18 Aug 2012  Avoid shifts more than bits in type (caused endless loop!)
++                     Clean up comparisons of different types
++                     Clean up code indentation
+  */
+ 
+ /*
+@@ -236,8 +239,8 @@ local big_t count(int syms, int len, int left)
+     for (use = least; use <= most; use++) {
+         got = count(syms - use, len + 1, (left - use) << 1);
+         sum += got;
+-        if (got == -1 || sum < got)         /* overflow */
+-            return -1;
++        if (got == (big_t)0 - 1 || sum < got)   /* overflow */
++            return (big_t)0 - 1;
+     }
+ 
+     /* verify that all recursive calls are productive */
+@@ -458,6 +461,7 @@ int main(int argc, char **argv)
+     int n;              /* number of symbols to code for this run */
+     big_t got;          /* return value of count() */
+     big_t sum;          /* accumulated number of codes over n */
++    code_t word;        /* for counting bits in code_t */
+ 
+     /* set up globals for cleanup() */
+     code = NULL;
+@@ -466,19 +470,19 @@ int main(int argc, char **argv)
+ 
+     /* get arguments -- default to the deflate literal/length code */
+     syms = 286;
+-        root = 9;
++    root = 9;
+     max = 15;
+     if (argc > 1) {
+         syms = atoi(argv[1]);
+         if (argc > 2) {
+             root = atoi(argv[2]);
+-                        if (argc > 3)
+-                                max = atoi(argv[3]);
+-                }
++            if (argc > 3)
++                max = atoi(argv[3]);
++        }
+     }
+     if (argc > 4 || syms < 2 || root < 1 || max < 1) {
+         fputs("invalid arguments, need: [sym >= 2 [root >= 1 [max >= 1]]]\n",
+-                          stderr);
++              stderr);
+         return 1;
+     }
+ 
+@@ -487,18 +491,17 @@ int main(int argc, char **argv)
+         max = syms - 1;
+ 
+     /* determine the number of bits in a code_t */
+-    n = 0;
+-    while (((code_t)1 << n) != 0)
+-        n++;
++    for (n = 0, word = 1; word; n++, word <<= 1)
++        ;
+ 
+     /* make sure that the calculation of most will not overflow */
+-    if (max > n || syms - 2 >= (((code_t)0 - 1) >> (max - 1))) {
++    if (max > n || (code_t)(syms - 2) >= (((code_t)0 - 1) >> (max - 1))) {
+         fputs("abort: code length too long for internal types\n", stderr);
+         return 1;
+     }
+ 
+     /* reject impossible code requests */
+-    if (syms - 1 > ((code_t)1 << max) - 1) {
++    if ((code_t)(syms - 1) > ((code_t)1 << max) - 1) {
+         fprintf(stderr, "%d symbols cannot be coded in %d bits\n",
+                 syms, max);
+         return 1;
+@@ -532,7 +535,7 @@ int main(int argc, char **argv)
+     for (n = 2; n <= syms; n++) {
+         got = count(n, 1, 2);
+         sum += got;
+-        if (got == -1 || sum < got) {       /* overflow */
++        if (got == (big_t)0 - 1 || sum < got) {     /* overflow */
+             fputs("abort: can't count that high!\n", stderr);
+             cleanup();
+             return 1;
+@@ -556,9 +559,9 @@ int main(int argc, char **argv)
+     }
+ 
+     /* find and show maximum inflate table usage */
+-        if (root > max)                 /* reduce root to max length */
+-                root = max;
+-    if (syms < ((code_t)1 << (root + 1)))
++    if (root > max)                 /* reduce root to max length */
++        root = max;
++    if ((code_t)syms < ((code_t)1 << (root + 1)))
+         enough(syms);
+     else
+         puts("cannot handle minimum code lengths > root");
+diff --git a/zlib/examples/gun.c b/zlib/examples/gun.c
+index 72b0882..89e484f 100644
+--- a/zlib/examples/gun.c
++++ b/zlib/examples/gun.c
+@@ -1,7 +1,7 @@
+ /* gun.c -- simple gunzip to give an example of the use of inflateBack()
+- * Copyright (C) 2003, 2005, 2008, 2010 Mark Adler
++ * Copyright (C) 2003, 2005, 2008, 2010, 2012 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+-   Version 1.6  17 January 2010  Mark Adler */
++   Version 1.7  12 August 2012  Mark Adler */
+ 
+ /* Version history:
+    1.0  16 Feb 2003  First version for testing of inflateBack()
+@@ -18,6 +18,7 @@
+    1.4   8 Dec 2006  LZW decompression speed improvements
+    1.5   9 Feb 2008  Avoid warning in latest version of gcc
+    1.6  17 Jan 2010  Avoid signed/unsigned comparison warnings
++   1.7  12 Aug 2012  Update for z_const usage in zlib 1.2.8
+  */
+ 
+ /*
+@@ -85,7 +86,7 @@ struct ind {
+ /* Load input buffer, assumed to be empty, and return bytes loaded and a
+    pointer to them.  read() is called until the buffer is full, or until it
+    returns end-of-file or error.  Return 0 on error. */
+-local unsigned in(void *in_desc, unsigned char **buf)
++local unsigned in(void *in_desc, z_const unsigned char **buf)
+ {
+     int ret;
+     unsigned len;
+@@ -196,7 +197,7 @@ unsigned char match[65280 + 2];         /* buffer for reversed match or gzip
+    file, read error, or write error (a write error indicated by strm->next_in
+    not equal to Z_NULL), or Z_DATA_ERROR for invalid input.
+  */
+-local int lunpipe(unsigned have, unsigned char *next, struct ind *indp,
++local int lunpipe(unsigned have, z_const unsigned char *next, struct ind *indp,
+                   int outfile, z_stream *strm)
+ {
+     int last;                   /* last byte read by NEXT(), or -1 if EOF */
+@@ -383,7 +384,7 @@ local int gunpipe(z_stream *strm, int infile, int outfile)
+ {
+     int ret, first, last;
+     unsigned have, flags, len;
+-    unsigned char *next = NULL;
++    z_const unsigned char *next = NULL;
+     struct ind ind, *indp;
+     struct outd outd;
+ 
+diff --git a/zlib/examples/gzappend.c b/zlib/examples/gzappend.c
+index e9e878e..662dec3 100644
+--- a/zlib/examples/gzappend.c
++++ b/zlib/examples/gzappend.c
+@@ -1,7 +1,7 @@
+ /* gzappend -- command to append to a gzip file
+ 
+-  Copyright (C) 2003 Mark Adler, all rights reserved
+-  version 1.1, 4 Nov 2003
++  Copyright (C) 2003, 2012 Mark Adler, all rights reserved
++  version 1.2, 11 Oct 2012
+ 
+   This software is provided 'as-is', without any express or implied
+   warranty.  In no event will the author be held liable for any damages
+@@ -39,6 +39,8 @@
+  *                      - Keep gzip file clean on appended file read errors
+  *                      - Use in-place rotate instead of auxiliary buffer
+  *                        (Why you ask?  Because it was fun to write!)
++ * 1.2  11 Oct 2012     - Fix for proper z_const usage
++ *                      - Check for input buffer malloc failure
+  */
+ 
+ /*
+@@ -170,7 +172,7 @@ typedef struct {
+     int size;                   /* 1 << size is bytes in buf */
+     unsigned left;              /* bytes available at next */
+     unsigned char *buf;         /* buffer */
+-    unsigned char *next;        /* next byte in buffer */
++    z_const unsigned char *next;    /* next byte in buffer */
+     char *name;                 /* file name for error messages */
+ } file;
+ 
+@@ -399,14 +401,14 @@ local void gztack(char *name, int gd, z_stream *strm, int last)
+     }
+ 
+     /* allocate buffers */
+-    in = fd == -1 ? NULL : malloc(CHUNK);
++    in = malloc(CHUNK);
+     out = malloc(CHUNK);
+-    if (out == NULL) bye("out of memory", "");
++    if (in == NULL || out == NULL) bye("out of memory", "");
+ 
+     /* compress input file and append to gzip file */
+     do {
+         /* get more input */
+-        len = fd == -1 ? 0 : read(fd, in, CHUNK);
++        len = read(fd, in, CHUNK);
+         if (len == -1) {
+             fprintf(stderr,
+                     "gzappend warning: error reading %s, skipping rest ...\n",
+@@ -453,7 +455,7 @@ local void gztack(char *name, int gd, z_stream *strm, int last)
+ 
+     /* clean up and return */
+     free(out);
+-    if (in != NULL) free(in);
++    free(in);
+     if (fd > 0) close(fd);
+ }
+ 
+@@ -467,11 +469,13 @@ int main(int argc, char **argv)
+     z_stream strm;
+ 
+     /* ignore command name */
+-    argv++;
++    argc--; argv++;
+ 
+     /* provide usage if no arguments */
+     if (*argv == NULL) {
+-        printf("gzappend 1.1 (4 Nov 2003) Copyright (C) 2003 Mark Adler\n");
++        printf(
++            "gzappend 1.2 (11 Oct 2012) Copyright (C) 2003, 2012 Mark Adler\n"
++               );
+         printf(
+             "usage: gzappend [-level] file.gz [ addthis [ andthis ... ]]\n");
+         return 0;
+diff --git a/zlib/examples/gzjoin.c b/zlib/examples/gzjoin.c
+index 129347c..89e8098 100644
+--- a/zlib/examples/gzjoin.c
++++ b/zlib/examples/gzjoin.c
+@@ -1,7 +1,7 @@
+ /* gzjoin -- command to join gzip files into one gzip file
+ 
+-  Copyright (C) 2004 Mark Adler, all rights reserved
+-  version 1.0, 11 Dec 2004
++  Copyright (C) 2004, 2005, 2012 Mark Adler, all rights reserved
++  version 1.2, 14 Aug 2012
+ 
+   This software is provided 'as-is', without any express or implied
+   warranty.  In no event will the author be held liable for any damages
+@@ -27,6 +27,7 @@
+  *
+  * 1.0  11 Dec 2004     - First version
+  * 1.1  12 Jun 2005     - Changed ssize_t to long for portability
++ * 1.2  14 Aug 2012     - Clean up for z_const usage
+  */
+ 
+ /*
+@@ -308,7 +309,7 @@ local void gzcopy(char *name, int clr, unsigned long *crc, unsigned long *tot,
+     /* inflate and copy compressed data, clear last-block bit if requested */
+     len = 0;
+     zpull(&strm, in);
+-    start = strm.next_in;
++    start = in->next;
+     last = start[0] & 1;
+     if (last && clr)
+         start[0] &= ~1;
+@@ -351,7 +352,7 @@ local void gzcopy(char *name, int clr, unsigned long *crc, unsigned long *tot,
+                 pos = 0x100 >> pos;
+                 last = strm.next_in[-1] & pos;
+                 if (last && clr)
+-                    strm.next_in[-1] &= ~pos;
++                    in->buf[strm.next_in - in->buf - 1] &= ~pos;
+             }
+             else {
+                 /* next last-block bit is in next unused byte */
+@@ -364,14 +365,14 @@ local void gzcopy(char *name, int clr, unsigned long *crc, unsigned long *tot,
+                 }
+                 last = strm.next_in[0] & 1;
+                 if (last && clr)
+-                    strm.next_in[0] &= ~1;
++                    in->buf[strm.next_in - in->buf] &= ~1;
+             }
+         }
+     }
+ 
+     /* update buffer with unused input */
+     in->left = strm.avail_in;
+-    in->next = strm.next_in;
++    in->next = in->buf + (strm.next_in - in->buf);
+ 
+     /* copy used input, write empty blocks to get to byte boundary */
+     pos = strm.data_type & 7;
+diff --git a/zlib/examples/gzlog.c b/zlib/examples/gzlog.c
+index d70aaca..922f878 100644
+--- a/zlib/examples/gzlog.c
++++ b/zlib/examples/gzlog.c
+@@ -1,8 +1,8 @@
+ /*
+  * gzlog.c
+- * Copyright (C) 2004, 2008 Mark Adler, all rights reserved
++ * Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved
+  * For conditions of distribution and use, see copyright notice in gzlog.h
+- * version 2.0, 25 Apr 2008
++ * version 2.2, 14 Aug 2012
+  */
+ 
+ /*
+@@ -750,7 +750,8 @@ local int log_recover(struct log *log, int op)
+         strcpy(log->end, ".add");
+         if (stat(log->path, &st) == 0 && st.st_size) {
+             len = (size_t)(st.st_size);
+-            if (len != st.st_size || (data = malloc(st.st_size)) == NULL) {
++            if ((off_t)len != st.st_size ||
++                    (data = malloc(st.st_size)) == NULL) {
+                 log_log(log, op, "allocation failure");
+                 return -2;
+             }
+@@ -758,7 +759,7 @@ local int log_recover(struct log *log, int op)
+                 log_log(log, op, ".add file read failure");
+                 return -1;
+             }
+-            ret = read(fd, data, len) != len;
++            ret = (size_t)read(fd, data, len) != len;
+             close(fd);
+             if (ret) {
+                 log_log(log, op, ".add file read failure");
+@@ -913,7 +914,7 @@ int gzlog_compress(gzlog *logd)
+     struct log *log = logd;
+ 
+     /* check arguments */
+-    if (log == NULL || strcmp(log->id, LOGID) || len < 0)
++    if (log == NULL || strcmp(log->id, LOGID))
+         return -3;
+ 
+     /* see if we lost the lock -- if so get it again and reload the extra
+@@ -952,7 +953,7 @@ int gzlog_compress(gzlog *logd)
+         fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+         if (fd < 0)
+             break;
+-        ret = write(fd, data, len) != len;
++        ret = (size_t)write(fd, data, len) != len;
+         if (ret | close(fd))
+             break;
+         log_touch(log);
+@@ -963,7 +964,7 @@ int gzlog_compress(gzlog *logd)
+         if (fd < 0)
+             break;
+         next = DICT > len ? len : DICT;
+-        ret = write(fd, (char *)data + len - next, next) != next;
++        ret = (size_t)write(fd, (char *)data + len - next, next) != next;
+         if (ret | close(fd))
+             break;
+         log_touch(log);
+@@ -997,9 +998,9 @@ int gzlog_write(gzlog *logd, void *data, size_t len)
+     struct log *log = logd;
+ 
+     /* check arguments */
+-    if (log == NULL || strcmp(log->id, LOGID) || len < 0)
++    if (log == NULL || strcmp(log->id, LOGID))
+         return -3;
+-    if (data == NULL || len == 0)
++    if (data == NULL || len <= 0)
+         return 0;
+ 
+     /* see if we lost the lock -- if so get it again and reload the extra
+@@ -1013,7 +1014,7 @@ int gzlog_write(gzlog *logd, void *data, size_t len)
+     fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+     if (fd < 0)
+         return -1;
+-    ret = write(fd, data, len) != len;
++    ret = (size_t)write(fd, data, len) != len;
+     if (ret | close(fd))
+         return -1;
+     log_touch(log);
+diff --git a/zlib/examples/gzlog.h b/zlib/examples/gzlog.h
+index c461426..86f0cec 100644
+--- a/zlib/examples/gzlog.h
++++ b/zlib/examples/gzlog.h
+@@ -1,6 +1,6 @@
+ /* gzlog.h
+-  Copyright (C) 2004, 2008 Mark Adler, all rights reserved
+-  version 2.0, 25 Apr 2008
++  Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved
++  version 2.2, 14 Aug 2012
+ 
+   This software is provided 'as-is', without any express or implied
+   warranty.  In no event will the author be held liable for any damages
+@@ -27,6 +27,8 @@
+                      Interface changed slightly in that now path is a prefix
+                      Compression now occurs as needed during gzlog_write()
+                      gzlog_write() now always leaves the log file as valid gzip
++   2.1   8 Jul 2012  Fix argument checks in gzlog_compress() and gzlog_write()
++   2.2  14 Aug 2012  Clean up signed comparisons
+  */
+ 
+ /*
+diff --git a/zlib/examples/zran.c b/zlib/examples/zran.c
+index 617a130..278f9ad 100644
+--- a/zlib/examples/zran.c
++++ b/zlib/examples/zran.c
+@@ -1,7 +1,12 @@
+ /* zran.c -- example of zlib/gzip stream indexing and random access
+- * Copyright (C) 2005 Mark Adler
++ * Copyright (C) 2005, 2012 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+-   Version 1.0  29 May 2005  Mark Adler */
++   Version 1.1  29 Sep 2012  Mark Adler */
++
++/* Version History:
++ 1.0  29 May 2005  First version
++ 1.1  29 Sep 2012  Fix memory reallocation error
++ */
+ 
+ /* Illustrate the use of Z_BLOCK, inflatePrime(), and inflateSetDictionary()
+    for random access of a compressed file.  A file containing a zlib or gzip
+@@ -221,7 +226,7 @@ local int build_index(FILE *in, off_t span, struct access **built)
+ 
+     /* clean up and return index (release unused entries in list) */
+     (void)inflateEnd(&strm);
+-    index = realloc(index, sizeof(struct point) * index->have);
++    index->list = realloc(index->list, sizeof(struct point) * index->have);
+     index->size = index->have;
+     *built = index;
+     return index->size;
+diff --git a/zlib/gzguts.h b/zlib/gzguts.h
+index ee3f281..d87659d 100644
+--- a/zlib/gzguts.h
++++ b/zlib/gzguts.h
+@@ -1,5 +1,5 @@
+ /* gzguts.h -- zlib internal header definitions for gz* operations
+- * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
++ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -35,6 +35,13 @@
+ #  include <io.h>
+ #endif
+ 
++#ifdef WINAPI_FAMILY
++#  define open _open
++#  define read _read
++#  define write _write
++#  define close _close
++#endif
++
+ #ifdef NO_DEFLATE       /* for compatibility with old definition */
+ #  define NO_GZCOMPRESS
+ #endif
+@@ -60,7 +67,7 @@
+ #ifndef HAVE_VSNPRINTF
+ #  ifdef MSDOS
+ /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+- but for now we just assume it doesn't. */
++   but for now we just assume it doesn't. */
+ #    define NO_vsnprintf
+ #  endif
+ #  ifdef __TURBOC__
+@@ -88,6 +95,14 @@
+ #  endif
+ #endif
+ 
++/* unlike snprintf (which is required in C99, yet still not supported by
++   Microsoft more than a decade later!), _snprintf does not guarantee null
++   termination of the result -- however this is only used in gzlib.c where
++   the result is assured to fit in the space provided */
++#ifdef _MSC_VER
++#  define snprintf _snprintf
++#endif
++
+ #ifndef local
+ #  define local static
+ #endif
+@@ -127,7 +142,8 @@
+ #  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+ #endif
+ 
+-/* default i/o buffer size -- double this for output when reading */
++/* default i/o buffer size -- double this for output when reading (this and
++   twice this must be able to fit in an unsigned type) */
+ #define GZBUFSIZE 8192
+ 
+ /* gzip modes, also provide a little integrity check on the passed structure */
+diff --git a/zlib/gzlib.c b/zlib/gzlib.c
+index ca55c6e..fae202e 100644
+--- a/zlib/gzlib.c
++++ b/zlib/gzlib.c
+@@ -1,5 +1,5 @@
+ /* gzlib.c -- zlib functions common to reading and writing gzip files
+- * Copyright (C) 2004, 2010, 2011, 2012 Mark Adler
++ * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -108,7 +108,7 @@ local gzFile gz_open(path, fd, mode)
+         return NULL;
+ 
+     /* allocate gzFile structure to return */
+-    state = malloc(sizeof(gz_state));
++    state = (gz_statep)malloc(sizeof(gz_state));
+     if (state == NULL)
+         return NULL;
+     state->size = 0;            /* no buffers allocated yet */
+@@ -162,8 +162,10 @@ local gzFile gz_open(path, fd, mode)
+                 break;
+             case 'F':
+                 state->strategy = Z_FIXED;
++                break;
+             case 'T':
+                 state->direct = 1;
++                break;
+             default:        /* could consider as an error, but just ignore */
+                 ;
+             }
+@@ -194,8 +196,8 @@ local gzFile gz_open(path, fd, mode)
+     }
+     else
+ #endif
+-        len = strlen(path);
+-    state->path = malloc(len + 1);
++        len = strlen((const char *)path);
++    state->path = (char *)malloc(len + 1);
+     if (state->path == NULL) {
+         free(state);
+         return NULL;
+@@ -208,7 +210,11 @@ local gzFile gz_open(path, fd, mode)
+             *(state->path) = 0;
+     else
+ #endif
++#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
++        snprintf(state->path, len + 1, "%s", (const char *)path);
++#else
+         strcpy(state->path, path);
++#endif
+ 
+     /* compute the flags for open() */
+     oflag =
+@@ -236,7 +242,7 @@ local gzFile gz_open(path, fd, mode)
+ #ifdef _WIN32
+         fd == -2 ? _wopen(path, oflag, 0666) :
+ #endif
+-        open(path, oflag, 0666));
++        open((const char *)path, oflag, 0666));
+     if (state->fd == -1) {
+         free(state->path);
+         free(state);
+@@ -282,9 +288,13 @@ gzFile ZEXPORT gzdopen(fd, mode)
+     char *path;         /* identifier for error messages */
+     gzFile gz;
+ 
+-    if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)
++    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
+         return NULL;
++#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
++    snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
++#else
+     sprintf(path, "<fd:%d>", fd);   /* for debugging */
++#endif
+     gz = gz_open(path, fd, mode);
+     free(path);
+     return gz;
+@@ -531,7 +541,8 @@ const char * ZEXPORT gzerror(file, errnum)
+     /* return error information */
+     if (errnum != NULL)
+         *errnum = state->err;
+-    return state->msg == NULL ? "" : state->msg;
++    return state->err == Z_MEM_ERROR ? "out of memory" :
++                                       (state->msg == NULL ? "" : state->msg);
+ }
+ 
+ /* -- see zlib.h -- */
+@@ -582,21 +593,24 @@ void ZLIB_INTERNAL gz_error(state, err, msg)
+     if (msg == NULL)
+         return;
+ 
+-    /* for an out of memory error, save as static string */
+-    if (err == Z_MEM_ERROR) {
+-        state->msg = (char *)msg;
++    /* for an out of memory error, return literal string when requested */
++    if (err == Z_MEM_ERROR)
+         return;
+-    }
+ 
+     /* construct error message with path */
+-    if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
++    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
++            NULL) {
+         state->err = Z_MEM_ERROR;
+-        state->msg = (char *)"out of memory";
+         return;
+     }
++#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
++    snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
++             "%s%s%s", state->path, ": ", msg);
++#else
+     strcpy(state->msg, state->path);
+     strcat(state->msg, ": ");
+     strcat(state->msg, msg);
++#endif
+     return;
+ }
+ 
+diff --git a/zlib/gzread.c b/zlib/gzread.c
+index 3493d34..bf4538e 100644
+--- a/zlib/gzread.c
++++ b/zlib/gzread.c
+@@ -1,5 +1,5 @@
+ /* gzread.c -- zlib functions for reading gzip files
+- * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
++ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -58,7 +58,8 @@ local int gz_avail(state)
+         return -1;
+     if (state->eof == 0) {
+         if (strm->avail_in) {       /* copy what's there to the start */
+-            unsigned char *p = state->in, *q = strm->next_in;
++            unsigned char *p = state->in;
++            unsigned const char *q = strm->next_in;
+             unsigned n = strm->avail_in;
+             do {
+                 *p++ = *q++;
+@@ -90,8 +91,8 @@ local int gz_look(state)
+     /* allocate read buffers and inflate memory */
+     if (state->size == 0) {
+         /* allocate buffers */
+-        state->in = malloc(state->want);
+-        state->out = malloc(state->want << 1);
++        state->in = (unsigned char *)malloc(state->want);
++        state->out = (unsigned char *)malloc(state->want << 1);
+         if (state->in == NULL || state->out == NULL) {
+             if (state->out != NULL)
+                 free(state->out);
+@@ -352,14 +353,14 @@ int ZEXPORT gzread(file, buf, len)
+ 
+         /* large len -- read directly into user buffer */
+         else if (state->how == COPY) {      /* read directly */
+-            if (gz_load(state, buf, len, &n) == -1)
++            if (gz_load(state, (unsigned char *)buf, len, &n) == -1)
+                 return -1;
+         }
+ 
+         /* large len -- decompress directly into user buffer */
+         else {  /* state->how == GZIP */
+             strm->avail_out = len;
+-            strm->next_out = buf;
++            strm->next_out = (unsigned char *)buf;
+             if (gz_decomp(state) == -1)
+                 return -1;
+             n = state->x.have;
+@@ -378,7 +379,11 @@ int ZEXPORT gzread(file, buf, len)
+ }
+ 
+ /* -- see zlib.h -- */
+-#undef gzgetc
++#ifdef Z_PREFIX_SET
++#  undef z_gzgetc
++#else
++#  undef gzgetc
++#endif
+ int ZEXPORT gzgetc(file)
+     gzFile file;
+ {
+@@ -518,7 +523,7 @@ char * ZEXPORT gzgets(file, buf, len)
+ 
+         /* look for end-of-line in current output buffer */
+         n = state->x.have > left ? left : state->x.have;
+-        eol = memchr(state->x.next, '\n', n);
++        eol = (unsigned char *)memchr(state->x.next, '\n', n);
+         if (eol != NULL)
+             n = (unsigned)(eol - state->x.next) + 1;
+ 
+diff --git a/zlib/gzwrite.c b/zlib/gzwrite.c
+index 27cb342..aa767fb 100644
+--- a/zlib/gzwrite.c
++++ b/zlib/gzwrite.c
+@@ -1,5 +1,5 @@
+ /* gzwrite.c -- zlib functions for writing gzip files
+- * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
++ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -19,7 +19,7 @@ local int gz_init(state)
+     z_streamp strm = &(state->strm);
+ 
+     /* allocate input buffer */
+-    state->in = malloc(state->want);
++    state->in = (unsigned char *)malloc(state->want);
+     if (state->in == NULL) {
+         gz_error(state, Z_MEM_ERROR, "out of memory");
+         return -1;
+@@ -28,7 +28,7 @@ local int gz_init(state)
+     /* only need output buffer and deflate state if compressing */
+     if (!state->direct) {
+         /* allocate output buffer */
+-        state->out = malloc(state->want);
++        state->out = (unsigned char *)malloc(state->want);
+         if (state->out == NULL) {
+             free(state->in);
+             gz_error(state, Z_MEM_ERROR, "out of memory");
+@@ -168,7 +168,6 @@ int ZEXPORT gzwrite(file, buf, len)
+     unsigned len;
+ {
+     unsigned put = len;
+-    unsigned n;
+     gz_statep state;
+     z_streamp strm;
+ 
+@@ -208,16 +207,19 @@ int ZEXPORT gzwrite(file, buf, len)
+     if (len < state->size) {
+         /* copy to input buffer, compress when full */
+         do {
++            unsigned have, copy;
++
+             if (strm->avail_in == 0)
+                 strm->next_in = state->in;
+-            n = state->size - strm->avail_in;
+-            if (n > len)
+-                n = len;
+-            memcpy(strm->next_in + strm->avail_in, buf, n);
+-            strm->avail_in += n;
+-            state->x.pos += n;
+-            buf = (char *)buf + n;
+-            len -= n;
++            have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
++            copy = state->size - have;
++            if (copy > len)
++                copy = len;
++            memcpy(state->in + have, buf, copy);
++            strm->avail_in += copy;
++            state->x.pos += copy;
++            buf = (const char *)buf + copy;
++            len -= copy;
+             if (len && gz_comp(state, Z_NO_FLUSH) == -1)
+                 return 0;
+         } while (len);
+@@ -229,7 +231,7 @@ int ZEXPORT gzwrite(file, buf, len)
+ 
+         /* directly compress user buffer to file */
+         strm->avail_in = len;
+-        strm->next_in = (voidp)buf;
++        strm->next_in = (z_const Bytef *)buf;
+         state->x.pos += len;
+         if (gz_comp(state, Z_NO_FLUSH) == -1)
+             return 0;
+@@ -244,6 +246,7 @@ int ZEXPORT gzputc(file, c)
+     gzFile file;
+     int c;
+ {
++    unsigned have;
+     unsigned char buf[1];
+     gz_statep state;
+     z_streamp strm;
+@@ -267,12 +270,16 @@ int ZEXPORT gzputc(file, c)
+ 
+     /* try writing to input buffer for speed (state->size == 0 if buffer not
+        initialized) */
+-    if (strm->avail_in < state->size) {
++    if (state->size) {
+         if (strm->avail_in == 0)
+             strm->next_in = state->in;
+-        strm->next_in[strm->avail_in++] = c;
+-        state->x.pos++;
+-        return c & 0xff;
++        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
++        if (have < state->size) {
++            state->in[have] = c;
++            strm->avail_in++;
++            state->x.pos++;
++            return c & 0xff;
++        }
+     }
+ 
+     /* no room in buffer or not initialized, use gz_write() */
+@@ -300,12 +307,11 @@ int ZEXPORT gzputs(file, str)
+ #include <stdarg.h>
+ 
+ /* -- see zlib.h -- */
+-int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
++int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
+ {
+     int size, len;
+     gz_statep state;
+     z_streamp strm;
+-    va_list va;
+ 
+     /* get internal structure */
+     if (file == NULL)
+@@ -335,25 +341,20 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
+     /* do the printf() into the input buffer, put length in len */
+     size = (int)(state->size);
+     state->in[size - 1] = 0;
+-    va_start(va, format);
+ #ifdef NO_vsnprintf
+ #  ifdef HAS_vsprintf_void
+     (void)vsprintf((char *)(state->in), format, va);
+-    va_end(va);
+     for (len = 0; len < size; len++)
+         if (state->in[len] == 0) break;
+ #  else
+     len = vsprintf((char *)(state->in), format, va);
+-    va_end(va);
+ #  endif
+ #else
+ #  ifdef HAS_vsnprintf_void
+     (void)vsnprintf((char *)(state->in), size, format, va);
+-    va_end(va);
+     len = strlen((char *)(state->in));
+ #  else
+     len = vsnprintf((char *)(state->in), size, format, va);
+-    va_end(va);
+ #  endif
+ #endif
+ 
+@@ -368,6 +369,17 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
+     return len;
+ }
+ 
++int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
++{
++    va_list va;
++    int ret;
++
++    va_start(va, format);
++    ret = gzvprintf(file, format, va);
++    va_end(va);
++    return ret;
++}
++
+ #else /* !STDC && !Z_HAVE_STDARG_H */
+ 
+ /* -- see zlib.h -- */
+@@ -547,9 +559,9 @@ int ZEXPORT gzclose_w(file)
+     }
+ 
+     /* flush, free memory, and close file */
++    if (gz_comp(state, Z_FINISH) == -1)
++        ret = state->err;
+     if (state->size) {
+-        if (gz_comp(state, Z_FINISH) == -1)
+-            ret = state->err;
+         if (!state->direct) {
+             (void)deflateEnd(&(state->strm));
+             free(state->out);
+diff --git a/zlib/infback.c b/zlib/infback.c
+index 981aff1..f3833c2 100644
+--- a/zlib/infback.c
++++ b/zlib/infback.c
+@@ -255,7 +255,7 @@ out_func out;
+ void FAR *out_desc;
+ {
+     struct inflate_state FAR *state;
+-    unsigned char FAR *next;    /* next input */
++    z_const unsigned char FAR *next;    /* next input */
+     unsigned char FAR *put;     /* next output */
+     unsigned have, left;        /* available input and output */
+     unsigned long hold;         /* bit buffer */
+diff --git a/zlib/inffast.c b/zlib/inffast.c
+index 2f1d60b..bda59ce 100644
+--- a/zlib/inffast.c
++++ b/zlib/inffast.c
+@@ -1,5 +1,5 @@
+ /* inffast.c -- fast decoding
+- * Copyright (C) 1995-2008, 2010 Mark Adler
++ * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -69,8 +69,8 @@ z_streamp strm;
+ unsigned start;         /* inflate()'s starting value for strm->avail_out */
+ {
+     struct inflate_state FAR *state;
+-    unsigned char FAR *in;      /* local strm->next_in */
+-    unsigned char FAR *last;    /* while in < last, enough input available */
++    z_const unsigned char FAR *in;      /* local strm->next_in */
++    z_const unsigned char FAR *last;    /* have enough input while in < last */
+     unsigned char FAR *out;     /* local strm->next_out */
+     unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+     unsigned char FAR *end;     /* while out < end, enough space available */
+diff --git a/zlib/inflate.c b/zlib/inflate.c
+index 47418a1..870f89b 100644
+--- a/zlib/inflate.c
++++ b/zlib/inflate.c
+@@ -93,11 +93,12 @@
+ 
+ /* function prototypes */
+ local void fixedtables OF((struct inflate_state FAR *state));
+-local int updatewindow OF((z_streamp strm, unsigned out));
++local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
++                           unsigned copy));
+ #ifdef BUILDFIXED
+    void makefixed OF((void));
+ #endif
+-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
++local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
+                               unsigned len));
+ 
+ int ZEXPORT inflateResetKeep(strm)
+@@ -375,12 +376,13 @@ void makefixed()
+    output will fall in the output data, making match copies simpler and faster.
+    The advantage may be dependent on the size of the processor's data caches.
+  */
+-local int updatewindow(strm, out)
++local int updatewindow(strm, end, copy)
+ z_streamp strm;
+-unsigned out;
++const Bytef *end;
++unsigned copy;
+ {
+     struct inflate_state FAR *state;
+-    unsigned copy, dist;
++    unsigned dist;
+ 
+     state = (struct inflate_state FAR *)strm->state;
+ 
+@@ -400,19 +402,18 @@ unsigned out;
+     }
+ 
+     /* copy state->wsize or less output bytes into the circular window */
+-    copy = out - strm->avail_out;
+     if (copy >= state->wsize) {
+-        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
++        zmemcpy(state->window, end - state->wsize, state->wsize);
+         state->wnext = 0;
+         state->whave = state->wsize;
+     }
+     else {
+         dist = state->wsize - state->wnext;
+         if (dist > copy) dist = copy;
+-        zmemcpy(state->window + state->wnext, strm->next_out - copy, dist);
++        zmemcpy(state->window + state->wnext, end - copy, dist);
+         copy -= dist;
+         if (copy) {
+-            zmemcpy(state->window, strm->next_out - copy, copy);
++            zmemcpy(state->window, end - copy, copy);
+             state->wnext = copy;
+             state->whave = state->wsize;
+         }
+@@ -606,7 +607,7 @@ z_streamp strm;
+ int flush;
+ {
+     struct inflate_state FAR *state;
+-    unsigned char FAR *next;    /* next input */
++    z_const unsigned char FAR *next;    /* next input */
+     unsigned char FAR *put;     /* next output */
+     unsigned have, left;        /* available input and output */
+     unsigned long hold;         /* bit buffer */
+@@ -920,7 +921,7 @@ int flush;
+             while (state->have < 19)
+                 state->lens[order[state->have++]] = 0;
+             state->next = state->codes;
+-            state->lencode = (code const FAR *)(state->next);
++            state->lencode = (const code FAR *)(state->next);
+             state->lenbits = 7;
+             ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                 &(state->lenbits), state->work);
+@@ -994,7 +995,7 @@ int flush;
+                values here (9 and 6) without reading the comments in inftrees.h
+                concerning the ENOUGH constants, which depend on those values */
+             state->next = state->codes;
+-            state->lencode = (code const FAR *)(state->next);
++            state->lencode = (const code FAR *)(state->next);
+             state->lenbits = 9;
+             ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                 &(state->lenbits), state->work);
+@@ -1003,7 +1004,7 @@ int flush;
+                 state->mode = BAD;
+                 break;
+             }
+-            state->distcode = (code const FAR *)(state->next);
++            state->distcode = (const code FAR *)(state->next);
+             state->distbits = 6;
+             ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                             &(state->next), &(state->distbits), state->work);
+@@ -1230,7 +1231,7 @@ int flush;
+     RESTORE();
+     if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+             (state->mode < CHECK || flush != Z_FINISH)))
+-        if (updatewindow(strm, out)) {
++        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
+             state->mode = MEM;
+             return Z_MEM_ERROR;
+         }
+@@ -1264,6 +1265,29 @@ z_streamp strm;
+     return Z_OK;
+ }
+ 
++int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
++z_streamp strm;
++Bytef *dictionary;
++uInt *dictLength;
++{
++    struct inflate_state FAR *state;
++
++    /* check state */
++    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
++    state = (struct inflate_state FAR *)strm->state;
++
++    /* copy dictionary */
++    if (state->whave && dictionary != Z_NULL) {
++        zmemcpy(dictionary, state->window + state->wnext,
++                state->whave - state->wnext);
++        zmemcpy(dictionary + state->whave - state->wnext,
++                state->window, state->wnext);
++    }
++    if (dictLength != Z_NULL)
++        *dictLength = state->whave;
++    return Z_OK;
++}
++
+ int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+ z_streamp strm;
+ const Bytef *dictionary;
+@@ -1271,8 +1295,6 @@ uInt dictLength;
+ {
+     struct inflate_state FAR *state;
+     unsigned long dictid;
+-    unsigned char *next;
+-    unsigned avail;
+     int ret;
+ 
+     /* check state */
+@@ -1291,13 +1313,7 @@ uInt dictLength;
+ 
+     /* copy dictionary to window using updatewindow(), which will amend the
+        existing dictionary if appropriate */
+-    next = strm->next_out;
+-    avail = strm->avail_out;
+-    strm->next_out = (Bytef *)dictionary + dictLength;
+-    strm->avail_out = 0;
+-    ret = updatewindow(strm, dictLength);
+-    strm->avail_out = avail;
+-    strm->next_out = next;
++    ret = updatewindow(strm, dictionary + dictLength, dictLength);
+     if (ret) {
+         state->mode = MEM;
+         return Z_MEM_ERROR;
+@@ -1337,7 +1353,7 @@ gz_headerp head;
+  */
+ local unsigned syncsearch(have, buf, len)
+ unsigned FAR *have;
+-unsigned char FAR *buf;
++const unsigned char FAR *buf;
+ unsigned len;
+ {
+     unsigned got;
+diff --git a/zlib/inftrees.c b/zlib/inftrees.c
+index abcd7c4..44d89cf 100644
+--- a/zlib/inftrees.c
++++ b/zlib/inftrees.c
+@@ -1,5 +1,5 @@
+ /* inftrees.c -- generate Huffman trees for efficient decoding
+- * Copyright (C) 1995-2012 Mark Adler
++ * Copyright (C) 1995-2013 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -9,7 +9,7 @@
+ #define MAXBITS 15
+ 
+ const char inflate_copyright[] =
+-   " inflate 1.2.7 Copyright 1995-2012 Mark Adler ";
++   " inflate 1.2.8 Copyright 1995-2013 Mark Adler ";
+ /*
+   If you use the zlib library in a product, an acknowledgment is welcome
+   in the documentation of your product. If for some reason you cannot
+@@ -62,7 +62,7 @@ unsigned short FAR *work;
+         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 78, 68};
++        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
+     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
+         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+@@ -208,8 +208,8 @@ unsigned short FAR *work;
+     mask = used - 1;            /* mask for comparing low */
+ 
+     /* check available table space */
+-    if ((type == LENS && used >= ENOUGH_LENS) ||
+-        (type == DISTS && used >= ENOUGH_DISTS))
++    if ((type == LENS && used > ENOUGH_LENS) ||
++        (type == DISTS && used > ENOUGH_DISTS))
+         return 1;
+ 
+     /* process all codes and make table entries */
+@@ -277,8 +277,8 @@ unsigned short FAR *work;
+ 
+             /* check for enough space */
+             used += 1U << curr;
+-            if ((type == LENS && used >= ENOUGH_LENS) ||
+-                (type == DISTS && used >= ENOUGH_DISTS))
++            if ((type == LENS && used > ENOUGH_LENS) ||
++                (type == DISTS && used > ENOUGH_DISTS))
+                 return 1;
+ 
+             /* point entry in root table to sub-table */
+diff --git a/zlib/qnx/package.qpg b/zlib/qnx/package.qpg
+index 26eed9b..aebf6e3 100644
+--- a/zlib/qnx/package.qpg
++++ b/zlib/qnx/package.qpg
+@@ -25,10 +25,10 @@
+       <QPG:Files>
+          <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
+          <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
+-         <QPG:Add file="../libz.so.1.2.7" install="/opt/lib/" user="root:bin" permission="644"/>
+-         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.7"/>
+-         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.7"/>
+-         <QPG:Add file="../libz.so.1.2.7" install="/opt/lib/" component="slib"/>
++         <QPG:Add file="../libz.so.1.2.8" install="/opt/lib/" user="root:bin" permission="644"/>
++         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.8"/>
++         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.8"/>
++         <QPG:Add file="../libz.so.1.2.8" install="/opt/lib/" component="slib"/>
+       </QPG:Files>
+ 
+       <QPG:PackageFilter>
+@@ -63,7 +63,7 @@
+             </QPM:ProductDescription>
+ 
+             <QPM:ReleaseDescription>
+-               <QPM:ReleaseVersion>1.2.7</QPM:ReleaseVersion>
++               <QPM:ReleaseVersion>1.2.8</QPM:ReleaseVersion>
+                <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
+                <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
+                <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
+diff --git a/zlib/test/example.c b/zlib/test/example.c
+index f515a48..138a699 100644
+--- a/zlib/test/example.c
++++ b/zlib/test/example.c
+@@ -26,7 +26,7 @@
+     } \
+ }
+ 
+-const char hello[] = "hello, hello!";
++z_const char hello[] = "hello, hello!";
+ /* "hello world" would be more standard, but the repeated "hello"
+  * stresses the compression code better, sorry...
+  */
+@@ -212,7 +212,7 @@ void test_deflate(compr, comprLen)
+     err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+     CHECK_ERR(err, "deflateInit");
+ 
+-    c_stream.next_in  = (Bytef*)hello;
++    c_stream.next_in  = (z_const unsigned char *)hello;
+     c_stream.next_out = compr;
+ 
+     while (c_stream.total_in != len && c_stream.total_out < comprLen) {
+@@ -387,7 +387,7 @@ void test_flush(compr, comprLen)
+     err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
+     CHECK_ERR(err, "deflateInit");
+ 
+-    c_stream.next_in  = (Bytef*)hello;
++    c_stream.next_in  = (z_const unsigned char *)hello;
+     c_stream.next_out = compr;
+     c_stream.avail_in = 3;
+     c_stream.avail_out = (uInt)*comprLen;
+@@ -476,7 +476,7 @@ void test_dict_deflate(compr, comprLen)
+     c_stream.next_out = compr;
+     c_stream.avail_out = (uInt)comprLen;
+ 
+-    c_stream.next_in = (Bytef*)hello;
++    c_stream.next_in = (z_const unsigned char *)hello;
+     c_stream.avail_in = (uInt)strlen(hello)+1;
+ 
+     err = deflate(&c_stream, Z_FINISH);
+diff --git a/zlib/test/minigzip.c b/zlib/test/minigzip.c
+index aa7ac7a..b3025a4 100644
+--- a/zlib/test/minigzip.c
++++ b/zlib/test/minigzip.c
+@@ -40,6 +40,10 @@
+ #  define SET_BINARY_MODE(file)
+ #endif
+ 
++#ifdef _MSC_VER
++#  define snprintf _snprintf
++#endif
++
+ #ifdef VMS
+ #  define unlink delete
+ #  define GZ_SUFFIX "-gz"
+@@ -463,8 +467,12 @@ void file_compress(file, mode)
+         exit(1);
+     }
+ 
++#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
++    snprintf(outfile, sizeof(outfile), "%s%s", file, GZ_SUFFIX);
++#else
+     strcpy(outfile, file);
+     strcat(outfile, GZ_SUFFIX);
++#endif
+ 
+     in = fopen(file, "rb");
+     if (in == NULL) {
+@@ -499,7 +507,11 @@ void file_uncompress(file)
+         exit(1);
+     }
+ 
++#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
++    snprintf(buf, sizeof(buf), "%s", file);
++#else
+     strcpy(buf, file);
++#endif
+ 
+     if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
+         infile = file;
+@@ -508,7 +520,11 @@ void file_uncompress(file)
+     } else {
+         outfile = file;
+         infile = buf;
++#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
++        snprintf(buf + len, sizeof(buf) - len, "%s", GZ_SUFFIX);
++#else
+         strcat(infile, GZ_SUFFIX);
++#endif
+     }
+     in = gzopen(infile, "rb");
+     if (in == NULL) {
+@@ -546,7 +562,11 @@ int main(argc, argv)
+     gzFile file;
+     char *bname, outmode[20];
+ 
++#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
++    snprintf(outmode, sizeof(outmode), "%s", "wb6 ");
++#else
+     strcpy(outmode, "wb6 ");
++#endif
+ 
+     prog = argv[0];
+     bname = strrchr(argv[0], '/');
+diff --git a/zlib/treebuild.xml b/zlib/treebuild.xml
+index 1f4d15f..38d29d7 100644
+--- a/zlib/treebuild.xml
++++ b/zlib/treebuild.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" ?>
+-<package name="zlib" version="1.2.7">
+-    <library name="zlib" dlversion="1.2.7" dlname="z">
++<package name="zlib" version="1.2.8">
++    <library name="zlib" dlversion="1.2.8" dlname="z">
+ 	<property name="description"> zip compression library </property>
+ 	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
+ 
+diff --git a/zlib/trees.c b/zlib/trees.c
+index cd0af2d..4b5dfa1 100644
+--- a/zlib/trees.c
++++ b/zlib/trees.c
+@@ -146,8 +146,8 @@ local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+ local int  build_bl_tree  OF((deflate_state *s));
+ local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
+                               int blcodes));
+-local void compress_block OF((deflate_state *s, ct_data *ltree,
+-                              ct_data *dtree));
++local void compress_block OF((deflate_state *s, const ct_data *ltree,
++                              const ct_data *dtree));
+ local int  detect_data_type OF((deflate_state *s));
+ local unsigned bi_reverse OF((unsigned value, int length));
+ local void bi_windup      OF((deflate_state *s));
+@@ -972,7 +972,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+     } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
+ #endif
+         send_bits(s, (STATIC_TREES<<1)+last, 3);
+-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
++        compress_block(s, (const ct_data *)static_ltree,
++                       (const ct_data *)static_dtree);
+ #ifdef DEBUG
+         s->compressed_len += 3 + s->static_len;
+ #endif
+@@ -980,7 +981,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+         send_bits(s, (DYN_TREES<<1)+last, 3);
+         send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
+                        max_blindex+1);
+-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
++        compress_block(s, (const ct_data *)s->dyn_ltree,
++                       (const ct_data *)s->dyn_dtree);
+ #ifdef DEBUG
+         s->compressed_len += 3 + s->opt_len;
+ #endif
+@@ -1057,8 +1059,8 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+  */
+ local void compress_block(s, ltree, dtree)
+     deflate_state *s;
+-    ct_data *ltree; /* literal tree */
+-    ct_data *dtree; /* distance tree */
++    const ct_data *ltree; /* literal tree */
++    const ct_data *dtree; /* distance tree */
+ {
+     unsigned dist;      /* distance of matched string */
+     int lc;             /* match length or unmatched char (if dist == 0) */
+diff --git a/zlib/uncompr.c b/zlib/uncompr.c
+index 8a2e1f9..cf2e3a0 100644
+--- a/zlib/uncompr.c
++++ b/zlib/uncompr.c
+@@ -30,7 +30,7 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+     z_stream stream;
+     int err;
+ 
+-    stream.next_in = (Bytef*)source;
++    stream.next_in = (z_const Bytef *)source;
+     stream.avail_in = (uInt)sourceLen;
+     /* Check for source > 64K on 16-bit machine: */
+     if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+diff --git a/zlib/win32/Makefile.msc b/zlib/win32/Makefile.msc
+index 59bb0da..67b7731 100644
+--- a/zlib/win32/Makefile.msc
++++ b/zlib/win32/Makefile.msc
+@@ -9,6 +9,10 @@
+ #   nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF -I." \
+ #         OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"  (use ASM code, x64)
+ 
++# The toplevel directory of the source tree.
++#
++TOP = .
++
+ # optional build flags
+ LOC =
+ 
+@@ -43,8 +47,8 @@ $(STATICLIB): $(OBJS) $(OBJA)
+ 
+ $(IMPLIB): $(SHAREDLIB)
+ 
+-$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res
+-	$(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \
++$(SHAREDLIB): $(TOP)/win32/zlib.def $(OBJS) $(OBJA) zlib1.res
++	$(LD) $(LDFLAGS) -def:$(TOP)/win32/zlib.def -dll -implib:$(IMPLIB) \
+ 	  -out:$@ -base:0x5A4C0000 $(OBJS) $(OBJA) zlib1.res
+ 	if exist $@.manifest \
+ 	  mt -nologo -manifest $@.manifest -outputresource:$@;2
+@@ -69,72 +73,71 @@ minigzip_d.exe: minigzip.obj $(IMPLIB)
+ 	if exist $@.manifest \
+ 	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+ 
+-.c.obj:
++{$(TOP)}.c.obj:
+ 	$(CC) -c $(WFLAGS) $(CFLAGS) $<
+ 
+-{test}.c.obj:
+-	$(CC) -c -I. $(WFLAGS) $(CFLAGS) $<
++{$(TOP)/test}.c.obj:
++	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $<
+ 
+-{contrib/masmx64}.c.obj:
++{$(TOP)/contrib/masmx64}.c.obj:
+ 	$(CC) -c $(WFLAGS) $(CFLAGS) $<
+ 
+-{contrib/masmx64}.asm.obj:
++{$(TOP)/contrib/masmx64}.asm.obj:
+ 	$(AS) -c $(ASFLAGS) $<
+ 
+-{contrib/masmx86}.asm.obj:
++{$(TOP)/contrib/masmx86}.asm.obj:
+ 	$(AS) -c $(ASFLAGS) $<
+ 
+-adler32.obj: adler32.c zlib.h zconf.h
+-
+-compress.obj: compress.c zlib.h zconf.h
++adler32.obj: $(TOP)/adler32.c $(TOP)/zlib.h $(TOP)/zconf.h
+ 
+-crc32.obj: crc32.c zlib.h zconf.h crc32.h
++compress.obj: $(TOP)/compress.c $(TOP)/zlib.h $(TOP)/zconf.h
+ 
+-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
++crc32.obj: $(TOP)/crc32.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/crc32.h
+ 
+-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
++deflate.obj: $(TOP)/deflate.c $(TOP)/deflate.h $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h
+ 
+-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
++gzclose.obj: $(TOP)/gzclose.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
+ 
+-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
++gzlib.obj: $(TOP)/gzlib.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
+ 
+-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
++gzread.obj: $(TOP)/gzread.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
+ 
+-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+-             inffast.h inffixed.h
++gzwrite.obj: $(TOP)/gzwrite.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
+ 
+-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+-             inffast.h
++infback.obj: $(TOP)/infback.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
++             $(TOP)/inffast.h $(TOP)/inffixed.h
+ 
+-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+-             inffast.h inffixed.h
++inffast.obj: $(TOP)/inffast.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
++             $(TOP)/inffast.h
+ 
+-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
++inflate.obj: $(TOP)/inflate.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
++             $(TOP)/inffast.h $(TOP)/inffixed.h
+ 
+-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
++inftrees.obj: $(TOP)/inftrees.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h
+ 
+-uncompr.obj: uncompr.c zlib.h zconf.h
++trees.obj: $(TOP)/trees.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/deflate.h $(TOP)/trees.h
+ 
+-zutil.obj: zutil.c zutil.h zlib.h zconf.h
++uncompr.obj: $(TOP)/uncompr.c $(TOP)/zlib.h $(TOP)/zconf.h
+ 
+-gvmat64.obj: contrib\masmx64\gvmat64.asm
++zutil.obj: $(TOP)/zutil.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h
+ 
+-inffasx64.obj: contrib\masmx64\inffasx64.asm
++gvmat64.obj: $(TOP)/contrib\masmx64\gvmat64.asm
+ 
+-inffas8664.obj: contrib\masmx64\inffas8664.c zutil.h zlib.h zconf.h \
+-		inftrees.h inflate.h inffast.h
++inffasx64.obj: $(TOP)/contrib\masmx64\inffasx64.asm
+ 
+-inffas32.obj: contrib\masmx86\inffas32.asm
++inffas8664.obj: $(TOP)/contrib\masmx64\inffas8664.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h \
++		$(TOP)/inftrees.h $(TOP)/inflate.h $(TOP)/inffast.h
+ 
+-match686.obj: contrib\masmx86\match686.asm
++inffas32.obj: $(TOP)/contrib\masmx86\inffas32.asm
+ 
+-example.obj: test/example.c zlib.h zconf.h
++match686.obj: $(TOP)/contrib\masmx86\match686.asm
+ 
+-minigzip.obj: test/minigzip.c zlib.h zconf.h
++example.obj: $(TOP)/test/example.c $(TOP)/zlib.h $(TOP)/zconf.h
+ 
+-zlib1.res: win32/zlib1.rc
+-	$(RC) $(RCFLAGS) /fo$@ win32/zlib1.rc
++minigzip.obj: $(TOP)/test/minigzip.c $(TOP)/zlib.h $(TOP)/zconf.h
+ 
++zlib1.res: $(TOP)/win32/zlib1.rc
++	$(RC) $(RCFLAGS) /fo$@ $(TOP)/win32/zlib1.rc
+ 
+ # testing
+ test: example.exe minigzip.exe
+diff --git a/zlib/win32/README-WIN32.txt b/zlib/win32/README-WIN32.txt
+index 46c5923..3d77d52 100644
+--- a/zlib/win32/README-WIN32.txt
++++ b/zlib/win32/README-WIN32.txt
+@@ -1,6 +1,6 @@
+ ZLIB DATA COMPRESSION LIBRARY
+ 
+-zlib 1.2.7 is a general purpose data compression library.  All the code is
++zlib 1.2.8 is a general purpose data compression library.  All the code is
+ thread safe.  The data format used by the zlib library is described by RFCs
+ (Request for Comments) 1950 to 1952 in the files
+ http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
+@@ -22,7 +22,7 @@ before asking for help.
+ 
+ Manifest:
+ 
+-The package zlib-1.2.7-win32-x86.zip will contain the following files:
++The package zlib-1.2.8-win32-x86.zip will contain the following files:
+ 
+   README-WIN32.txt This document
+   ChangeLog        Changes since previous zlib packages
+diff --git a/zlib/win32/zlib.def b/zlib/win32/zlib.def
+index 0489615..face655 100644
+--- a/zlib/win32/zlib.def
++++ b/zlib/win32/zlib.def
+@@ -17,6 +17,7 @@ EXPORTS
+     deflatePrime
+     deflateSetHeader
+     inflateSetDictionary
++    inflateGetDictionary
+     inflateSync
+     inflateCopy
+     inflateReset
+@@ -39,6 +40,7 @@ EXPORTS
+     gzread
+     gzwrite
+     gzprintf
++    gzvprintf
+     gzputs
+     gzgets
+     gzputc
+diff --git a/zlib/win32/zlib1.rc b/zlib/win32/zlib1.rc
+index 0d1d7ff..5c0feed 100644
+--- a/zlib/win32/zlib1.rc
++++ b/zlib/win32/zlib1.rc
+@@ -26,7 +26,7 @@ BEGIN
+       VALUE "FileDescription",	"zlib data compression library\0"
+       VALUE "FileVersion",	ZLIB_VERSION "\0"
+       VALUE "InternalName",	"zlib1.dll\0"
+-      VALUE "LegalCopyright",	"(C) 1995-2006 Jean-loup Gailly & Mark Adler\0"
++      VALUE "LegalCopyright",	"(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+       VALUE "OriginalFilename",	"zlib1.dll\0"
+       VALUE "ProductName",	"zlib\0"
+       VALUE "ProductVersion",	ZLIB_VERSION "\0"
+diff --git a/zlib/zconf.h b/zlib/zconf.h
+index 18dcee1..da7fd94 100644
+--- a/zlib/zconf.h
++++ b/zlib/zconf.h
+@@ -1,5 +1,5 @@
+ /* zconf.h -- configuration of the zlib compression library
+- * Copyright (C) 1995-2012 Jean-loup Gailly.
++ * Copyright (C) 1995-2013 Jean-loup Gailly.
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -21,6 +21,7 @@
+ #  define _dist_code            z__dist_code
+ #  define _length_code          z__length_code
+ #  define _tr_align             z__tr_align
++#  define _tr_flush_bits        z__tr_flush_bits
+ #  define _tr_flush_block       z__tr_flush_block
+ #  define _tr_init              z__tr_init
+ #  define _tr_stored_block      z__tr_stored_block
+@@ -77,6 +78,7 @@
+ #      define gzopen_w              z_gzopen_w
+ #    endif
+ #    define gzprintf              z_gzprintf
++#    define gzvprintf             z_gzvprintf
+ #    define gzputc                z_gzputc
+ #    define gzputs                z_gzputs
+ #    define gzread                z_gzread
+@@ -103,6 +105,7 @@
+ #  define inflateReset          z_inflateReset
+ #  define inflateReset2         z_inflateReset2
+ #  define inflateSetDictionary  z_inflateSetDictionary
++#  define inflateGetDictionary  z_inflateGetDictionary
+ #  define inflateSync           z_inflateSync
+ #  define inflateSyncPoint      z_inflateSyncPoint
+ #  define inflateUndermine      z_inflateUndermine
+@@ -388,20 +391,14 @@ typedef uLong FAR uLongf;
+    typedef Byte       *voidp;
+ #endif
+ 
+-/* ./configure may #define Z_U4 here */
+-
+ #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+ #  include <limits.h>
+ #  if (UINT_MAX == 0xffffffffUL)
+ #    define Z_U4 unsigned
+-#  else
+-#    if (ULONG_MAX == 0xffffffffUL)
+-#      define Z_U4 unsigned long
+-#    else
+-#      if (USHRT_MAX == 0xffffffffUL)
+-#        define Z_U4 unsigned short
+-#      endif
+-#    endif
++#  elif (ULONG_MAX == 0xffffffffUL)
++#    define Z_U4 unsigned long
++#  elif (USHRT_MAX == 0xffffffffUL)
++#    define Z_U4 unsigned short
+ #  endif
+ #endif
+ 
+@@ -425,8 +422,16 @@ typedef uLong FAR uLongf;
+ #  endif
+ #endif
+ 
++#if defined(STDC) || defined(Z_HAVE_STDARG_H)
++#  ifndef Z_SOLO
++#    include <stdarg.h>         /* for va_list */
++#  endif
++#endif
++
+ #ifdef _WIN32
+-#  include <stddef.h>           /* for wchar_t */
++#  ifndef Z_SOLO
++#    include <stddef.h>         /* for wchar_t */
++#  endif
+ #endif
+ 
+ /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+@@ -435,7 +440,7 @@ typedef uLong FAR uLongf;
+  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+  * equivalently requesting no 64-bit operations
+  */
+-#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
++#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+ #  undef _LARGEFILE64_SOURCE
+ #endif
+ 
+@@ -443,7 +448,7 @@ typedef uLong FAR uLongf;
+ #  define Z_HAVE_UNISTD_H
+ #endif
+ #ifndef Z_SOLO
+-#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
++#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+ #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+ #    ifdef VMS
+ #      include <unixio.h>       /* for off_t */
+diff --git a/zlib/zconf.h.cmakein b/zlib/zconf.h.cmakein
+index b6ca59a..043019c 100644
+--- a/zlib/zconf.h.cmakein
++++ b/zlib/zconf.h.cmakein
+@@ -1,5 +1,5 @@
+ /* zconf.h -- configuration of the zlib compression library
+- * Copyright (C) 1995-2012 Jean-loup Gailly.
++ * Copyright (C) 1995-2013 Jean-loup Gailly.
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -23,6 +23,7 @@
+ #  define _dist_code            z__dist_code
+ #  define _length_code          z__length_code
+ #  define _tr_align             z__tr_align
++#  define _tr_flush_bits        z__tr_flush_bits
+ #  define _tr_flush_block       z__tr_flush_block
+ #  define _tr_init              z__tr_init
+ #  define _tr_stored_block      z__tr_stored_block
+@@ -79,6 +80,7 @@
+ #      define gzopen_w              z_gzopen_w
+ #    endif
+ #    define gzprintf              z_gzprintf
++#    define gzvprintf             z_gzvprintf
+ #    define gzputc                z_gzputc
+ #    define gzputs                z_gzputs
+ #    define gzread                z_gzread
+@@ -105,6 +107,7 @@
+ #  define inflateReset          z_inflateReset
+ #  define inflateReset2         z_inflateReset2
+ #  define inflateSetDictionary  z_inflateSetDictionary
++#  define inflateGetDictionary  z_inflateGetDictionary
+ #  define inflateSync           z_inflateSync
+ #  define inflateSyncPoint      z_inflateSyncPoint
+ #  define inflateUndermine      z_inflateUndermine
+@@ -390,20 +393,14 @@ typedef uLong FAR uLongf;
+    typedef Byte       *voidp;
+ #endif
+ 
+-/* ./configure may #define Z_U4 here */
+-
+ #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+ #  include <limits.h>
+ #  if (UINT_MAX == 0xffffffffUL)
+ #    define Z_U4 unsigned
+-#  else
+-#    if (ULONG_MAX == 0xffffffffUL)
+-#      define Z_U4 unsigned long
+-#    else
+-#      if (USHRT_MAX == 0xffffffffUL)
+-#        define Z_U4 unsigned short
+-#      endif
+-#    endif
++#  elif (ULONG_MAX == 0xffffffffUL)
++#    define Z_U4 unsigned long
++#  elif (USHRT_MAX == 0xffffffffUL)
++#    define Z_U4 unsigned short
+ #  endif
+ #endif
+ 
+@@ -427,8 +424,16 @@ typedef uLong FAR uLongf;
+ #  endif
+ #endif
+ 
++#if defined(STDC) || defined(Z_HAVE_STDARG_H)
++#  ifndef Z_SOLO
++#    include <stdarg.h>         /* for va_list */
++#  endif
++#endif
++
+ #ifdef _WIN32
+-#  include <stddef.h>           /* for wchar_t */
++#  ifndef Z_SOLO
++#    include <stddef.h>         /* for wchar_t */
++#  endif
+ #endif
+ 
+ /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+@@ -437,7 +442,7 @@ typedef uLong FAR uLongf;
+  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+  * equivalently requesting no 64-bit operations
+  */
+-#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
++#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+ #  undef _LARGEFILE64_SOURCE
+ #endif
+ 
+@@ -445,7 +450,7 @@ typedef uLong FAR uLongf;
+ #  define Z_HAVE_UNISTD_H
+ #endif
+ #ifndef Z_SOLO
+-#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
++#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+ #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+ #    ifdef VMS
+ #      include <unixio.h>       /* for off_t */
+diff --git a/zlib/zconf.h.in b/zlib/zconf.h.in
+index 8a46a58..9987a77 100644
+--- a/zlib/zconf.h.in
++++ b/zlib/zconf.h.in
+@@ -1,5 +1,5 @@
+ /* zconf.h -- configuration of the zlib compression library
+- * Copyright (C) 1995-2012 Jean-loup Gailly.
++ * Copyright (C) 1995-2013 Jean-loup Gailly.
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -21,6 +21,7 @@
+ #  define _dist_code            z__dist_code
+ #  define _length_code          z__length_code
+ #  define _tr_align             z__tr_align
++#  define _tr_flush_bits        z__tr_flush_bits
+ #  define _tr_flush_block       z__tr_flush_block
+ #  define _tr_init              z__tr_init
+ #  define _tr_stored_block      z__tr_stored_block
+@@ -77,6 +78,7 @@
+ #      define gzopen_w              z_gzopen_w
+ #    endif
+ #    define gzprintf              z_gzprintf
++#    define gzvprintf             z_gzvprintf
+ #    define gzputc                z_gzputc
+ #    define gzputs                z_gzputs
+ #    define gzread                z_gzread
+@@ -103,6 +105,7 @@
+ #  define inflateReset          z_inflateReset
+ #  define inflateReset2         z_inflateReset2
+ #  define inflateSetDictionary  z_inflateSetDictionary
++#  define inflateGetDictionary  z_inflateGetDictionary
+ #  define inflateSync           z_inflateSync
+ #  define inflateSyncPoint      z_inflateSyncPoint
+ #  define inflateUndermine      z_inflateUndermine
+@@ -388,20 +391,14 @@ typedef uLong FAR uLongf;
+    typedef Byte       *voidp;
+ #endif
+ 
+-/* ./configure may #define Z_U4 here */
+-
+ #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+ #  include <limits.h>
+ #  if (UINT_MAX == 0xffffffffUL)
+ #    define Z_U4 unsigned
+-#  else
+-#    if (ULONG_MAX == 0xffffffffUL)
+-#      define Z_U4 unsigned long
+-#    else
+-#      if (USHRT_MAX == 0xffffffffUL)
+-#        define Z_U4 unsigned short
+-#      endif
+-#    endif
++#  elif (ULONG_MAX == 0xffffffffUL)
++#    define Z_U4 unsigned long
++#  elif (USHRT_MAX == 0xffffffffUL)
++#    define Z_U4 unsigned short
+ #  endif
+ #endif
+ 
+@@ -425,8 +422,16 @@ typedef uLong FAR uLongf;
+ #  endif
+ #endif
+ 
++#if defined(STDC) || defined(Z_HAVE_STDARG_H)
++#  ifndef Z_SOLO
++#    include <stdarg.h>         /* for va_list */
++#  endif
++#endif
++
+ #ifdef _WIN32
+-#  include <stddef.h>           /* for wchar_t */
++#  ifndef Z_SOLO
++#    include <stddef.h>         /* for wchar_t */
++#  endif
+ #endif
+ 
+ /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+@@ -435,7 +440,7 @@ typedef uLong FAR uLongf;
+  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+  * equivalently requesting no 64-bit operations
+  */
+-#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
++#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+ #  undef _LARGEFILE64_SOURCE
+ #endif
+ 
+@@ -443,7 +448,7 @@ typedef uLong FAR uLongf;
+ #  define Z_HAVE_UNISTD_H
+ #endif
+ #ifndef Z_SOLO
+-#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
++#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+ #    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+ #    ifdef VMS
+ #      include <unixio.h>       /* for off_t */
+diff --git a/zlib/zlib.3 b/zlib/zlib.3
+index 79d3402..0160e62 100644
+--- a/zlib/zlib.3
++++ b/zlib/zlib.3
+@@ -1,4 +1,4 @@
+-.TH ZLIB 3 "2 May 2012"
++.TH ZLIB 3 "28 Apr 2013"
+ .SH NAME
+ zlib \- compression/decompression library
+ .SH SYNOPSIS
+@@ -125,8 +125,8 @@ before asking for help.
+ Send questions and/or comments to zlib@gzip.org,
+ or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
+ .SH AUTHORS
+-Version 1.2.7
+-Copyright (C) 1995-2012 Jean-loup Gailly (jloup@gzip.org)
++Version 1.2.8
++Copyright (C) 1995-2013 Jean-loup Gailly (jloup@gzip.org)
+ and Mark Adler (madler@alumni.caltech.edu).
+ .LP
+ This software is provided "as-is,"
+diff --git a/zlib/zlib.h b/zlib/zlib.h
+index 3edf3ac..3e0c767 100644
+--- a/zlib/zlib.h
++++ b/zlib/zlib.h
+@@ -1,7 +1,7 @@
+ /* zlib.h -- interface of the 'zlib' general purpose compression library
+-  version 1.2.7, May 2nd, 2012
++  version 1.2.8, April 28th, 2013
+ 
+-  Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
++  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ 
+   This software is provided 'as-is', without any express or implied
+   warranty.  In no event will the authors be held liable for any damages
+@@ -37,11 +37,11 @@
+ extern "C" {
+ #endif
+ 
+-#define ZLIB_VERSION "1.2.7"
+-#define ZLIB_VERNUM 0x1270
++#define ZLIB_VERSION "1.2.8"
++#define ZLIB_VERNUM 0x1280
+ #define ZLIB_VER_MAJOR 1
+ #define ZLIB_VER_MINOR 2
+-#define ZLIB_VER_REVISION 7
++#define ZLIB_VER_REVISION 8
+ #define ZLIB_VER_SUBREVISION 0
+ 
+ /*
+@@ -839,6 +839,21 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+    inflate().
+ */
+ 
++ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
++                                             Bytef *dictionary,
++                                             uInt  *dictLength));
++/*
++     Returns the sliding dictionary being maintained by inflate.  dictLength is
++   set to the number of bytes in the dictionary, and that many bytes are copied
++   to dictionary.  dictionary must have enough space, where 32768 bytes is
++   always enough.  If inflateGetDictionary() is called with dictionary equal to
++   Z_NULL, then only the dictionary length is returned, and nothing is copied.
++   Similary, if dictLength is Z_NULL, then it is not set.
++
++     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
++   stream state is inconsistent.
++*/
++
+ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+ /*
+      Skips invalid compressed data until a possible full flush point (see above
+@@ -846,7 +861,7 @@ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+    available input is skipped.  No output is provided.
+ 
+      inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+-   All full flush points have this pattern, but not all occurences of this
++   All full flush points have this pattern, but not all occurrences of this
+    pattern are full flush points.
+ 
+      inflateSync returns Z_OK if a possible full flush point has been found,
+@@ -1007,7 +1022,8 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+    the version of the header file.
+ */
+ 
+-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
++typedef unsigned (*in_func) OF((void FAR *,
++                                z_const unsigned char FAR * FAR *));
+ typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+ 
+ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+@@ -1015,11 +1031,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                     out_func out, void FAR *out_desc));
+ /*
+      inflateBack() does a raw inflate with a single call using a call-back
+-   interface for input and output.  This is more efficient than inflate() for
+-   file i/o applications in that it avoids copying between the output and the
+-   sliding window by simply making the window itself the output buffer.  This
+-   function trusts the application to not change the output buffer passed by
+-   the output function, at least until inflateBack() returns.
++   interface for input and output.  This is potentially more efficient than
++   inflate() for file i/o applications, in that it avoids copying between the
++   output and the sliding window by simply making the window itself the output
++   buffer.  inflate() can be faster on modern CPUs when used with large
++   buffers.  inflateBack() trusts the application to not change the output
++   buffer passed by the output function, at least until inflateBack() returns.
+ 
+      inflateBackInit() must be called first to allocate the internal state
+    and to initialize the state with the user-provided window buffer.
+@@ -1736,6 +1753,13 @@ ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+ ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                             const char *mode));
+ #endif
++#if defined(STDC) || defined(Z_HAVE_STDARG_H)
++#  ifndef Z_SOLO
++ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
++                                                  const char *format,
++                                                  va_list va));
++#  endif
++#endif
+ 
+ #ifdef __cplusplus
+ }
+diff --git a/zlib/zlib.map b/zlib/zlib.map
+index 771f420..55c6647 100644
+--- a/zlib/zlib.map
++++ b/zlib/zlib.map
+@@ -76,3 +76,8 @@ ZLIB_1.2.5.2 {
+     gzgetc_;
+     inflateResetKeep;
+ } ZLIB_1.2.5.1;
++
++ZLIB_1.2.7.1 {
++    inflateGetDictionary;
++    gzvprintf;
++} ZLIB_1.2.5.2;
+diff --git a/zlib/zutil.c b/zlib/zutil.c
+index e1e463f..5c660c7 100644
+--- a/zlib/zutil.c
++++ b/zlib/zutil.c
+@@ -14,7 +14,7 @@
+ struct internal_state      {int dummy;}; /* for buggy compilers */
+ #endif
+ 
+-const char * const z_errmsg[10] = {
++z_const char * const z_errmsg[10] = {
+ "need dictionary",     /* Z_NEED_DICT       2  */
+ "stream end",          /* Z_STREAM_END      1  */
+ "",                    /* Z_OK              0  */
+diff --git a/zlib/zutil.h b/zlib/zutil.h
+index ed6b127..1b6fbb8 100644
+--- a/zlib/zutil.h
++++ b/zlib/zutil.h
+@@ -1,5 +1,5 @@
+ /* zutil.h -- internal interface and configuration of the compression library
+- * Copyright (C) 1995-2012 Jean-loup Gailly.
++ * Copyright (C) 1995-2013 Jean-loup Gailly.
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+@@ -44,13 +44,13 @@ typedef unsigned short ush;
+ typedef ush FAR ushf;
+ typedef unsigned long  ulg;
+ 
+-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
++extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ /* (size given to avoid silly warnings with Visual C++) */
+ 
+ #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+ 
+ #define ERR_RETURN(strm,err) \
+-  return (strm->msg = (char*)ERR_MSG(err), (err))
++  return (strm->msg = ERR_MSG(err), (err))
+ /* To be used only when the state is known to be valid */
+ 
+         /* common constants */
+@@ -168,7 +168,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ #endif
+ 
+ /* provide prototypes for these when building zlib without LFS */
+-#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
++#if !defined(_WIN32) && \
++    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+ #endif