zlib 1.2.3.5

zlib 1.2.3.4
zlib 1.2.3.3
2011-09-09 23:26:49 -07:00 · 2011-09-09 23:26:40 -07:00 · 2011-09-09 23:26:29 -07:00 · 2011-09-09 23:25:38 -07:00 · 2011-09-09 23:25:27 -07:00 · 2011-09-09 23:25:17 -07:00
193 changed files with 32008 additions and 5938 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,177 @@
 cmake_minimum_required(VERSION 2.4.4)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 project(zlib C)
 if(NOT DEFINED BUILD_SHARED_LIBS)
    option(BUILD_SHARED_LIBS "Build a shared library form of zlib" ON)
 endif()
 include(CheckTypeSize)
 include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(CheckCSourceCompiles)
 enable_testing()
 check_include_file(sys/types.h HAVE_SYS_TYPES_H)
 check_include_file(stdint.h    HAVE_STDINT_H)
 check_include_file(stddef.h    HAVE_STDDEF_H)
 #
 # Check to see if we have large file support
 #
 set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE)
 # We add these other definitions here because CheckTypeSize.cmake
 # in CMake 2.4.x does not automatically do so and we want
 # compatibility with CMake 2.4.x.
 if(HAVE_SYS_TYPES_H)
    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
 endif()
 if(HAVE_STDINT_H)
    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
 endif()
 if(HAVE_STDDEF_H)
    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
 endif()
 check_type_size(off64_t OFF64_T)
 if(HAVE_OFF64_T)
   add_definitions(-D_LARGEFILE64_SOURCE)
 endif()
 set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
 #
 # Check for fseeko
 #
 check_function_exists(fseeko HAVE_FSEEKO)
 if(NOT HAVE_FSEEKO)
    add_definitions(-DNO_FSEEKO)
 endif()
 #
 # Check for unistd.h
 #
 check_include_file(unistd.h HAVE_UNISTD_H)
 #
 # Check for errno.h
 check_include_file(errno.h HAVE_ERRNO_H)
 if(NOT HAVE_ERRNO_H)
   add_definitions(-DNO_ERRNO_H)
 endif()
 #
 # Check for mmap support
 #
 set(mmap_test_code "
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 caddr_t hello() {
  return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0);
 }
 int main() { return 0; }
 ")
 check_c_source_compiles("${mmap_test_code}" USE_MMAP)
 if(USE_MMAP)
    add_definitions(-DUSE_MMAP)
 endif()
 #
 # Create the zlibdefs.h file.
 # Note: we create it in CMAKE_CURRENT_SOURCE_DIR instead 
 #       of CMAKE_CURRENT_BINARY_DIR because an empty zlibdefs.h
 #       is shipped with zlib in the source tree.
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlibdefs.h.cmakein
               ${CMAKE_CURRENT_SOURCE_DIR}/zlibdefs.h)
 if(MSVC)
    set(CMAKE_DEBUG_POSTFIX "D")
    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
 endif()
 #============================================================================
 # zlib
 #============================================================================
 set(ZLIB_PUBLIC_HDRS
    zconf.h
    zlib.h
    zlibdefs.h
 )
 set(ZLIB_PRIVATE_HDRS
    crc32.h
    deflate.h
    gzguts.h
    inffast.h
    inffixed.h
    inflate.h
    inftrees.h
    trees.h
    zutil.h
 )
 set(ZLIB_SRCS
    adler32.c
    compress.c
    crc32.c
    deflate.c
    gzclose.c
    gzio.c
    gzlib.c
    gzread.c
    gzwrite.c
    inflate.c
    infback.c
    inftrees.c
    inffast.c
    trees.c
    uncompr.c
    zutil.c
 )
 add_library(zlib ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
 set_target_properties(zlib PROPERTIES VERSION 1.2.3.4)
 set_target_properties(zlib PROPERTIES SOVERSION 1)
 if(UNIX)
   # On unix like platforms the library is almost always called libz
   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
 endif()
 if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
    install(TARGETS zlib
        RUNTIME DESTINATION bin
        ARCHIVE DESTINATION lib
        LIBRARY DESTINATION lib )
 endif()
 if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION include)
 endif()
 if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
    install(FILES zlib.3 DESTINATION share/man/man3)
 endif()
 #============================================================================
 # Example binaries
 #============================================================================
 add_executable(example example.c)
 target_link_libraries(example zlib)
 add_test(example example)
 add_executable(minigzip minigzip.c)
 target_link_libraries(minigzip zlib)
 if(HAVE_OFF64_T)
    add_executable(example64 example.c)
    target_link_libraries(example64 zlib)
    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
    add_test(example64 example64)
    add_executable(minigzip64 minigzip.c)
    target_link_libraries(minigzip64 zlib)
    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
 endif()
--- a/310
+++ b/310
@@ -1,6 +1,312 @@
                ChangeLog file for zlib
 Changes in 1.2.3.5 (8 Jan 2010)
 - Add space after #if in zutil.h for some compilers
 - Fix relatively harmless bug in deflate_fast() [Exarevsky]
 - Fix same problem in deflate_slow()
 - Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]
 - Add deflate_rle() for faster Z_RLE strategy run-length encoding
 - Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
 - Change name of "write" variable in inffast.c to avoid library collisions
 - Fix premature EOF from gzread() in gzio.c [Brown]
 - Use zlib header window size if windowBits is 0 in inflateInit2()
 - Remove compressBound() call in deflate.c to avoid linking compress.o
 - Replace use of errno in gz* with functions, support WinCE [Alves]
 - Provide alternative to perror() in minigzip.c for WinCE [Alves]
 - Don't use _vsnprintf on later versions of MSVC [Lowman]
 - Add CMake build script and input file [Lowman]
 - Update contrib/minizip to 1.1 [Svensson, Vollant]
 - Moved nintendods directory from contrib to .
 - Replace gzio.c with a new set of routines with the same functionality
 - Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
 - Update contrib/minizip to 1.1b
 Changes in 1.2.3.4 (21 Dec 2009)
 - Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
 - Update comments in configure and Makefile.in for default --shared
 - Fix test -z's in configure [Marquess]
 - Build examplesh and minigzipsh when not testing
 - Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
 - Import LDFLAGS from the environment in configure
 - Fix configure to populate SFLAGS with discovered CFLAGS options
 - Adapt make_vms.com to the new Makefile.in [Zinser]
 - Add zlib2ansi script for C++ compilation [Marquess]
 - Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
 - Add AMD64 assembler code for longest match to contrib [Teterin]
 - Include options from $SFLAGS when doing $LDSHARED
 - Simplify 64-bit file support by introducing z_off64_t type
 - Make shared object files in objs directory to work around old Sun cc
 - Use only three-part version number for Darwin shared compiles
 - Add rc option to ar in Makefile.in for when ./configure not run
 - Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
 - Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
 - Protect against _FILE_OFFSET_BITS being defined when compiling zlib
 - Rename Makefile.in targets allstatic to static and allshared to shared
 - Fix static and shared Makefile.in targets to be independent
 - Correct error return bug in gz_open() by setting state [Brown]
 - Put spaces before ;;'s in configure for better sh compatibility
 - Add pigz.c (parallel implementation of gzip) to examples/
 - Correct constant in crc32.c to UL [Leventhal]
 - Reject negative lengths in crc32_combine()
 - Add inflateReset2() function to work like inflateEnd()/inflateInit2()
 - Include sys/types.h for _LARGEFILE64_SOURCE [Brown]
 - Correct typo in doc/algorithm.txt [Janik]
 - Fix bug in adler32_combine() [Zhu]
 - Catch missing-end-of-block-code error in all inflates and in puff
    Assures that random input to inflate eventually results in an error
 - Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
 - Update ENOUGH and its usage to reflect discovered bounds
 - Fix gzerror() error report on empty input file [Brown]
 - Add ush casts in trees.c to avoid pedantic runtime errors
 - Fix typo in zlib.h uncompress() description [Reiss]
 - Correct inflate() comments with regard to automatic header detection
 - Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
 - Put new version of gzlog (2.0) in examples with interruption recovery
 - Add puff compile option to permit invalid distance-too-far streams
 - Add puff TEST command options, ability to read piped input
 - Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
  _LARGEFILE64_SOURCE not defined
 - Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
 - Fix deflateSetDictionary() to use all 32K for output consistency
 - Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
 - Clear bytes after deflate lookahead to avoid use of uninitialized data
 - Change a limit in inftrees.c to be more transparent to Coverity Prevent
 - Update win32/zlib.def with exported symbols from zlib.h
 - Correct spelling error in zlib.h [Willem]
 - Allow Z_BLOCK for deflate() to force a new block
 - Allow negative bits in inflatePrime() to delete existing bit buffer
 - Add Z_TREES flush option to inflate() to return at end of trees
 - Add inflateMark() to return current state information for random access
 - Add Makefile for NintendoDS to contrib [Costa]
 - Add -w in configure compile tests to avoid spurious warnings [Beucler]
 - Fix typos in zlib.h comments for deflateSetDictionary()
 - Fix EOF detection in transparent gzread() [Maier]
 Changes in 1.2.3.3 (2 October 2006)
 - Make --shared the default for configure, add a --static option
 - Add compile option to permit invalid distance-too-far streams
 - Add inflateUndermine() function which is required to enable above
 - Remove use of "this" variable name for C++ compatibility [Marquess]
 - Add testing of shared library in make test, if shared library built
 - Use ftello() and fseeko() if available instead of ftell() and fseek()
 - Provide two versions of all functions that use the z_off_t type for
  binary compatibility -- a normal version and a 64-bit offset version,
  per the Large File Support Extension when _LARGEFILE64_SOURCE is
  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
  is defined to be 64
 - Add a --uname= option to configure to perhaps help with cross-compiling
 Changes in 1.2.3.2 (3 September 2006)
 - Turn off silly Borland warnings [Hay]
 - Use off64_t and define _LARGEFILE64_SOURCE when present
 - Fix missing dependency on inffixed.h in Makefile.in
 - Rig configure --shared to build both shared and static [Teredesai, Truta]
 - Remove zconf.in.h and instead create a new zlibdefs.h file
 - Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
 - Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]
 Changes in 1.2.3.1 (16 August 2006)
 - Add watcom directory with OpenWatcom make files [Daniel]
 - Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
 - Update make_vms.com [Zinser]
 - Use -fPIC for shared build in configure [Teredesai, Nicholson]
 - Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
 - Use fdopen() (not _fdopen()) for Interix in zutil.h [B<>ck]
 - Add some FAQ entries about the contrib directory
 - Update the MVS question in the FAQ
 - Avoid extraneous reads after EOF in gzio.c [Brown]
 - Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
 - Add comments to zlib.h about gzerror() usage [Brown]
 - Set extra flags in gzip header in gzopen() like deflate() does
 - Make configure options more compatible with double-dash conventions
  [Weigelt]
 - Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]
 - Fix uninstall target in Makefile.in [Truta]
 - Add pkgconfig support [Weigelt]
 - Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]
 - Replace set_data_type() with a more accurate detect_data_type() in
  trees.c, according to the txtvsbin.txt document [Truta]
 - Swap the order of #include <stdio.h> and #include "zlib.h" in
  gzio.c, example.c and minigzip.c [Truta]
 - Shut up annoying VS2005 warnings about standard C deprecation [Rowe,
  Truta] (where?)
 - Fix target "clean" from win32/Makefile.bor [Truta]
 - Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]
 - Update zlib www home address in win32/DLL_FAQ.txt [Truta]
 - Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]
 - Enable browse info in the "Debug" and "ASM Debug" configurations in
  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]
 - Add pkgconfig support [Weigelt]
 - Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
  for use in win32/zlib1.rc [Polushin, Rowe, Truta]
 - Add a document that explains the new text detection scheme to
  doc/txtvsbin.txt [Truta]
 - Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]
 - Move algorithm.txt into doc/ [Truta]
 - Synchronize FAQ with website
 - Fix compressBound(), was low for some pathological cases [Fearnley]
 - Take into account wrapper variations in deflateBound()
 - Set examples/zpipe.c input and output to binary mode for Windows 
 - Update examples/zlib_how.html with new zpipe.c (also web site)
 - Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
  that gcc became pickier in 4.0)
 - Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
  un-versioned, the patch adds versioning only for symbols introduced in
  zlib-1.2.0 or later.  It also declares as local those symbols which are
  not designed to be exported." [Levin]
 - Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
 - Do not initialize global static by default in trees.c, add a response
  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]
 - Don't use strerror() in gzio.c under WinCE [Yakimov]
 - Don't use errno.h in zutil.h under WinCE [Yakimov]
 - Move arguments for AR to its usage to allow replacing ar [Marot]
 - Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]
 - Improve inflateInit() and inflateInit2() documentation
 - Fix structure size comment in inflate.h
 - Change configure help option from --h* to --help [Santos]
 Changes in 1.2.3 (18 July 2005)
 - Apply security vulnerability fixes to contrib/infback9 as well
 - Clean up some text files (carriage returns, trailing space)
 - Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
 Changes in 1.2.2.4 (11 July 2005)
 - Add inflatePrime() function for starting inflation at bit boundary
 - Avoid some Visual C warnings in deflate.c
 - Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
  compile
 - Fix some spelling errors in comments [Betts]
 - Correct inflateInit2() error return documentation in zlib.h
 - Added zran.c example of compressed data random access to examples
  directory, shows use of inflatePrime()
 - Fix cast for assignments to strm->state in inflate.c and infback.c
 - Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
 - Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
 - Add cast in trees.c t avoid a warning [Oberhumer]
 - Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
 - Update make_vms.com [Zinser]
 - Initialize state->write in inflateReset() since copied in inflate_fast()
 - Be more strict on incomplete code sets in inflate_table() and increase
  ENOUGH and MAXD -- this repairs a possible security vulnerability for
  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
  discovering the vulnerability and providing test cases.
 - Add ia64 support to configure for HP-UX [Smith]
 - Add error return to gzread() for format or i/o error [Levin]
 - Use malloc.h for OS/2 [Necasek]
 Changes in 1.2.2.3 (27 May 2005)
 - Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
 - Typecast fread() return values in gzio.c [Vollant]
 - Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
 - Fix crc check bug in gzread() after gzungetc() [Heiner]
 - Add the deflateTune() function to adjust internal compression parameters
 - Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
 - Remove an incorrect assertion in examples/zpipe.c
 - Add C++ wrapper in infback9.h [Donais]
 - Fix bug in inflateCopy() when decoding fixed codes
 - Note in zlib.h how much deflateSetDictionary() actually uses
 - Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
 - Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
 - Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
 - Add gzdirect() function to indicate transparent reads
 - Update contrib/minizip [Vollant]
 - Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
 - Add casts in crc32.c to avoid warnings [Oberhumer]
 - Add contrib/masmx64 [Vollant]
 - Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
 Changes in 1.2.2.2 (30 December 2004)
 - Replace structure assignments in deflate.c and inflate.c with zmemcpy to
  avoid implicit memcpy calls (portability for no-library compilation)
 - Increase sprintf() buffer size in gzdopen() to allow for large numbers
 - Add INFLATE_STRICT to check distances against zlib header
 - Improve WinCE errno handling and comments [Chang]
 - Remove comment about no gzip header processing in FAQ
 - Add Z_FIXED strategy option to deflateInit2() to force fixed trees
 - Add updated make_vms.com [Coghlan], update README
 - Create a new "examples" directory, move gzappend.c there, add zpipe.c,
  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
 - Add FAQ entry and comments in deflate.c on uninitialized memory access
 - Add Solaris 9 make options in configure [Gilbert]
 - Allow strerror() usage in gzio.c for STDC
 - Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
 - Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
 - Use z_off_t for adler32_combine() and crc32_combine() lengths
 - Make adler32() much faster for small len
 - Use OS_CODE in deflate() default gzip header
 Changes in 1.2.2.1 (31 October 2004)
 - Allow inflateSetDictionary() call for raw inflate
 - Fix inflate header crc check bug for file names and comments
 - Add deflateSetHeader() and gz_header structure for custom gzip headers
 - Add inflateGetheader() to retrieve gzip headers
 - Add crc32_combine() and adler32_combine() functions
 - Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
 - Use zstreamp consistently in zlib.h (inflate_back functions)
 - Remove GUNZIP condition from definition of inflate_mode in inflate.h
  and in contrib/inflate86/inffast.S [Truta, Anderson]
 - Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
 - Update projects/README.projects and projects/visualc6 [Truta]
 - Update win32/DLL_FAQ.txt [Truta]
 - Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
 - Deprecate Z_ASCII; use Z_TEXT instead [Truta]
 - Use a new algorithm for setting strm->data_type in trees.c [Truta]
 - Do not define an exit() prototype in zutil.c unless DEBUG defined
 - Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
 - Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
 - Fix Darwin build version identification [Peterson]
 Changes in 1.2.2 (3 October 2004)
 - Update zlib.h comments on gzip in-memory processing
 - Set adler to 1 in inflateReset() to support Java test suite [Walles]
 - Add contrib/dotzlib [Ravn]
 - Update win32/DLL_FAQ.txt [Truta]
 - Update contrib/minizip [Vollant]
 - Move contrib/visual-basic.txt to old/ [Truta]
 - Fix assembler builds in projects/visualc6/ [Truta]
 Changes in 1.2.1.2 (9 September 2004)
 - Update INDEX file
 - Fix trees.c to update strm->data_type (no one ever noticed!)
 - Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
 - Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
 - Add limited multitasking protection to DYNAMIC_CRC_TABLE
 - Add NO_vsnprintf for VMS in zutil.h [Mozilla]
 - Don't declare strerror() under VMS [Mozilla]
 - Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
 - Update contrib/ada [Anisimkov]
 - Update contrib/minizip [Vollant]
 - Fix configure to not hardcode directories for Darwin [Peterson]
 - Fix gzio.c to not return error on empty files [Brown]
 - Fix indentation; update version in contrib/delphi/ZLib.pas and
  contrib/pascal/zlibpas.pas [Truta]
 - Update mkasm.bat in contrib/masmx86 [Truta]
 - Update contrib/untgz [Truta]
 - Add projects/README.projects [Truta]
 - Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
 - Update win32/DLL_FAQ.txt [Truta]
 - Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
 - Remove an unnecessary assignment to curr in inftrees.c [Truta]
 - Add OS/2 to exe builds in configure [Poltorak]
 - Remove err dummy parameter in zlib.h [Kientzle]
 Changes in 1.2.1.1 (9 January 2004)
 - Update email address in README
 - Several FAQ updates
 - Fix a big fat bug in inftrees.c that prevented decoding valid
  dynamic blocks with only literals and no distance codes --
  Thanks to "Hot Emu" for the bug report and sample file
 - Add a note to puff.c on no distance codes case.
 Changes in 1.2.1 (17 November 2003)
 - Remove a tab in contrib/gzappend/gzappend.c
 - Update some interfaces in contrib for new zlib functions
 - Update zlib version number in some contrib entries
 - Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
 - Support shared libraries on Hurd and KFreeBSD [Brown]
 - Fix error in NO_DIVIDE option of adler32.c
 Changes in 1.2.0.8 (4 November 2003)
 - Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
 - Add experimental NO_DIVIDE #define in adler32.c
@@ -18,7 +324,7 @@ Changes in 1.2.0.8 (4 November 2003)
 - Add -p to mkdir's in Makefile.in [vda]
 - Fix configure to properly detect presence or lack of printf functions
 - Add AS400 support [Monnerat]
- Added a little Cygwin support [Wilson]
+- Add a little Cygwin support [Wilson]
 Changes in 1.2.0.7 (21 September 2003)
 - Correct some debug formats in contrib/infback9
@@ -399,7 +705,7 @@ Changes in 1.0.7 (20 Jan 1998)
 Changes in 1.0.6 (19 Jan 1998)
 - add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
- Fix a deflate bug occuring only with compression level 0 (thanks to
+- Fix a deflate bug occurring only with compression level 0 (thanks to
  Andy Buckler for finding this one).
 - In minigzip, pass transparently also the first byte for .Z files.
 - return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
--- a/136
+++ b/136
@@ -21,18 +21,18 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
 3. Where can I get a Visual Basic interface to zlib?
    See
        * http://www.winimage.com/zLibDll/
        * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm
        * contrib/visual-basic.txt in the zlib distribution
        * win32/DLL_FAQ.txt in the zlib distribution
- 4. compress() returns Z_BUF_ERROR
+ 4. compress() returns Z_BUF_ERROR.
    Make sure that before the call of compress, the length of the compressed
    buffer is equal to the total size of the compressed buffer and not
    zero. For Visual Basic, check that this parameter is passed by reference
    ("as any"), not by value ("as long").
- 5. deflate() or inflate() returns Z_BUF_ERROR
+ 5. deflate() or inflate() returns Z_BUF_ERROR.
    Before making the call, make sure that avail_in and avail_out are not
    zero. When setting the parameter flush equal to Z_FINISH, also make sure
@@ -47,8 +47,8 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
    It's in zlib.h for the moment, and Francis S. Lin has converted it to a
    web page zlib.html. Volunteers to transform this to Unix-style man pages,
-    please contact Jean-loup Gailly (jloup@gzip.org). Examples of zlib usage
+    please contact us (zlib@gzip.org). Examples of zlib usage are in the files
-    are in the files example.c and minigzip.c.
+    example.c and minigzip.c.
 7. Why don't you use GNU autoconf or libtool or ...?
@@ -77,7 +77,8 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
 11. Can zlib handle .zip archives?
-    See the directory contrib/minizip in the zlib distribution.
+    Not by itself, no. See the directory contrib/minizip in the zlib
    distribution.
 12. Can zlib handle .Z files?
@@ -92,6 +93,8 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
 14. How do I install a shared zlib library on Unix?
    After the above, then:
    make install
    However, many flavors of Unix come with a shared zlib already installed.
@@ -99,12 +102,31 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
    trying to install it, you may want to check if it's already there! If you
    can #include <zlib.h>, it's there. The -lz option will probably link to it.
-15. I have a question about OttoPDF
+15. I have a question about OttoPDF.
    We are not the authors of OttoPDF. The real author is on the OttoPDF web
-    site Joel Hainley jhainley@myndkryme.com.
+    site: Joel Hainley, jhainley@myndkryme.com.
-16. Why does gzip give an error on a file I make with compress/deflate?
+16. Can zlib decode Flate data in an Adobe PDF file?
    Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ .
    To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ .
 17. Why am I getting this "register_frame_info not found" error on Solaris?
    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
    generates an error such as:
        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
        symbol __register_frame_info: referenced symbol not found
    The symbol __register_frame_info is not part of zlib, it is generated by
    the C compiler (cc or gcc). You must recompile applications using zlib
    which have this problem. This problem is specific to Solaris. See
    http://www.sunfreeware.com for Solaris versions of zlib and applications
    using zlib.
 18. Why does gzip give an error on a file I make with compress/deflate?
    The compress and deflate functions produce data in the zlib format, which
    is different and incompatible with the gzip format. The gz* functions in
@@ -112,7 +134,7 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
    formats use the same compressed data format internally, but have different
    headers and trailers around the compressed data.
-17. Ok, so why are there two different formats?
+19. Ok, so why are there two different formats?
    The gzip format was designed to retain the directory information about
    a single file, such as the name and last modification date. The zlib
@@ -120,20 +142,13 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
    channel applications, and has a much more compact header and trailer and
    uses a faster integrity check than gzip.
-18. Well that's nice, but how do I make a gzip file in memory?
+20. Well that's nice, but how do I make a gzip file in memory?
    You can request that deflate write the gzip format instead of the zlib
    format using deflateInit2(). You can also request that inflate decode
    the gzip format using inflateInit2(). Read zlib.h for more details.
-    Note that you cannot specify special gzip header contents (e.g. a file
+21. Is zlib thread-safe?
    name or modification date), nor will inflate tell you what was in the
    gzip header. If you need to customize the header or see what's in it,
    you can use the raw deflate and inflate operations and the crc32()
    function and roll your own gzip encoding and decoding. Read the gzip
    RFC 1952 for details of the header and trailer format.
 19. Is zlib thread-safe?
    Yes. However any library routines that zlib uses and any application-
    provided memory allocation routines must also be thread-safe. zlib's gz*
@@ -144,15 +159,15 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
    Of course, you should only operate on any given zlib or gzip stream from a
    single thread at a time.
-20. Can I use zlib in my commercial application?
+22. Can I use zlib in my commercial application?
    Yes. Please read the license in zlib.h.
-21. Is zlib under the GNU license?
+23. Is zlib under the GNU license?
    No. Please read the license in zlib.h.
-22. The license says that altered source versions must be "plainly marked". So
+24. The license says that altered source versions must be "plainly marked". So
    what exactly do I need to do to meet that requirement?
    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In
@@ -175,24 +190,24 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
    in zlib.h as you would for a full source distribution.
-23. Will zlib work on a big-endian or little-endian architecture, and can I
+25. Will zlib work on a big-endian or little-endian architecture, and can I
    exchange compressed data between them?
    Yes and yes.
-24. Will zlib work on a 64-bit machine?
+26. Will zlib work on a 64-bit machine?
    It should. It has been tested on 64-bit machines, and has no dependence
    on any data types being limited to 32-bits in length. If you have any
    difficulties, please provide a complete problem report to zlib@gzip.org
-25. Will zlib decompress data from the PKWare Data Compression Library?
+27. Will zlib decompress data from the PKWare Data Compression Library?
    No. The PKWare DCL uses a completely different compressed data format
    than does PKZIP and zlib. However, you can look in zlib's contrib/blast
    directory for a possible solution to your problem.
-26. Can I access data randomly in a compressed stream?
+28. Can I access data randomly in a compressed stream?
    No, not without some preparation. If when compressing you periodically
    use Z_FULL_FLUSH, carefully write all the pending data at those points,
@@ -200,27 +215,31 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
    at those points. You have to be careful to not use Z_FULL_FLUSH too
    often, since it can significantly degrade compression.
-27. Does zlib work on MVS, OS/390, CICS, etc.?
+29. Does zlib work on MVS, OS/390, CICS, etc.?
-    We don't know for sure. We have heard occasional reports of success on
+    Yes, there are working ports of zlib 1.1.4 to MVS which you can find
-    these systems. If you do use it on one of these, please provide us with
+    here:
    a report, instructions, and patches that we can reference when we get
    these questions. Thanks.
-28. Is there some simpler, easier to read version of inflate I can look at
+    http://www.homerow.net/asm/zlib390.htm
    http://www.homerow.net/asm/zlibLE.htm
    If these are updated to more recent versions of zlib, please let us
    know. Thanks.
 30. Is there some simpler, easier to read version of inflate I can look at
    to understand the deflate format?
    First off, you should read RFC 1951. Second, yes. Look in zlib's
    contrib/puff directory.
-29. Does zlib infringe on any patents?
+31. Does zlib infringe on any patents?
    As far as we know, no. In fact, that was originally the whole point behind
    zlib. Look here for some more information:
    http://www.gzip.org/#faq11
-30. Can zlib work with greater than 4 GB of data?
+32. Can zlib work with greater than 4 GB of data?
    Yes. inflate() and deflate() will process any amount of data correctly.
    Each call of inflate() or deflate() is limited to input and output chunks
@@ -238,7 +257,7 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
    only if the compiler's "long" type is 32 bits. If the compiler's "long"
    type is 64 bits, then the limit is 16 exabytes.
-31. Does zlib have any security vulnerabilities?
+33. Does zlib have any security vulnerabilities?
    The only one that we are aware of is potentially in gzprintf(). If zlib
    is compiled to use sprintf() or vsprintf(), then there is no protection
@@ -256,37 +275,48 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
        http://www.ijs.si/software/snprintf/
    Note that you should be using the most recent version of zlib. Versions
-    1.1.3 and before were subject to a double-free vulnerability.
+    1.1.3 and before were subject to a double-free vulnerability, and version
    1.2.1 was subject to an access exception when decompressing invalid
    compressed data.
-32. Is there a Java version of zlib?
+34. Is there a Java version of zlib?
    Probably what you want is to use zlib in Java. zlib is already included
    as part of the Java SDK in the java.util.zip package. If you really want
    a version of zlib written in the Java language, look on the zlib home
    page for links: http://www.zlib.org/
-33. I get this or that compiler or source-code scanner warning when I crank it
+35. I get this or that compiler or source-code scanner warning when I crank it
-    up to maximally-pendantic. Can't you guys write proper code?
+    up to maximally-pedantic. Can't you guys write proper code?
    Many years ago, we gave up attempting to avoid warnings on every compiler
    in the universe. It just got to be a waste of time, and some compilers
    were downright silly. So now, we simply make sure that the code always
    works.
-34. Will zlib read the (insert any ancient or arcane format here) compressed
+36. Valgrind (or some similar memory access checker) says that deflate is
    performing a conditional jump that depends on an uninitialized value.
    Isn't that a bug?
    No. That is intentional for performance reasons, and the output of
    deflate is not affected. This only started showing up recently since
    zlib 1.2.x uses malloc() by default for allocations, whereas earlier
    versions used calloc(), which zeros out the allocated memory.
 37. Will zlib read the (insert any ancient or arcane format here) compressed
    data format?
    Probably not. Look in the comp.compression FAQ for pointers to various
    formats and associated software.
-35. How can I encrypt/decrypt zip files with zlib?
+38. How can I encrypt/decrypt zip files with zlib?
    zlib doesn't support encryption. The original PKZIP encryption is very weak
    and can be broken with freely available programs. To get strong encryption,
-    use gpg ( http://www.gnupg.org/ ) which already includes zlib compression.
+    use GnuPG, http://www.gnupg.org/ , which already includes zlib compression.
    For PKZIP compatible "encryption", look at http://www.info-zip.org/
-36. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
+39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
    "gzip" is the gzip format, and "deflate" is the zlib format. They should
    probably have called the second one "zlib" instead to avoid confusion
@@ -302,14 +332,30 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html
    Bottom line: use the gzip format for HTTP 1.1 encoding.
-37. Does zlib support the new "Deflate64" format introduced by PKWare?
+40. Does zlib support the new "Deflate64" format introduced by PKWare?
    No. PKWare has apparently decided to keep that format proprietary, since
    they have not documented it as they have previous compression formats.
    In any case, the compression improvements are so modest compared to other
    more modern approaches, that it's not worth the effort to implement.
-38. Can you please sign these lengthy legal documents and fax them back to us
+41. I'm having a problem with the zip functions in zlib, can you help?
    There are no zip functions in zlib. You are probably using minizip by
    Giles Vollant, which is found in the contrib directory of zlib. It is not
    part of zlib. In fact none of the stuff in contrib is part of zlib. The
    files in there are not supported by the zlib authors. You need to contact
    the authors of the contribution for help.
 42. The match.asm code in contrib is under the GNU General Public License.
    Since it's part of zlib, doesn't that mean that all of zlib falls under the
    GNU GPL?
    No. The files in contrib are not part of zlib. They were contributed by
    other authors and are provided as a convenience to the user within the zlib
    distribution. Each of the items in contrib have their own license.
 43. Can you please sign these lengthy legal documents and fax them back to us
    so that we can use your software in our product?
    No. Go away. Shoo.
--- a/25
+++ b/25
@@ -1,22 +1,35 @@
 CMakeLists.txt  cmake build file
 ChangeLog       history of changes
 FAQ             Frequently Asked Questions about zlib
 INDEX           this file
 Makefile        makefile for Unix (generated by configure)
 Makefile.in     makefile for Unix (template for configure)
 README          guess what
 algorithm.txt   description of the (de)compression algorithm
 configure       configure script for Unix
-zconf.in.h      template for zconf.h (used by configure)
+make_vms.com	makefile for VMS
 treebuild.xml	XML description of source file dependencies
 zlib.3		Man page for zlib
 zlib.map	Linux symbol information
 zlib.pc.in	Template for pkg-config descriptor
 zlib2ansi	perl script to convert source files for C++ compilation
 amiga/          makefiles for Amiga SAS C
 as400/          makefiles for IBM AS/400
 doc/		documentation for formats and algorithms
 msdos/          makefiles for MSDOS
 nintendods/	makefile for Nintendo DS
 old/            makefiles for various architectures and zlib documentation
                files that have not yet been updated for zlib 1.2.x
 projects/       projects for various Integrated Development Environments
 qnx/            makefiles for QNX
 watcom/		makefiles for OpenWatcom
 win32/          makefiles for Windows
 zlibdefs.h.cmakein      input file for cmake build
-                zlib public header files (must be kept):
+                zlib public header files (required for library use):
 zconf.h
 zlib.h
 zlibdefs.h
                private source files used to build the zlib library:
 adler32.c
@@ -25,7 +38,12 @@ crc32.c
 crc32.h
 deflate.c
 deflate.h
 gzclose.c
 gzguts.h
 gzio.c
 gzlib.c
 gzread.c
 gzwrite.c
 infback.c
 inffast.c
 inffast.h
@@ -43,6 +61,7 @@ zutil.h
                source files for sample programs:
 example.c
 minigzip.c
 See examples/README.examples for more
                unsupported contribution by third parties
 See contrib/README.contrib
--- a/193
+++ b/193
@@ -1,11 +1,11 @@
 # Makefile for zlib
-# Copyright (C) 1995-2003 Jean-loup Gailly.
+# Copyright (C) 1995-2006 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h
 # To compile and test, type:
 #    ./configure; make test
-# The call of configure is optional if you don't have special requirements
+# Normally configure builds both a static and a shared library.
-# If you wish to build zlib as a shared library, use: ./configure -s
+# If you want to build just a static library, use: ./configure --static
 # To use the asm code, type:
 #    cp contrib/asm?86/match.S ./match.S
@@ -24,14 +24,17 @@ CFLAGS=-O
 #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
 #           -Wstrict-prototypes -Wmissing-prototypes
-LDFLAGS=libz.a
+SFLAGS=-O
 LDFLAGS=-L. libz.a
 LDSHARED=$(CC)
 CPP=$(CC) -E
-LIBS=libz.a
+STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.0.8
+SHAREDLIBV=libz.so.1.2.3.5
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIB) $(SHAREDLIBV)
 AR=ar rc
 RANLIB=ranlib
@@ -45,21 +48,36 @@ libdir = ${exec_prefix}/lib
 includedir = ${prefix}/include
 mandir = ${prefix}/share/man
 man3dir = ${mandir}/man3
 pkgconfigdir = ${libdir}/pkgconfig
-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzio.o gzlib.o gzread.o \
-       zutil.o inflate.o infback.o inftrees.o inffast.o
+	gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
 PIC_OBJC = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzio.lo gzlib.lo gzread.lo \
 	gzwrite.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo uncompr.lo zutil.lo
 # to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
 OBJA =
-# to use the asm code: make OBJA=match.o
+PIC_OBJA =
-TEST_OBJS = example.o minigzip.o
+OBJS = $(OBJC) $(OBJA)
-all: example$(EXE) minigzip$(EXE)
+PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
 all: static shared
 static: example$(EXE) minigzip$(EXE)
 shared: examplesh$(EXE) minigzipsh$(EXE)
 all64: example64$(EXE) minigzip64$(EXE)
 check: test
-test: all
+
-	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+test: all teststatic testshared
-	echo hello world | ./minigzip | ./minigzip -d || \
+
 teststatic: static
 	@echo hello world | ./minigzip | ./minigzip -d || \
 	  echo '		*** minigzip test FAILED ***' ; \
 	if ./example; then \
 	  echo '		*** zlib test OK ***'; \
@@ -67,8 +85,30 @@ test: all
 	  echo '		*** zlib test FAILED ***'; \
 	fi
-libz.a: $(OBJS) $(OBJA)
+testshared: shared
-	$(AR) $@ $(OBJS) $(OBJA)
+	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
 	LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
 	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
 	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
 	echo hello world | ./minigzipsh | ./minigzipsh -d || \
 	  echo '		*** minigzip shared test FAILED ***' ; \
 	if ./examplesh; then \
 	  echo '		*** zlib shared test OK ***'; \
 	else \
 	  echo '		*** zlib shared test FAILED ***'; \
 	fi
 test64: all64
 	@echo hello world | ./minigzip64 | ./minigzip64 -d || \
 	  echo '		*** minigzip 64-bit test FAILED ***' ; \
 	if ./example64; then \
 	  echo '		*** zlib 64-bit test OK ***'; \
 	else \
 	  echo '		*** zlib 64-bit test FAILED ***'; \
 	fi
 libz.a: $(OBJS)
 	$(AR) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 match.o: match.S
@@ -77,58 +117,100 @@ match.o: match.S
 	mv _match.o match.o
 	rm -f _match.s
-$(SHAREDLIBV): $(OBJS)
+match.lo: match.S
-	$(LDSHARED) -o $@ $(OBJS)
+	$(CPP) match.S > _match.s
 	$(CC) -c -fPIC _match.s
 	mv _match.o match.lo
 	rm -f _match.s
 example64.o: example.c zlib.h zconf.h zlibdefs.h
 	$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ $<
 minigzip64.o: minigzip.c zlib.h zconf.h zlibdefs.h
 	$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ $<
 .SUFFIXES: .lo
 .c.lo:
 	-@if [ ! -d objs ]; then mkdir objs; fi
 	$(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
 	-@mv objs/$*.o $@
 $(SHAREDLIBV): $(PIC_OBJS)
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc
 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
 	ln -s $@ $(SHAREDLIB)
 	ln -s $@ $(SHAREDLIBM)
 	-@rmdir objs
-example$(EXE): example.o $(LIBS)
+example$(EXE): example.o $(STATICLIB)
 	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
-minigzip$(EXE): minigzip.o $(LIBS)
+minigzip$(EXE): minigzip.o $(STATICLIB)
 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
-install: $(LIBS)
+examplesh$(EXE): example.o $(SHAREDLIBV)
-	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
+	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
-	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
+
-	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
+minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
-	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
+	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
-	cp zlib.h zconf.h $(includedir)
+
-	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
+example64$(EXE): example64.o $(STATICLIB)
-	cp $(LIBS) $(libdir)
+	$(CC) $(CFLAGS) -o $@ example64.o $(LDFLAGS)
-	cd $(libdir); chmod 755 $(LIBS)
+
-	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+minigzip64$(EXE): minigzip64.o $(STATICLIB)
-	cd $(libdir); if test -f $(SHAREDLIBV); then \
+	$(CC) $(CFLAGS) -o $@ minigzip64.o $(LDFLAGS)
 install-libs: $(LIBS)
 	-@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
 	-@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
 	cp $(LIBS) $(DESTDIR)$(libdir)
 	cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
 	cd $(DESTDIR)$(libdir); if test -f $(SHAREDLIBV); then \
 	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
 	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
 	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
 	  (ldconfig || true)  >/dev/null 2>&1; \
 	fi
-	cp zlib.3 $(man3dir)
+	cp zlib.3 $(DESTDIR)$(man3dir)
-	chmod 644 $(man3dir)/zlib.3
+	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
 	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
 	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
 # The ranlib in install is needed on NeXTSTEP which checks file times
 # ldconfig is for Linux
 install: install-libs
 	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
 	cp zlib.h zconf.h zlibdefs.h $(DESTDIR)$(includedir)
 	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h $(DESTDIR)$(includedir)/zlibdefs.h
 uninstall:
-	cd $(includedir); \
+	cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h zlibdefs.h
-	cd $(libdir); rm -f libz.a; \
+	cd $(DESTDIR)$(libdir); rm -f libz.a; \
 	if test -f $(SHAREDLIBV); then \
 	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
 	fi
-	cd $(man3dir); rm -f zlib.3
+	cd $(DESTDIR)$(man3dir); rm -f zlib.3
 	cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc
 mostlyclean: clean
 clean:
-	rm -f *.o *~ example$(EXE) minigzip$(EXE) \
+	rm -f *.o *.lo *~ \
 	   example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
 	   example64$(EXE) minigzip64$(EXE) \
 	   libz.* foo.gz so_locations \
 	   _match.s maketree contrib/infback9/*.o
 	rm -rf objs
 maintainer-clean: distclean
 distclean: clean
 	cp -p Makefile.in Makefile
-	cp -p zconf.in.h zconf.h
+	rm zlibdefs.h
-	rm -f .DS_Store
+	touch -r configure zlibdefs.h
 	rm -f zlib.pc .DS_Store
 tags:
 	etags *.[ch]
@@ -138,17 +220,22 @@ depend:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
-adler32.o: zlib.h zconf.h
+adler32.o gzio.o zutil.o: zutil.h zlib.h zconf.h zlibdefs.h
-compress.o: zlib.h zconf.h
+gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h zlibdefs.h gzguts.h
-crc32.o: crc32.h zlib.h zconf.h
+compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h zlibdefs.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
+crc32.o: zutil.h zlib.h zconf.h zlibdefs.h crc32.h
-example.o: zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
-gzio.o: zutil.h zlib.h zconf.h
+infback.o inflate.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+trees.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+
-minigzip.o: zlib.h zconf.h
+adler32.lo gzio.lo zutil.lo: zutil.h zlib.h zconf.h zlibdefs.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h zlibdefs.h gzguts.h
-uncompr.o: zlib.h zconf.h
+compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h zlibdefs.h
-zutil.o: zutil.h zlib.h zconf.h
+crc32.lo: zutil.h zlib.h zconf.h zlibdefs.h crc32.h
 deflate.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
 infback.lo inflate.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
 inffast.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
 inftrees.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
 trees.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,11 +1,11 @@
 # Makefile for zlib
-# Copyright (C) 1995-2003 Jean-loup Gailly.
+# Copyright (C) 1995-2006 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h
 # To compile and test, type:
 #    ./configure; make test
-# The call of configure is optional if you don't have special requirements
+# Normally configure builds both a static and a shared library.
-# If you wish to build zlib as a shared library, use: ./configure -s
+# If you want to build just a static library, use: ./configure --static
 # To use the asm code, type:
 #    cp contrib/asm?86/match.S ./match.S
@@ -24,14 +24,17 @@ CFLAGS=-O
 #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
 #           -Wstrict-prototypes -Wmissing-prototypes
-LDFLAGS=libz.a
+SFLAGS=-O
 LDFLAGS=-L. libz.a
 LDSHARED=$(CC)
 CPP=$(CC) -E
-LIBS=libz.a
+STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.0.8
+SHAREDLIBV=libz.so.1.2.3.5
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIB) $(SHAREDLIBV)
 AR=ar rc
 RANLIB=ranlib
@@ -45,21 +48,36 @@ libdir = ${exec_prefix}/lib
 includedir = ${prefix}/include
 mandir = ${prefix}/share/man
 man3dir = ${mandir}/man3
 pkgconfigdir = ${libdir}/pkgconfig
-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzio.o gzlib.o gzread.o \
-       zutil.o inflate.o infback.o inftrees.o inffast.o
+	gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
 PIC_OBJC = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzio.lo gzlib.lo gzread.lo \
 	gzwrite.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo uncompr.lo zutil.lo
 # to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
 OBJA =
-# to use the asm code: make OBJA=match.o
+PIC_OBJA =
-TEST_OBJS = example.o minigzip.o
+OBJS = $(OBJC) $(OBJA)
-all: example$(EXE) minigzip$(EXE)
+PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
 all: static shared
 static: example$(EXE) minigzip$(EXE)
 shared: examplesh$(EXE) minigzipsh$(EXE)
 all64: example64$(EXE) minigzip64$(EXE)
 check: test
-test: all
+
-	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+test: all teststatic testshared
-	echo hello world | ./minigzip | ./minigzip -d || \
+
 teststatic: static
 	@echo hello world | ./minigzip | ./minigzip -d || \
 	  echo '		*** minigzip test FAILED ***' ; \
 	if ./example; then \
 	  echo '		*** zlib test OK ***'; \
@@ -67,8 +85,30 @@ test: all
 	  echo '		*** zlib test FAILED ***'; \
 	fi
-libz.a: $(OBJS) $(OBJA)
+testshared: shared
-	$(AR) $@ $(OBJS) $(OBJA)
+	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
 	LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
 	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
 	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
 	echo hello world | ./minigzipsh | ./minigzipsh -d || \
 	  echo '		*** minigzip shared test FAILED ***' ; \
 	if ./examplesh; then \
 	  echo '		*** zlib shared test OK ***'; \
 	else \
 	  echo '		*** zlib shared test FAILED ***'; \
 	fi
 test64: all64
 	@echo hello world | ./minigzip64 | ./minigzip64 -d || \
 	  echo '		*** minigzip 64-bit test FAILED ***' ; \
 	if ./example64; then \
 	  echo '		*** zlib 64-bit test OK ***'; \
 	else \
 	  echo '		*** zlib 64-bit test FAILED ***'; \
 	fi
 libz.a: $(OBJS)
 	$(AR) $@ $(OBJS)
 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 match.o: match.S
@@ -77,58 +117,100 @@ match.o: match.S
 	mv _match.o match.o
 	rm -f _match.s
-$(SHAREDLIBV): $(OBJS)
+match.lo: match.S
-	$(LDSHARED) -o $@ $(OBJS)
+	$(CPP) match.S > _match.s
 	$(CC) -c -fPIC _match.s
 	mv _match.o match.lo
 	rm -f _match.s
 example64.o: example.c zlib.h zconf.h zlibdefs.h
 	$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ $<
 minigzip64.o: minigzip.c zlib.h zconf.h zlibdefs.h
 	$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ $<
 .SUFFIXES: .lo
 .c.lo:
 	-@if [ ! -d objs ]; then mkdir objs; fi
 	$(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
 	-@mv objs/$*.o $@
 $(SHAREDLIBV): $(PIC_OBJS)
 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc
 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
 	ln -s $@ $(SHAREDLIB)
 	ln -s $@ $(SHAREDLIBM)
 	-@rmdir objs
-example$(EXE): example.o $(LIBS)
+example$(EXE): example.o $(STATICLIB)
 	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
-minigzip$(EXE): minigzip.o $(LIBS)
+minigzip$(EXE): minigzip.o $(STATICLIB)
 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
-install: $(LIBS)
+examplesh$(EXE): example.o $(SHAREDLIBV)
-	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
+	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
-	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
+
-	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
+minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
-	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
+	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
-	cp zlib.h zconf.h $(includedir)
+
-	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
+example64$(EXE): example64.o $(STATICLIB)
-	cp $(LIBS) $(libdir)
+	$(CC) $(CFLAGS) -o $@ example64.o $(LDFLAGS)
-	cd $(libdir); chmod 755 $(LIBS)
+
-	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+minigzip64$(EXE): minigzip64.o $(STATICLIB)
-	cd $(libdir); if test -f $(SHAREDLIBV); then \
+	$(CC) $(CFLAGS) -o $@ minigzip64.o $(LDFLAGS)
 install-libs: $(LIBS)
 	-@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
 	-@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
 	cp $(LIBS) $(DESTDIR)$(libdir)
 	cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
 	cd $(DESTDIR)$(libdir); if test -f $(SHAREDLIBV); then \
 	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
 	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
 	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
 	  (ldconfig || true)  >/dev/null 2>&1; \
 	fi
-	cp zlib.3 $(man3dir)
+	cp zlib.3 $(DESTDIR)$(man3dir)
-	chmod 644 $(man3dir)/zlib.3
+	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
 	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
 	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
 # The ranlib in install is needed on NeXTSTEP which checks file times
 # ldconfig is for Linux
 install: install-libs
 	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
 	cp zlib.h zconf.h zlibdefs.h $(DESTDIR)$(includedir)
 	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h $(DESTDIR)$(includedir)/zlibdefs.h
 uninstall:
-	cd $(includedir); \
+	cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h zlibdefs.h
-	cd $(libdir); rm -f libz.a; \
+	cd $(DESTDIR)$(libdir); rm -f libz.a; \
 	if test -f $(SHAREDLIBV); then \
 	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
 	fi
-	cd $(man3dir); rm -f zlib.3
+	cd $(DESTDIR)$(man3dir); rm -f zlib.3
 	cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc
 mostlyclean: clean
 clean:
-	rm -f *.o *~ example$(EXE) minigzip$(EXE) \
+	rm -f *.o *.lo *~ \
 	   example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
 	   example64$(EXE) minigzip64$(EXE) \
 	   libz.* foo.gz so_locations \
 	   _match.s maketree contrib/infback9/*.o
 	rm -rf objs
 maintainer-clean: distclean
 distclean: clean
 	cp -p Makefile.in Makefile
-	cp -p zconf.in.h zconf.h
+	rm zlibdefs.h
-	rm -f .DS_Store
+	touch -r configure zlibdefs.h
 	rm -f zlib.pc .DS_Store
 tags:
 	etags *.[ch]
@@ -138,17 +220,22 @@ depend:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
-adler32.o: zlib.h zconf.h
+adler32.o gzio.o zutil.o: zutil.h zlib.h zconf.h zlibdefs.h
-compress.o: zlib.h zconf.h
+gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h zlibdefs.h gzguts.h
-crc32.o: crc32.h zlib.h zconf.h
+compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h zlibdefs.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
+crc32.o: zutil.h zlib.h zconf.h zlibdefs.h crc32.h
-example.o: zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
-gzio.o: zutil.h zlib.h zconf.h
+infback.o inflate.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+trees.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+
-minigzip.o: zlib.h zconf.h
+adler32.lo gzio.lo zutil.lo: zutil.h zlib.h zconf.h zlibdefs.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h zlibdefs.h gzguts.h
-uncompr.o: zlib.h zconf.h
+compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h zlibdefs.h
-zutil.o: zutil.h zlib.h zconf.h
+crc32.lo: zutil.h zlib.h zconf.h zlibdefs.h crc32.h
 deflate.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h
 infback.lo inflate.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h
 inffast.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h
 inftrees.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h
 trees.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h
--- a/13
+++ b/13
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.0.8 is a general purpose data compression library.  All the code is
+zlib 1.2.3.5 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)
@@ -16,9 +16,8 @@ minigzip.c.
 To compile all files and run the test program, follow the instructions given at
 the top of Makefile. In short "make test; make install" should work for most
-machines. For Unix: "./configure; make test; make install" For MSDOS, use one
+machines. For Unix: "./configure; make test; make install". For MSDOS, use one
-of the special makefiles such as Makefile.msc. For VMS, use Make_vms.com or
+of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.
 descrip.mms.
 Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
 <info@winimage.com> for the Windows DLL version. The zlib home page is
@@ -34,7 +33,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 in
 http://dogma.net/markn/articles/zlibtool/zlibtool.htm
-The changes made in version 1.2.0.8 are documented in the file ChangeLog.
+The changes made in version 1.2.3.5 are documented in the file ChangeLog.
 Unsupported third party contributions are provided in directory "contrib".
@@ -46,7 +45,7 @@ A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is in the
 CPAN (Comprehensive Perl Archive Network) sites
 http://www.cpan.org/modules/by-module/Compress/
-A Python interface to zlib written by A.M. Kuchling <amk@magnet.com> is
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
 available in Python 1.5 and later versions, see
 http://www.python.org/doc/lib/module-zlib.html
@@ -93,7 +92,7 @@ Acknowledgments:
 Copyright notice:
- (C) 1995-2003 Jean-loup Gailly and Mark Adler
+ (C) 1995-2004 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
--- a/adler32.c
+++ b/adler32.c
@@ -1,46 +1,59 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2003 Mark Adler
+ * Copyright (C) 1995-2007 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
 /* @(#) $Id$ */
-#define ZLIB_INTERNAL
+#include "zutil.h"
-#include "zlib.h"
+
 #define local static
 local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
 #define BASE 65521UL    /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
 #define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
 #define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
 #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 /* use NO_DIVIDE if your processor does not do division in hardware */
 #ifdef NO_DIVIDE
 #  define MOD(a) \
    do { \
-        if (a > (BASE << 16)) a -= (BASE << 16); \
+        if (a >= (BASE << 16)) a -= (BASE << 16); \
-        if (a > (BASE << 15)) a -= (BASE << 15); \
+        if (a >= (BASE << 15)) a -= (BASE << 15); \
-        if (a > (BASE << 14)) a -= (BASE << 14); \
+        if (a >= (BASE << 14)) a -= (BASE << 14); \
-        if (a > (BASE << 13)) a -= (BASE << 13); \
+        if (a >= (BASE << 13)) a -= (BASE << 13); \
-        if (a > (BASE << 12)) a -= (BASE << 12); \
+        if (a >= (BASE << 12)) a -= (BASE << 12); \
-        if (a > (BASE << 11)) a -= (BASE << 11); \
+        if (a >= (BASE << 11)) a -= (BASE << 11); \
-        if (a > (BASE << 10)) a -= (BASE << 10); \
+        if (a >= (BASE << 10)) a -= (BASE << 10); \
-        if (a > (BASE << 9)) a -= (BASE << 9); \
+        if (a >= (BASE << 9)) a -= (BASE << 9); \
-        if (a > (BASE << 8)) a -= (BASE << 8); \
+        if (a >= (BASE << 8)) a -= (BASE << 8); \
-        if (a > (BASE << 7)) a -= (BASE << 7); \
+        if (a >= (BASE << 7)) a -= (BASE << 7); \
-        if (a > (BASE << 6)) a -= (BASE << 6); \
+        if (a >= (BASE << 6)) a -= (BASE << 6); \
-        if (a > (BASE << 5)) a -= (BASE << 5); \
+        if (a >= (BASE << 5)) a -= (BASE << 5); \
-        if (a > (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a > (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a > (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a > (BASE << 1)) a -= (BASE << 1); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
-        if (a > BASE) a -= BASE; \
+        if (a >= BASE) a -= BASE; \
    } while (0)
 #  define MOD4(a) \
    do { \
        if (a >= (BASE << 4)) a -= (BASE << 4); \
        if (a >= (BASE << 3)) a -= (BASE << 3); \
        if (a >= (BASE << 2)) a -= (BASE << 2); \
        if (a >= (BASE << 1)) a -= (BASE << 1); \
        if (a >= BASE) a -= BASE; \
    } while (0)
 #else
 #  define MOD(a) a %= BASE
 #  define MOD4(a) a %= BASE
 #endif
 /* ========================================================================= */
@@ -49,26 +62,108 @@ uLong ZEXPORT adler32(adler, buf, len)
    const Bytef *buf;
    uInt len;
 {
-    unsigned long s1 = adler & 0xffff;
+    unsigned long sum2;
-    unsigned long s2 = (adler >> 16) & 0xffff;
+    unsigned n;
    int k;
-    if (buf == Z_NULL) return 1L;
+    /* split Adler-32 into component sums */
    sum2 = (adler >> 16) & 0xffff;
    adler &= 0xffff;
-    while (len > 0) {
+    /* in case user likes doing a byte at a time, keep it fast */
-        k = len < NMAX ? (int)len : NMAX;
+    if (len == 1) {
-        len -= k;
+        adler += buf[0];
-        while (k >= 16) {
+        if (adler >= BASE)
            adler -= BASE;
        sum2 += adler;
        if (sum2 >= BASE)
            sum2 -= BASE;
        return adler | (sum2 << 16);
    }
    /* initial Adler-32 value (deferred check for len == 1 speed) */
    if (buf == Z_NULL)
        return 1L;
    /* in case short lengths are provided, keep it somewhat fast */
    if (len < 16) {
        while (len--) {
            adler += *buf++;
            sum2 += adler;
        }
        if (adler >= BASE)
            adler -= BASE;
        MOD4(sum2);             /* only added so many BASE's */
        return adler | (sum2 << 16);
    }
    /* do length NMAX blocks -- requires just one modulo operation */
    while (len >= NMAX) {
        len -= NMAX;
        n = NMAX / 16;          /* NMAX is divisible by 16 */
        do {
            DO16(buf);          /* 16 sums unrolled */
            buf += 16;
        } while (--n);
        MOD(adler);
        MOD(sum2);
    }
    /* do remaining bytes (less than NMAX, still just one modulo) */
    if (len) {                  /* avoid modulos if none remaining */
        while (len >= 16) {
            len -= 16;
            DO16(buf);
            buf += 16;
            k -= 16;
        }
-        if (k != 0) do {
+        while (len--) {
-            s1 += *buf++;
+            adler += *buf++;
-            s2 += s1;
+            sum2 += adler;
-        } while (--k);
+        }
-        MOD(s1);
+        MOD(adler);
-        MOD(s2);
+        MOD(sum2);
    }
-    return (s2 << 16) | s1;
+
    /* return recombined sums */
    return adler | (sum2 << 16);
 }
 /* ========================================================================= */
 local uLong adler32_combine_(adler1, adler2, len2)
    uLong adler1;
    uLong adler2;
    z_off64_t len2;
 {
    unsigned long sum1;
    unsigned long sum2;
    unsigned rem;
    /* the derivation of this formula is left as an exercise for the reader */
    rem = (unsigned)(len2 % BASE);
    sum1 = adler1 & 0xffff;
    sum2 = rem * sum1;
    MOD(sum2);
    sum1 += (adler2 & 0xffff) + BASE - 1;
    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
    if (sum1 >= BASE) sum1 -= BASE;
    if (sum1 >= BASE) sum1 -= BASE;
    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
    if (sum2 >= BASE) sum2 -= BASE;
    return sum1 | (sum2 << 16);
 }
 /* ========================================================================= */
 uLong ZEXPORT adler32_combine(adler1, adler2, len2)
    uLong adler1;
    uLong adler2;
    z_off_t len2;
 {
    return adler32_combine_(adler1, adler2, len2);
 }
 uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
    uLong adler1;
    uLong adler2;
    z_off64_t len2;
 {
    return adler32_combine_(adler1, adler2, len2);
 }
--- a/amiga/Makefile.pup
+++ b/amiga/Makefile.pup
@@ -14,8 +14,8 @@ LDFLAGS	= -o
 LDLIBS	= LIB:scppc.a LIB:end.o
 RM	= delete quiet
-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+OBJS = adler32.o compress.o crc32.o gzclose.o gzio.o gzlib.o gzread.o gzwrite.o \
-       zutil.o inflate.o infback.o inftrees.o inffast.o
+       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
 TEST_OBJS = example.o minigzip.o
@@ -55,7 +55,11 @@ compress.o: zlib.h zconf.h
 crc32.o: crc32.h zlib.h zconf.h
 deflate.o: deflate.h zutil.h zlib.h zconf.h
 example.o: zlib.h zconf.h
 gzclose.o: zlib.h zconf.h gzguts.h
 gzio.o: zutil.h zlib.h zconf.h
 gzlib.o: zlib.h zconf.h gzguts.h
 gzread.o: zlib.h zconf.h gzguts.h
 gzwrite.o: zlib.h zconf.h gzguts.h
 inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
 inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
 infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
--- a/amiga/Makefile.sas
+++ b/amiga/Makefile.sas
@@ -13,8 +13,8 @@ SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \
       NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX \
       DEF=POSTINC
-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+OBJS = adler32.o compress.o crc32.o gzclose.o gzio.o gzlib.o gzread.o gzwrite.o \
-       zutil.o inflate.o infback.o inftrees.o inffast.o
+       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
 TEST_OBJS = example.o minigzip.o
@@ -23,7 +23,7 @@ all: SCOPTIONS example minigzip
 check: test
 test: all
 	example
-	echo hello world | minigzip | minigzip -d 
+	echo hello world | minigzip | minigzip -d
 install: z.lib
 	copy clone zlib.h zconf.h INCLUDE:
@@ -54,7 +54,11 @@ compress.o: zlib.h zconf.h
 crc32.o: crc32.h zlib.h zconf.h
 deflate.o: deflate.h zutil.h zlib.h zconf.h
 example.o: zlib.h zconf.h
 gzclose.o: zlib.h zconf.h gzguts.h
 gzio.o: zutil.h zlib.h zconf.h
 gzlib.o: zlib.h zconf.h gzguts.h
 gzread.o: zlib.h zconf.h gzguts.h
 gzwrite.o: zlib.h zconf.h gzguts.h
 inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
 inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
 infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
--- a/as400/bndsrc
+++ b/as400/bndsrc
@@ -87,7 +87,7 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
  EXPORT SYMBOL("zError")
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.0.7 additional entry points.                       */
+/*   Version 1.2.1 additional entry points.                         */
 /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
 /********************************************************************/
--- a/as400/compile.clp
+++ b/as400/compile.clp
@@ -118,6 +118,6 @@
                                 &MODLIB/INFTREES    &MODLIB/TREES       +
                                 &MODLIB/UNCOMPR     &MODLIB/ZUTIL)      +
                          SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC) +
-                          TEXT('ZLIB 1.2.0.7') TGTRLS(V4R4M0)
+                          TEXT('ZLIB 1.2.3') TGTRLS(V4R4M0)
             ENDPGM
--- a/as400/readme.txt
+++ b/as400/readme.txt
@@ -1,4 +1,4 @@
-        ZLIB version 1.2.0.7 for AS400 installation instructions
+        ZLIB version 1.2.3 for AS400 installation instructions
 I) From an AS400 *SAVF file:
--- a/as400/zlib.inc
+++ b/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.0.7
+      *  Version 1.2.3.5
      *
      *
      *  WARNING:
@@ -20,8 +20,12 @@
      *                               Constants
      **************************************************************************
      *
-     D ZLIB_VERSION    C                   '1.2.0.8'                            Header's version
+      *  Versioning information.
-     D ZLIB_VERNUM     C                   X'1208'
+      *
     D ZLIB_VERSION    C                   '1.2.3.5'
     D ZLIB_VERNUM     C                   X'1235'
      *
      *  Other equates.
      *
     D Z_NO_FLUSH      C                   0
     D Z_SYNC_FLUSH    C                   2
--- a/compress.c
+++ b/compress.c
@@ -1,5 +1,5 @@
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@@ -75,5 +75,6 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
 uLong ZEXPORT compressBound (sourceLen)
    uLong sourceLen;
 {
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
           (sourceLen >> 25) + 13;
 }
--- a/257
+++ b/257
@@ -1,29 +1,26 @@
 #!/bin/sh
-# configure script for zlib. This script is needed only if
+# configure script for zlib.
 # you wish to build a shared library and your system supports them,
 # of if you need special compiler, flags or install directory.
 # Otherwise, you can just use directly "make test; make install"
 #
-# To create a shared library, use "configure --shared"; by default a static
+# Normally configure builds both a static and a shared library.
-# library is created. If the primitive shared library support provided here
+# If you want to build just a static library, use: ./configure --static
 # does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz
 #
 # To impose specific compiler or flags or install directory, use for example:
 #    prefix=$HOME CC=cc CFLAGS="-O4" ./configure
 # or for csh/tcsh users:
 #    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
 # LDSHARED is the command to be used to create a shared library
 # Incorrect settings of CC or CFLAGS may prevent creating a shared library.
 # If you have problems, try without defining CC and CFLAGS before reporting
 # an error.
-LIBS=libz.a
+STATICLIB=libz.a
-LDFLAGS="-L. ${LIBS}"
+LDFLAGS="${LDFLAGS} -L. ${STATICLIB}"
 VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
 VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
 VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
 VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
-AR=${AR-"ar rc"}
+AR=${AR-"ar"}
 AR_RC="${AR} rc"
 RANLIB=${RANLIB-"ranlib"}
 prefix=${prefix-/usr/local}
 exec_prefix=${exec_prefix-'${prefix}'}
@@ -31,7 +28,8 @@ libdir=${libdir-'${exec_prefix}/lib'}
 includedir=${includedir-'${prefix}/include'}
 mandir=${mandir-'${prefix}/share/man'}
 shared_ext='.so'
-shared=0
+shared=1
 zprefix=0
 gcc=0
 old_cc="$CC"
 old_cflags="$CFLAGS"
@@ -39,21 +37,26 @@ old_cflags="$CFLAGS"
 while test $# -ge 1
 do
 case "$1" in
-    -h* | --h*)
+    -h* | --help)
      echo 'usage:'
      echo '  configure [--shared] [--prefix=PREFIX]  [--exec_prefix=EXPREFIX]'
-      echo '     [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
+      echo '     [--libdir=LIBDIR] [--includedir=INCLUDEDIR] [--zprefix]'
-        exit 0;;
+        exit 0 ;;
-    -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+    -p*=* | --prefix=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
-    -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+    -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
-    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
-    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;;
+    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;;
-    -p* | --p*) prefix="$2"; shift; shift;;
+    -u*=* | --uname=*) uname=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;;
-    -e* | --e*) exec_prefix="$2"; shift; shift;;
+    -p* | --prefix) prefix="$2"; shift; shift ;;
-    -l* | --l*) libdir="$2"; shift; shift;;
+    -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
-    -i* | --i*) includedir="$2"; shift; shift;;
+    -l* | --libdir) libdir="$2"; shift; shift ;;
-    -s* | --s*) shared=1; shift;;
+    -i* | --includedir) includedir="$2"; shift; shift ;;
-    *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;;
+    -s* | --shared | --enable-shared) shared=1; shift ;;
    -t | --static) shared=0; shift ;;
    -z* | --zprefix) zprefix=1; shift ;;
    --sysconfdir=*) echo "ignored option: --sysconfdir"; shift ;;
    --localstatedir=*) echo "ignored option: --localstatedir"; shift ;;
    *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1 ;;
    esac
 done
@@ -68,85 +71,112 @@ cc=${CC-gcc}
 cflags=${CFLAGS-"-O3"}
 # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
 case "$cc" in
-  *gcc*) gcc=1;;
+  *gcc*) gcc=1 ;;
 esac
 if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
  CC="$cc"
-  SFLAGS=${CFLAGS-"-fPIC -O3"}
+  SFLAGS="${CFLAGS-"-O3"} -fPIC"
-  CFLAGS="$cflags"
+  CFLAGS="${CFLAGS-"-O3"}"
-  case `(uname -s || echo unknown) 2>/dev/null` in
+  if test -z "$uname"; then
-  Linux | linux) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
+    uname=`(uname -s || echo unknown) 2>/dev/null`
-  CYGWIN* | Cygwin* | cygwin* )
+  fi
-             EXE='.exe';;
+  case "$uname" in
  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
  CYGWIN* | Cygwin* | cygwin* | OS/2* )
             EXE='.exe' ;;
  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
         # (alain.bonnefoy@icbt.com)
-                 LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};;
+                 LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
-  HP-UX*)        LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
+  HP-UX*)
         LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
         case `(uname -m || echo unknown) 2>/dev/null` in
         ia64)
                 shared_ext='.so'
                 SHAREDLIB='libz.so' ;;
         *)
                 shared_ext='.sl'
-                 SHAREDLIB='libz.sl';;
+                 SHAREDLIB='libz.sl' ;;
         esac ;;
  Darwin*)   shared_ext='.dylib'
             SHAREDLIB=libz$shared_ext
             SHAREDLIBV=libz.$VER$shared_ext
             SHAREDLIBM=libz.$VER1$shared_ext
-             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name /usr/lib/$SHAREDLIBV -compatibility_version $VER2 -current_version $VER"}
+             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} ;;
-             libdir='/usr/lib'
+  *)             LDSHARED=${LDSHARED-"$cc -shared"} ;;
             includedir='/usr/include';;
  *)             LDSHARED=${LDSHARED-"$cc -shared"};;
  esac
 else
  # find system name and corresponding cc options
  CC=${CC-cc}
-  case `(uname -sr || echo unknown) 2>/dev/null` in
+  if test -z "$uname"; then
    uname=`(uname -sr || echo unknown) 2>/dev/null`
  fi
  case "$uname" in
  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}
             CFLAGS=${CFLAGS-"-O"}
 #            LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
             LDSHARED=${LDSHARED-"ld -b"}
         case `(uname -m || echo unknown) 2>/dev/null` in
         ia64)
             shared_ext='.so'
             SHAREDLIB='libz.so' ;;
         *)
             shared_ext='.sl'
-             SHAREDLIB='libz.sl';;
+             SHAREDLIB='libz.sl' ;;
         esac ;;
  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
             CFLAGS=${CFLAGS-"-ansi -O2"}
-             LDSHARED=${LDSHARED-"cc -shared"};;
+             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
  OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
             CFLAGS=${CFLAGS-"-O -std1"}
-             LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};;
+             LDFLAGS="${LDFLAGS} -Wl,-rpath,."
             LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;;
  OSF1*)     SFLAGS=${CFLAGS-"-O -std1"}
             CFLAGS=${CFLAGS-"-O -std1"}
-             LDSHARED=${LDSHARED-"cc -shared"};;
+             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}
             CFLAGS=${CFLAGS-"-4 -O"}
             LDSHARED=${LDSHARED-"cc"}
             RANLIB=${RANLIB-"true"}
-             AR="cc -A";;
+             AR_RC="cc -A" ;;
  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
             CFLAGS=${CFLAGS-"-O3"}
-             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
+             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;
-  SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
+  SunOS\ 5*) LDSHARED=${LDSHARED-"cc -G"}
-             CFLAGS=${CFLAGS-"-fast -xcg89"}
+         case `(uname -m || echo unknown) 2>/dev/null` in
-             LDSHARED=${LDSHARED-"cc -G"};;
+         i86*)
             SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."}
             CFLAGS=${CFLAGS-"-xpentium -fast"} ;;
         *)
             SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."}
             CFLAGS=${CFLAGS-"-fast -xcg92"} ;;
         esac ;;
  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
             CFLAGS=${CFLAGS-"-O2"}
-             LDSHARED=${LDSHARED-"ld"};;
+             LDSHARED=${LDSHARED-"ld"} ;;
  SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}
             CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"}
             LDSHARED=${LDSHARED-"cc -xarch=v9b"} ;;
  UNIX_System_V\ 4.2.0)
             SFLAGS=${CFLAGS-"-KPIC -O"}
             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -G"};;
+             LDSHARED=${LDSHARED-"cc -G"} ;;
  UNIX_SV\ 4.2MP)
             SFLAGS=${CFLAGS-"-Kconform_pic -O"}
             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -G"};;
+             LDSHARED=${LDSHARED-"cc -G"} ;;
  OpenUNIX\ 5)
             SFLAGS=${CFLAGS-"-KPIC -O"}
             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -G"};;
+             LDSHARED=${LDSHARED-"cc -G"} ;;
  AIX*)  # Courtesy of dbakker@arrayasolutions.com
             SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
             CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
-             LDSHARED=${LDSHARED-"xlc -G"};;
+             LDSHARED=${LDSHARED-"xlc -G"} ;;
  # send working options for other systems to support@gzip.org
  *)         SFLAGS=${CFLAGS-"-O"}
             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -shared"};;
+             LDSHARED=${LDSHARED-"cc -shared"} ;;
  esac
 fi
@@ -157,24 +187,66 @@ SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
 if test $shared -eq 1; then
  echo Checking for shared library support...
  # we must test in two steps (cc then ld), required at least on SunOS 4.x
-  if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
+  if test "`($CC -w -c $SFLAGS $test.c) 2>&1`" = "" &&
     test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
    CFLAGS="$SFLAGS"
    LIBS="$SHAREDLIBV"
    echo Building shared library $SHAREDLIBV with $CC.
  elif test -z "$old_cc" -a -z "$old_cflags"; then
    echo No shared library support.
    shared=0;
  else
    echo Tested $CC -w -c $SFLAGS $test.c
    $CC -w -c $SFLAGS $test.c
    echo Tested $LDSHARED -o $test$shared_ext $test.o
    $LDSHARED -o $test$shared_ext $test.o
    echo 'No shared library support; try without defining CC and CFLAGS'
    shared=0;
  fi
 fi
 if test $shared -eq 0; then
  LDSHARED="$CC"
-  echo Building static library $LIBS version $VER with $CC.
+  ALL="static"
  TEST="all teststatic"
  echo Building static library $STATICLIB version $VER with $CC.
 else
-  LDFLAGS="-L. ${SHAREDLIBV}"
+  ALL="static shared"
  TEST="all teststatic testshared"
 fi
 cat > zlibdefs.h << EOF
 /* zlibdefs.h -- compile-time definitions for the zlib compression library
 * Copyright (C) 1995-2006 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
 EOF
 cat > $test.c <<EOF
 #include <sys/types.h>
 off64_t dummy = 0;
 EOF
 if test "`($CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c) 2>&1`" = ""; then
  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
  ALL="${ALL} all64"
  TEST="${TEST} test64"
  echo "Checking for off64_t... Yes."
  echo "Checking for fseeko... Yes."
 else
  echo "Checking for off64_t... No."
  cat > $test.c <<EOF
 #include <stdio.h>
 int main(void) {
  fseeko(NULL, 0, 0);
  return 0;
 }
 EOF
  if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
    echo "Checking for fseeko... Yes."
  else
    CFLAGS="${CFLAGS} -DNO_FSEEKO"
    SFLAGS="${SFLAGS} -DNO_FSEEKO"
    echo "Checking for fseeko... No."
  fi
 fi
 cat > $test.c <<EOF
@@ -182,13 +254,27 @@ cat > $test.c <<EOF
 int main() { return 0; }
 EOF
 if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-  sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h
+  cat >> zlibdefs.h <<EOF
 #include <sys/types.h>	/* for off_t */
 #include <unistd.h>	/* for SEEK_* and off_t */
 #ifdef VMS
 #  include <unixio.h>	/* for off_t */
 #endif
 #ifndef z_off_t
 #  define z_off_t off_t
 #endif
 EOF
  echo "Checking for unistd.h... Yes."
 else
  cp -p zconf.in.h zconf.h
  echo "Checking for unistd.h... No."
 fi
 if test $zprefix -eq 1; then
  sed < zconf.h "/#ifdef Z_PREFIX/s/def Z_PREFIX/ 1/" > zconf.temp.h
  mv zconf.temp.h zconf.h
  echo "Using z_ prefix on all symbols."
 fi
 cat > $test.c <<EOF
 #include <stdio.h>
 #include <stdarg.h>
@@ -205,7 +291,7 @@ int main()
 EOF
 if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()"
+  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()."
  cat > $test.c <<EOF
 #include <stdio.h>
@@ -257,6 +343,7 @@ EOF
      echo "Checking for return value of vsnprintf()... Yes."
    else
      CFLAGS="$CFLAGS -DHAS_vsnprintf_void"
      SFLAGS="$SFLAGS -DHAS_vsnprintf_void"
      echo "Checking for return value of vsnprintf()... No."
      echo "  WARNING: apparently vsnprintf() does not return a value. zlib"
      echo "  can build but will be open to possible string-format security"
@@ -264,6 +351,7 @@ EOF
    fi
  else
    CFLAGS="$CFLAGS -DNO_vsnprintf"
    SFLAGS="$SFLAGS -DNO_vsnprintf"
    echo "Checking for vsnprintf() in stdio.h... No."
    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib"
    echo "  can build but will be open to possible buffer-overflow security"
@@ -295,6 +383,7 @@ EOF
      echo "Checking for return value of vsprintf()... Yes."
    else
      CFLAGS="$CFLAGS -DHAS_vsprintf_void"
      SFLAGS="$SFLAGS -DHAS_vsprintf_void"
      echo "Checking for return value of vsprintf()... No."
      echo "  WARNING: apparently vsprintf() does not return a value. zlib"
      echo "  can build but will be open to possible string-format security"
@@ -302,7 +391,7 @@ EOF
    fi
  fi
 else
-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()"
+  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()."
  cat >$test.c <<EOF
 #include <stdio.h>
@@ -344,6 +433,7 @@ EOF
      echo "Checking for return value of snprintf()... Yes."
    else
      CFLAGS="$CFLAGS -DHAS_snprintf_void"
      SFLAGS="$SFLAGS -DHAS_snprintf_void"
      echo "Checking for return value of snprintf()... No."
      echo "  WARNING: apparently snprintf() does not return a value. zlib"
      echo "  can build but will be open to possible string-format security"
@@ -351,6 +441,7 @@ EOF
    fi
  else
    CFLAGS="$CFLAGS -DNO_snprintf"
    SFLAGS="$SFLAGS -DNO_snprintf"
    echo "Checking for snprintf() in stdio.h... No."
    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib"
    echo "  can build but will be open to possible buffer-overflow security"
@@ -376,6 +467,7 @@ EOF
      echo "Checking for return value of sprintf()... Yes."
    else
      CFLAGS="$CFLAGS -DHAS_sprintf_void"
      SFLAGS="$SFLAGS -DHAS_sprintf_void"
      echo "Checking for return value of sprintf()... No."
      echo "  WARNING: apparently sprintf() does not return a value. zlib"
      echo "  can build but will be open to possible string-format security"
@@ -393,6 +485,7 @@ if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
 else
  echo "Checking for errno.h... No."
  CFLAGS="$CFLAGS -DNO_ERRNO_H"
  SFLAGS="$SFLAGS -DNO_ERRNO_H"
 fi
 cat > $test.c <<EOF
@@ -405,6 +498,7 @@ caddr_t hello() {
 EOF
 if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
  CFLAGS="$CFLAGS -DUSE_MMAP"
  SFLAGS="$SFLAGS -DUSE_MMAP"
  echo Checking for mmap support... Yes.
 else
  echo Checking for mmap support... No.
@@ -418,7 +512,7 @@ case $CFLAGS in
      echo Checking for underline in external names... No.
    else
      echo Checking for underline in external names... Yes.
-    fi;;
+    fi ;;
 esac
 rm -f $test.[co] $test $test$shared_ext
@@ -427,13 +521,36 @@ rm -f $test.[co] $test $test$shared_ext
 sed < Makefile.in "
 /^CC *=/s#=.*#=$CC#
 /^CFLAGS *=/s#=.*#=$CFLAGS#
-/^CPP *=/s#=.*#=$CPP#
+/^SFLAGS *=/s#=.*#=$SFLAGS#
 /^LDFLAGS *=/s#=.*#=$LDFLAGS#
 /^LDSHARED *=/s#=.*#=$LDSHARED#
-/^LIBS *=/s#=.*#=$LIBS#
+/^CPP *=/s#=.*#=$CPP#
 /^STATICLIB *=/s#=.*#=$STATICLIB#
 /^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
 /^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
 /^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
-/^AR *=/s#=.*#=$AR#
+/^AR *=/s#=.*#=$AR_RC#
 /^RANLIB *=/s#=.*#=$RANLIB#
 /^EXE *=/s#=.*#=$EXE#
 /^prefix *=/s#=.*#=$prefix#
 /^exec_prefix *=/s#=.*#=$exec_prefix#
 /^libdir *=/s#=.*#=$libdir#
 /^includedir *=/s#=.*#=$includedir#
 /^mandir *=/s#=.*#=$mandir#
 /^all: */s#:.*#: $ALL#
 /^test: */s#:.*#: $TEST#
 " > Makefile
 sed < zlib.pc.in "
 /^CC *=/s#=.*#=$CC#
 /^CFLAGS *=/s#=.*#=$CFLAGS#
 /^CPP *=/s#=.*#=$CPP#
 /^LDSHARED *=/s#=.*#=$LDSHARED#
 /^STATICLIB *=/s#=.*#=$STATICLIB#
 /^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
 /^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
 /^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
 /^AR *=/s#=.*#=$AR_RC#
 /^RANLIB *=/s#=.*#=$RANLIB#
 /^EXE *=/s#=.*#=$EXE#
 /^prefix *=/s#=.*#=$prefix#
@@ -442,4 +559,6 @@ sed < Makefile.in "
 /^includedir *=/s#=.*#=$includedir#
 /^mandir *=/s#=.*#=$mandir#
 /^LDFLAGS *=/s#=.*#=$LDFLAGS#
-" > Makefile
+" | sed -e "
 s/\@VERSION\@/$VER/g;
 " > zlib.pc
--- a/contrib/README.contrib
+++ b/contrib/README.contrib
@@ -8,6 +8,10 @@ ada/        by Dmitriy Anisimkov <anisimkov@yahoo.com>
        Support for Ada
        See http://zlib-ada.sourceforge.net/
 amd64/      by Mikhail Teterin <mi@ALDAN.algebra.com>
        asm code for AMD64
        See patch at http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/96393
 asm586/
 asm686/     by Brian Raiter <breadbox@muppetlabs.com>
        asm code for Pentium and PPro/PII, using the AT&T (GNU as) syntax
@@ -19,8 +23,8 @@ blast/      by Mark Adler <madler@alumni.caltech.edu>
 delphi/     by Cosmin Truta <cosmint@cs.ubbcluj.ro>
        Support for Delphi and C++ Builder
-gzappend/   by Mark Adler <madler@alumni.caltech.edu>
+dotzlib/    by Henrik Ravn <henrik@ravn.com>
-        append to a gzip file -- illustrates the use of Z_BLOCK
+        Support for Microsoft .Net and Visual C++ .Net
 infback9/   by Mark Adler <madler@alumni.caltech.edu>
        Unsupported diffs to infback to decode the deflate64 format
@@ -42,12 +46,17 @@ masm686/    by Dan Higdon <hdan@kinesoft.com>
            and Chuck Walbourn <chuckw@kinesoft.com>
        asm code for Pentium Pro/PII, using the MASM syntax
 masmx64/    by Gilles Vollant <info@winimage.com>
 	x86 64-bit (AMD64 and Intel EM64t) code for x64 assembler to
 	replace longest_match() and inflate_fast()
 masmx86/    by Gilles Vollant <info@winimage.com>
        x86 asm code to replace longest_match() and inflate_fast(),
        for Visual C++ and MASM
 minizip/    by Gilles Vollant <info@winimage.com>
        Mini zip and unzip based on zlib
 	Includes Zip64 support by Mathias Svensson <mathias@result42.com>
        See http://www.winimage.com/zLibDll/unzip.html
 pascal/     by Bob Dellaca <bobdl@xtra.co.nz> et al.
@@ -60,11 +69,8 @@ puff/       by Mark Adler <madler@alumni.caltech.edu>
 testzlib/   by Gilles Vollant <info@winimage.com>
        Example of the use of zlib
-untgz/      by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+untgz/      by Pedro A. Aranda Gutierrez <paag@tid.es>
        A very simple tar.gz file extractor using zlib
 visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
        How to use compress(), uncompress() and the gz* functions from VB
 vstudio/    by Gilles Vollant <info@winimage.com>
-        Building zlib with Visual Studio .NET
+        Building a minizip-enhanced zlib with Microsoft Visual Studio
--- a/contrib/ada/buffer_demo.adb
+++ b/contrib/ada/buffer_demo.adb
@@ -0,0 +1,106 @@
 ----------------------------------------------------------------
 --  ZLib for Ada thick binding.                               --
 --                                                            --
 --  Copyright (C) 2002-2004 Dmitriy Anisimkov                 --
 --                                                            --
 --  Open source license information is in the zlib.ads file.  --
 ----------------------------------------------------------------
 --
 --  $Id: buffer_demo.adb,v 1.3 2004/09/06 06:55:35 vagul Exp $
 --  This demo program provided by Dr Steve Sangwine <sjs@essex.ac.uk>
 --
 --  Demonstration of a problem with Zlib-Ada (already fixed) when a buffer
 --  of exactly the correct size is used for decompressed data, and the last
 --  few bytes passed in to Zlib are checksum bytes.
 --  This program compresses a string of text, and then decompresses the
 --  compressed text into a buffer of the same size as the original text.
 with Ada.Streams; use Ada.Streams;
 with Ada.Text_IO;
 with ZLib; use ZLib;
 procedure Buffer_Demo is
   EOL  : Character renames ASCII.LF;
   Text : constant String
     := "Four score and seven years ago our fathers brought forth," & EOL &
        "upon this continent, a new nation, conceived in liberty," & EOL &
        "and dedicated to the proposition that `all men are created equal'.";
   Source : Stream_Element_Array (1 .. Text'Length);
   for Source'Address use Text'Address;
 begin
   Ada.Text_IO.Put (Text);
   Ada.Text_IO.New_Line;
   Ada.Text_IO.Put_Line
     ("Uncompressed size : " & Positive'Image (Text'Length) & " bytes");
   declare
      Compressed_Data : Stream_Element_Array (1 .. Text'Length);
      L               : Stream_Element_Offset;
   begin
      Compress : declare
         Compressor : Filter_Type;
         I : Stream_Element_Offset;
      begin
         Deflate_Init (Compressor);
         --  Compress the whole of T at once.
         Translate (Compressor, Source, I, Compressed_Data, L, Finish);
         pragma Assert (I = Source'Last);
         Close (Compressor);
         Ada.Text_IO.Put_Line
           ("Compressed size :   "
            & Stream_Element_Offset'Image (L) & " bytes");
      end Compress;
      --  Now we decompress the data, passing short blocks of data to Zlib
      --  (because this demonstrates the problem - the last block passed will
      --  contain checksum information and there will be no output, only a
      --  check inside Zlib that the checksum is correct).
      Decompress : declare
         Decompressor : Filter_Type;
         Uncompressed_Data : Stream_Element_Array (1 .. Text'Length);
         Block_Size : constant := 4;
         --  This makes sure that the last block contains
         --  only Adler checksum data.
         P : Stream_Element_Offset := Compressed_Data'First - 1;
         O : Stream_Element_Offset;
      begin
         Inflate_Init (Decompressor);
         loop
            Translate
              (Decompressor,
               Compressed_Data
                 (P + 1 .. Stream_Element_Offset'Min (P + Block_Size, L)),
               P,
               Uncompressed_Data
                 (Total_Out (Decompressor) + 1 .. Uncompressed_Data'Last),
               O,
               No_Flush);
               Ada.Text_IO.Put_Line
                 ("Total in : " & Count'Image (Total_In (Decompressor)) &
                  ", out : " & Count'Image (Total_Out (Decompressor)));
               exit when P = L;
         end loop;
         Ada.Text_IO.New_Line;
         Ada.Text_IO.Put_Line
           ("Decompressed text matches original text : "
             & Boolean'Image (Uncompressed_Data = Source));
      end Decompress;
   end;
 end Buffer_Demo;
--- a/contrib/ada/mtest.adb
+++ b/contrib/ada/mtest.adb
@@ -5,10 +5,10 @@
 --                                                            --
 --  Open source license information is in the zlib.ads file.  --
 ----------------------------------------------------------------
--  Continuous test for ZLib multithreading. If the test is fail
+--  Continuous test for ZLib multithreading. If the test would fail
--  Wou should provide thread safe allocation routines for the Z_Stream.
+--  we should provide thread safe allocation routines for the Z_Stream.
 --
--  $Id: mtest.adb,v 1.2 2003/08/12 12:11:05 vagul Exp $
+--  $Id: mtest.adb,v 1.4 2004/07/23 07:49:54 vagul Exp $
 with ZLib;
 with Ada.Streams;
@@ -148,6 +148,9 @@ procedure MTest is
   pragma Unreferenced (Test);
   Dummy : Character;
 begin
-   null;
+   Ada.Text_IO.Get_Immediate (Dummy);
   Stop := True;
 end MTest;
--- a/contrib/ada/read.adb
+++ b/contrib/ada/read.adb
@@ -6,7 +6,7 @@
 --  Open source license information is in the zlib.ads file.  --
 ----------------------------------------------------------------
--  $Id: read.adb,v 1.7 2003/08/12 12:12:35 vagul Exp $
+--  $Id: read.adb,v 1.8 2004/05/31 10:53:40 vagul Exp $
 --  Test/demo program for the generic read interface.
@@ -68,7 +68,11 @@ procedure Read is
   --  ZLib.Read
   --  reading data from the File_In.
-   procedure Read is new ZLib.Read (Read, Read_Buffer, Read_First, Read_Last);
+   procedure Read is new ZLib.Read
                           (Read,
                            Read_Buffer,
                            Rest_First => Read_First,
                            Rest_Last  => Read_Last);
   ----------
   -- Read --
@@ -103,6 +107,7 @@ procedure Read is
      Pack_Size := 0;
      Offset := 1;
      Read_First := Read_Buffer'Last + 1;
      Read_Last  := Read_Buffer'Last;
   end Reset;
 begin
--- a/contrib/ada/readme.txt
+++ b/contrib/ada/readme.txt
@@ -1,23 +1,34 @@
-
+                        ZLib for Ada thick binding (ZLib.Ada)
-			ZLib for Ada thick binding (ZLib.Ada)
+                        Release 1.3
 			Release 1.2
 ZLib.Ada is a thick binding interface to the popular ZLib data
 compression library, available at http://www.gzip.org/zlib/.
 It provides Ada-style access to the ZLib C library.
-	Here are the main changes since ZLib.Ada 1.1:
+        Here are the main changes since ZLib.Ada 1.2:
- The default header type has a name "Default" now. Auto is used only for
+- Attension: ZLib.Read generic routine have a initialization requirement
-  automatic GZip/ZLib header detection.
+  for Read_Last parameter now. It is a bit incompartible with previous version,
  but extends functionality, we could use new parameters Allow_Read_Some and
  Flush now.
- Added test for multitasking mtest.adb.
+- Added Is_Open routines to ZLib and ZLib.Streams packages.
- Added GNAT project file zlib.gpr.
+- Add pragma Assert to check Stream_Element is 8 bit.
 - Fix extraction to buffer with exact known decompressed size. Error reported by
  Steve Sangwine.
 - Fix definition of ULong (changed to unsigned_long), fix regression on 64 bits
  computers. Patch provided by Pascal Obry.
 - Add Status_Error exception definition.
 - Add pragma Assertion that Ada.Streams.Stream_Element size is 8 bit.
-	How to build ZLib.Ada under GNAT
+        How to build ZLib.Ada under GNAT
 You should have the ZLib library already build on your computer, before
 building ZLib.Ada. Make the directory of ZLib.Ada sources current and
@@ -30,7 +41,7 @@ Or use the GNAT project file build for GNAT 3.15 or later:
  gnatmake -Pzlib.gpr -L<directory where libz.a is>
-	How to build ZLib.Ada under Aonix ObjectAda for Win32 7.2.2
+        How to build ZLib.Ada under Aonix ObjectAda for Win32 7.2.2
 1. Make a project with all *.ads and *.adb files from the distribution.
 2. Build the libz.a library from the ZLib C sources.
@@ -40,7 +51,7 @@ Or use the GNAT project file build for GNAT 3.15 or later:
 6. Build the executable using test.adb as a main procedure.
-	How to use ZLib.Ada
+        How to use ZLib.Ada
 The source files test.adb and read.adb are small demo programs that show
 the main functionality of ZLib.Ada.
@@ -50,3 +61,5 @@ The routines from the package specifications are commented.
 Homepage: http://zlib-ada.sourceforge.net/
 Author: Dmitriy Anisimkov <anisimkov@yahoo.com>
 Contributors: Pascal Obry <pascal@obry.org>, Steve Sangwine <sjs@essex.ac.uk>
--- a/contrib/ada/zlib-streams.adb
+++ b/contrib/ada/zlib-streams.adb
@@ -6,7 +6,7 @@
 --  Open source license information is in the zlib.ads file.  --
 ----------------------------------------------------------------
--  $Id: zlib-streams.adb,v 1.9 2003/08/12 13:15:31 vagul Exp $
+--  $Id: zlib-streams.adb,v 1.10 2004/05/31 10:53:40 vagul Exp $
 with Ada.Unchecked_Deallocation;
@@ -90,6 +90,7 @@ package body ZLib.Streams is
         Stream.Buffer     := new Buffer_Subtype;
         Stream.Rest_First := Stream.Buffer'Last + 1;
         Stream.Rest_Last  := Stream.Buffer'Last;
      end if;
   end Create;
@@ -113,6 +114,15 @@ package body ZLib.Streams is
      end loop;
   end Flush;
   -------------
   -- Is_Open --
   -------------
   function Is_Open (Stream : Stream_Type) return Boolean is
   begin
      return Is_Open (Stream.Reader) or else Is_Open (Stream.Writer);
   end Is_Open;
   ----------
   -- Read --
   ----------
--- a/contrib/ada/zlib-streams.ads
+++ b/contrib/ada/zlib-streams.ads
@@ -6,7 +6,7 @@
 --  Open source license information is in the zlib.ads file.  --
 ----------------------------------------------------------------
--  $Id: zlib-streams.ads,v 1.11 2003/08/12 13:15:31 vagul Exp $
+--  $Id: zlib-streams.ads,v 1.12 2004/05/31 10:53:40 vagul Exp $
 package ZLib.Streams is
@@ -77,6 +77,8 @@ package ZLib.Streams is
   --  !!! When the Need_Header is False ZLib-Ada is using undocumented
   --  ZLib 1.1.4 functionality to do not create/wait for ZLib headers.
   function Is_Open (Stream : Stream_Type) return Boolean;
   procedure Close (Stream : in out Stream_Type);
 private
--- a/contrib/ada/zlib-thin.adb
+++ b/contrib/ada/zlib-thin.adb
@@ -6,12 +6,11 @@
 --  Open source license information is in the zlib.ads file.  --
 ----------------------------------------------------------------
--  $Id: zlib-thin.adb,v 1.6 2003/01/21 15:26:37 vagul Exp $
+--  $Id: zlib-thin.adb,v 1.8 2003/12/14 18:27:31 vagul Exp $
 package body ZLib.Thin is
-   ZLIB_VERSION : constant Chars_Ptr :=
+   ZLIB_VERSION  : constant Chars_Ptr := zlibVersion;
      Interfaces.C.Strings.New_String ("1.1.4");
   Z_Stream_Size : constant Int := Z_Stream'Size / System.Storage_Unit;
@@ -37,14 +36,6 @@ package body ZLib.Thin is
   -- Deflate_Init --
   ------------------
   function Deflate_Init
     (strm  : in Z_Streamp;
      level : in Int := Z_DEFAULT_COMPRESSION)
      return  Int is
   begin
      return deflateInit (strm, level, ZLIB_VERSION, Z_Stream_Size);
   end Deflate_Init;
   function Deflate_Init
     (strm       : Z_Streamp;
      level      : Int;
@@ -69,16 +60,15 @@ package body ZLib.Thin is
   -- Inflate_Init --
   ------------------
   function Inflate_Init (strm : Z_Streamp) return Int is
   begin
      return inflateInit (strm, ZLIB_VERSION, Z_Stream_Size);
   end Inflate_Init;
   function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int is
   begin
      return inflateInit2 (strm, windowBits, ZLIB_VERSION, Z_Stream_Size);
   end Inflate_Init;
   ------------------------
   -- Last_Error_Message --
   ------------------------
   function Last_Error_Message (Strm : in Z_Stream) return String is
      use Interfaces.C.Strings;
   begin
@@ -89,54 +79,28 @@ package body ZLib.Thin is
      end if;
   end Last_Error_Message;
   -------------
   -- Need_In --
   -------------
   function Need_In (strm : Z_Stream) return Boolean is
   begin
      return strm.Avail_In = 0;
   end Need_In;
   --------------
   -- Need_Out --
   --------------
   function Need_Out (strm : Z_Stream) return Boolean is
   begin
      return strm.Avail_Out = 0;
   end Need_Out;
   ------------
   -- Set_In --
   ------------
   procedure Set_In
     (Strm   : in out Z_Stream;
-      Buffer : in Byte_Access;
+      Buffer : in     Voidp;
-      Size   : in UInt) is
+      Size   : in     UInt) is
   begin
      Strm.Next_In  := Buffer;
      Strm.Avail_In := Size;
   end Set_In;
   procedure Set_In
     (Strm   : in out Z_Stream;
      Buffer : in Voidp;
      Size   : in UInt) is
   begin
      Set_In (Strm, Bytes.To_Pointer (Buffer), Size);
   end Set_In;
   ------------------
   -- Set_Mem_Func --
   ------------------
   procedure Set_Mem_Func
     (Strm   : in out Z_Stream;
-      Opaque : in Voidp;
+      Opaque : in     Voidp;
-      Alloc  : in alloc_func;
+      Alloc  : in     alloc_func;
-      Free   : in free_func) is
+      Free   : in     free_func) is
   begin
      Strm.opaque := Opaque;
      Strm.zalloc := Alloc;
@@ -149,21 +113,13 @@ package body ZLib.Thin is
   procedure Set_Out
     (Strm   : in out Z_Stream;
-      Buffer : in Byte_Access;
+      Buffer : in     Voidp;
-      Size   : in UInt) is
+      Size   : in     UInt) is
   begin
      Strm.Next_Out  := Buffer;
      Strm.Avail_Out := Size;
   end Set_Out;
   procedure Set_Out
     (Strm   : in out Z_Stream;
      Buffer : in Voidp;
      Size   : in UInt) is
   begin
      Set_Out (Strm, Bytes.To_Pointer (Buffer), Size);
   end Set_Out;
   --------------
   -- Total_In --
   --------------
--- a/contrib/ada/zlib-thin.ads
+++ b/contrib/ada/zlib-thin.ads
@@ -6,10 +6,11 @@
 --  Open source license information is in the zlib.ads file.  --
 ----------------------------------------------------------------
--  $Id: zlib-thin.ads,v 1.8 2003/08/12 13:16:51 vagul Exp $
+--  $Id: zlib-thin.ads,v 1.11 2004/07/23 06:33:11 vagul Exp $
 with Interfaces.C.Strings;
-with System.Address_To_Access_Conversions;
+
 with System;
 private package ZLib.Thin is
@@ -36,18 +37,18 @@ private package ZLib.Thin is
                                                --  zconf.h:216
   type Int is new Interfaces.C.int;
-   type ULong is new Interfaces.C.unsigned;     --  32 bits or more
+   type ULong is new Interfaces.C.unsigned_long;     --  32 bits or more
-                                                --  zconf.h:217
+                                                     --  zconf.h:217
   subtype Chars_Ptr is Interfaces.C.Strings.chars_ptr;
   type ULong_Access is access ULong;
   type Int_Access is access Int;
   subtype Voidp is System.Address;            --  zconf.h:232
-   package Bytes is new System.Address_To_Access_Conversions (Byte);
+   subtype Byte_Access is Voidp;
   subtype Byte_Access is Bytes.Object_Pointer;
   Nul : constant Voidp := System.Null_Address;
   --  end from zconf
   Z_NO_FLUSH : constant := 8#0000#;   --  zlib.h:125
@@ -146,17 +147,6 @@ private package ZLib.Thin is
      strategy : Int)
      return     Int;       -- zlib.h:506
   function deflateBound
     (strm     : Z_Streamp;
      sourceLen : ULong)
      return     Int;       -- zlib.h:595
   function deflatePrime
     (strm     : Z_Streamp;
      bits     : Int;
      value    : Int)
      return     Int;       -- zlib.h:604
   function inflateSetDictionary
     (strm       : Z_Streamp;
      dictionary : Byte_Access;
@@ -262,12 +252,6 @@ private package ZLib.Thin is
      stream_size : Int)
      return        Int;
   function Deflate_Init
     (strm  : in Z_Streamp;
      level : in Int := Z_DEFAULT_COMPRESSION)
      return  Int;
   pragma Inline (Deflate_Init);
   function deflateInit2
     (strm        : Z_Streamp;
      level       : Int;
@@ -295,9 +279,6 @@ private package ZLib.Thin is
      stream_size : Int)
      return        Int;
   function Inflate_Init (strm : Z_Streamp) return Int;
   pragma Inline (Inflate_Init);
   function inflateInit2
     (strm        : in Z_Streamp;
      windowBits  : in Int;
@@ -329,32 +310,12 @@ private package ZLib.Thin is
   --  has dropped to zero. The application must initialize zalloc, zfree and
   --  opaque before calling the init function.
   function Need_In (strm : in Z_Stream) return Boolean;
   --  return true when we do not need to setup Next_In and Avail_In fields.
   pragma Inline (Need_In);
   function Need_Out (strm : in Z_Stream) return Boolean;
   --  return true when we do not need to setup Next_Out and Avail_Out field.
   pragma Inline (Need_Out);
   procedure Set_In
     (Strm   : in out Z_Stream;
      Buffer : in Byte_Access;
      Size   : in UInt);
   pragma Inline (Set_In);
   procedure Set_In
     (Strm   : in out Z_Stream;
      Buffer : in Voidp;
      Size   : in UInt);
   pragma Inline (Set_In);
   procedure Set_Out
     (Strm   : in out Z_Stream;
      Buffer : in Byte_Access;
      Size   : in UInt);
   pragma Inline (Set_Out);
   procedure Set_Out
     (Strm   : in out Z_Stream;
      Buffer : in Voidp;
@@ -402,10 +363,10 @@ private package ZLib.Thin is
 private
   type Z_Stream is record            -- zlib.h:68
-      Next_In   : Byte_Access;        -- next input byte
+      Next_In   : Voidp      := Nul;  -- next input byte
      Avail_In  : UInt       := 0;    -- number of bytes available at next_in
      Total_In  : ULong      := 0;    -- total nb of input bytes read so far
-      Next_Out  : Byte_Access;        -- next output byte should be put there
+      Next_Out  : Voidp      := Nul;  -- next output byte should be put there
      Avail_Out : UInt       := 0;    -- remaining free space at next_out
      Total_Out : ULong      := 0;    -- total nb of bytes output so far
      msg       : Chars_Ptr;          -- last error message, NULL if no error
@@ -432,8 +393,6 @@ private
   pragma Import (C, deflateCopy, "deflateCopy");
   pragma Import (C, deflateReset, "deflateReset");
   pragma Import (C, deflateParams, "deflateParams");
   pragma Import (C, deflateBound, "deflateBound");
   pragma Import (C, deflatePrime, "deflatePrime");
   pragma Import (C, inflateSetDictionary, "inflateSetDictionary");
   pragma Import (C, inflateSync, "inflateSync");
   pragma Import (C, inflateReset, "inflateReset");
--- a/contrib/ada/zlib.adb
+++ b/contrib/ada/zlib.adb
@@ -1,12 +1,12 @@
 ----------------------------------------------------------------
 --  ZLib for Ada thick binding.                               --
 --                                                            --
--  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
+--  Copyright (C) 2002-2004 Dmitriy Anisimkov                 --
 --                                                            --
 --  Open source license information is in the zlib.ads file.  --
 ----------------------------------------------------------------
--  $Id: zlib.adb,v 1.19 2003/07/13 16:02:19 vagul Exp $
+--  $Id: zlib.adb,v 1.31 2004/09/06 06:53:19 vagul Exp $
 with Ada.Exceptions;
 with Ada.Unchecked_Conversion;
@@ -34,7 +34,7 @@ package body ZLib is
       VERSION_ERROR);
   type Flate_Step_Function is access
-     function (Strm : Thin.Z_Streamp; flush : Thin.Int) return Thin.Int;
+     function (Strm : in Thin.Z_Streamp; Flush : in Thin.Int) return Thin.Int;
   pragma Convention (C, Flate_Step_Function);
   type Flate_End_Function is access
@@ -82,13 +82,13 @@ package body ZLib is
   Flush_Finish : constant array (Boolean) of Flush_Mode
     := (True => Finish, False => No_Flush);
-   procedure Raise_Error (Stream : Z_Stream);
+   procedure Raise_Error (Stream : in Z_Stream);
   pragma Inline (Raise_Error);
-   procedure Raise_Error (Message : String);
+   procedure Raise_Error (Message : in String);
   pragma Inline (Raise_Error);
-   procedure Check_Error (Stream : Z_Stream; Code : Thin.Int);
+   procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int);
   procedure Free is new Ada.Unchecked_Deallocation
      (Z_Stream, Z_Stream_Access);
@@ -118,7 +118,7 @@ package body ZLib is
   -- Check_Error --
   -----------------
-   procedure Check_Error (Stream : Z_Stream; Code : Thin.Int) is
+   procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int) is
      use type Thin.Int;
   begin
      if Code /= Thin.Z_OK then
@@ -138,10 +138,11 @@ package body ZLib is
   is
      Code : Thin.Int;
   begin
-      Code := Flate (Filter.Compression).Done
+      if not Ignore_Error and then not Is_Open (Filter) then
-          (To_Thin_Access (Filter.Strm));
+         raise Status_Error;
      end if;
-      Filter.Opened := False;
+      Code := Flate (Filter.Compression).Done (To_Thin_Access (Filter.Strm));
      if Ignore_Error or else Code = Thin.Z_OK then
         Free (Filter.Strm);
@@ -154,7 +155,7 @@ package body ZLib is
            Ada.Exceptions.Raise_Exception
               (ZLib_Error'Identity,
                Return_Code_Enum'Image (Return_Code (Code))
-                & ": " & Error_Message);
+                  & ": " & Error_Message);
         end;
      end if;
   end Close;
@@ -170,10 +171,9 @@ package body ZLib is
   is
      use Thin;
   begin
-      return Unsigned_32 (crc32
+      return Unsigned_32 (crc32 (ULong (CRC),
-        (ULong (CRC),
+                                 Data'Address,
-         Bytes.To_Pointer (Data'Address),
+                                 Data'Length));
         Data'Length));
   end CRC32;
   procedure CRC32
@@ -192,13 +192,17 @@ package body ZLib is
      Level        : in     Compression_Level  := Default_Compression;
      Strategy     : in     Strategy_Type      := Default_Strategy;
      Method       : in     Compression_Method := Deflated;
-      Window_Bits  : in     Window_Bits_Type   := 15;
+      Window_Bits  : in     Window_Bits_Type   := Default_Window_Bits;
-      Memory_Level : in     Memory_Level_Type  := 8;
+      Memory_Level : in     Memory_Level_Type  := Default_Memory_Level;
      Header       : in     Header_Type        := Default)
   is
      use type Thin.Int;
      Win_Bits : Thin.Int := Thin.Int (Window_Bits);
   begin
      if Is_Open (Filter) then
         raise Status_Error;
      end if;
      --  We allow ZLib to make header only in case of default header type.
      --  Otherwise we would either do header by ourselfs, or do not do
      --  header at all.
@@ -216,10 +220,9 @@ package body ZLib is
         Filter.Offset := Simple_GZip_Header'Last + 1;
      end if;
-      Filter.Strm := new Z_Stream;
+      Filter.Strm        := new Z_Stream;
      Filter.Compression := True;
      Filter.Stream_End  := False;
      Filter.Opened      := True;
      Filter.Header      := Header;
      if Thin.Deflate_Init
@@ -255,18 +258,18 @@ package body ZLib is
   -----------------------
   procedure Generic_Translate
-     (Filter : in out ZLib.Filter_Type;
+     (Filter          : in out ZLib.Filter_Type;
-      In_Buffer_Size  : Integer := Default_Buffer_Size;
+      In_Buffer_Size  : in     Integer := Default_Buffer_Size;
-      Out_Buffer_Size : Integer := Default_Buffer_Size)
+      Out_Buffer_Size : in     Integer := Default_Buffer_Size)
   is
-      In_Buffer : Stream_Element_Array
+      In_Buffer  : Stream_Element_Array
-         (1 .. Stream_Element_Offset (In_Buffer_Size));
+                     (1 .. Stream_Element_Offset (In_Buffer_Size));
      Out_Buffer : Stream_Element_Array
-        (1 .. Stream_Element_Offset (Out_Buffer_Size));
+                     (1 .. Stream_Element_Offset (Out_Buffer_Size));
-      Last : Stream_Element_Offset;
+      Last       : Stream_Element_Offset;
-      In_Last : Stream_Element_Offset;
+      In_Last    : Stream_Element_Offset;
-      In_First : Stream_Element_Offset;
+      In_First   : Stream_Element_Offset;
-      Out_Last : Stream_Element_Offset;
+      Out_Last   : Stream_Element_Offset;
   begin
      Main : loop
         Data_In (In_Buffer, Last);
@@ -275,18 +278,21 @@ package body ZLib is
         loop
            Translate
-              (Filter,
+              (Filter   => Filter,
-               In_Buffer (In_First .. Last),
+               In_Data  => In_Buffer (In_First .. Last),
-               In_Last,
+               In_Last  => In_Last,
-               Out_Buffer,
+               Out_Data => Out_Buffer,
-               Out_Last,
+               Out_Last => Out_Last,
-               Flush_Finish (Last < In_Buffer'First));
+               Flush    => Flush_Finish (Last < In_Buffer'First));
-            Data_Out (Out_Buffer (Out_Buffer'First .. Out_Last));
+            if Out_Buffer'First <= Out_Last then
               Data_Out (Out_Buffer (Out_Buffer'First .. Out_Last));
            end if;
            exit Main when Stream_End (Filter);
            --  The end of in buffer.
            exit when In_Last = Last;
            In_First := In_Last + 1;
@@ -301,7 +307,7 @@ package body ZLib is
   procedure Inflate_Init
     (Filter      : in out Filter_Type;
-      Window_Bits : in     Window_Bits_Type := 15;
+      Window_Bits : in     Window_Bits_Type := Default_Window_Bits;
      Header      : in     Header_Type      := Default)
   is
      use type Thin.Int;
@@ -320,6 +326,10 @@ package body ZLib is
      end Check_Version;
   begin
      if Is_Open (Filter) then
         raise Status_Error;
      end if;
      case Header is
         when None =>
            Check_Version;
@@ -344,10 +354,9 @@ package body ZLib is
         when Default => null;
      end case;
-      Filter.Strm := new Z_Stream;
+      Filter.Strm        := new Z_Stream;
      Filter.Compression := False;
      Filter.Stream_End  := False;
      Filter.Opened      := True;
      Filter.Header      := Header;
      if Thin.Inflate_Init
@@ -357,16 +366,25 @@ package body ZLib is
      end if;
   end Inflate_Init;
   -------------
   -- Is_Open --
   -------------
   function Is_Open (Filter : in Filter_Type) return Boolean is
   begin
      return Filter.Strm /= null;
   end Is_Open;
   -----------------
   -- Raise_Error --
   -----------------
-   procedure Raise_Error (Message : String) is
+   procedure Raise_Error (Message : in String) is
   begin
      Ada.Exceptions.Raise_Exception (ZLib_Error'Identity, Message);
   end Raise_Error;
-   procedure Raise_Error (Stream : Z_Stream) is
+   procedure Raise_Error (Stream : in Z_Stream) is
   begin
      Raise_Error (Last_Error_Message (Stream));
   end Raise_Error;
@@ -378,21 +396,29 @@ package body ZLib is
   procedure Read
     (Filter : in out Filter_Type;
      Item   :    out Ada.Streams.Stream_Element_Array;
-      Last   :    out Ada.Streams.Stream_Element_Offset)
+      Last   :    out Ada.Streams.Stream_Element_Offset;
      Flush  : in     Flush_Mode := No_Flush)
   is
      In_Last    : Stream_Element_Offset;
      Item_First : Ada.Streams.Stream_Element_Offset := Item'First;
      V_Flush    : Flush_Mode := Flush;
   begin
      pragma Assert (Rest_First in Buffer'First .. Buffer'Last + 1);
      pragma Assert (Rest_Last in Buffer'First - 1 .. Buffer'Last);
      loop
-         if Rest_First > Buffer'Last then
+         if Rest_Last = Buffer'First - 1 then
            V_Flush := Finish;
         elsif Rest_First > Rest_Last then
            Read (Buffer, Rest_Last);
            Rest_First := Buffer'First;
         end if;
-         pragma Assert (Rest_Last in Buffer'First - 1 .. Buffer'Last);
+            if Rest_Last < Buffer'First then
               V_Flush := Finish;
            end if;
         end if;
         Translate
           (Filter   => Filter,
@@ -400,11 +426,13 @@ package body ZLib is
            In_Last  => In_Last,
            Out_Data => Item (Item_First .. Item'Last),
            Out_Last => Last,
-            Flush    => Flush_Finish (Rest_Last < Rest_First));
+            Flush    => V_Flush);
         Rest_First := In_Last + 1;
-         exit when Last = Item'Last or else Stream_End (Filter);
+         exit when Stream_End (Filter)
           or else Last = Item'Last
           or else (Last >= Item'First and then Allow_Read_Some);
         Item_First := Last + 1;
      end loop;
@@ -489,11 +517,11 @@ package body ZLib is
      Code : Thin.Int;
   begin
-      if Filter.Opened = False then
+      if not Is_Open (Filter) then
-         raise ZLib_Error;
+         raise Status_Error;
      end if;
-      if Out_Data'Length = 0 then
+      if Out_Data'Length = 0 and then In_Data'Length = 0 then
         raise Constraint_Error;
      end if;
@@ -514,7 +542,6 @@ package body ZLib is
         - Stream_Element_Offset (Avail_In (Filter.Strm.all));
      Out_Last := Out_Data'Last
         - Stream_Element_Offset (Avail_Out (Filter.Strm.all));
   end Translate_Auto;
   --------------------
@@ -529,7 +556,7 @@ package body ZLib is
      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
      Flush     : in     Flush_Mode)
   is
-      Out_First  : Stream_Element_Offset;
+      Out_First : Stream_Element_Offset;
      procedure Add_Data (Data : in Stream_Element_Array);
      --  Add data to stream from the Filter.Offset till necessary,
@@ -596,7 +623,7 @@ package body ZLib is
         Add_Data (Simple_GZip_Header);
         Translate_Auto
-           (Filter => Filter,
+           (Filter   => Filter,
            In_Data  => In_Data,
            In_Last  => In_Last,
            Out_Data => Out_Data (Out_First .. Out_Data'Last),
@@ -604,7 +631,6 @@ package body ZLib is
            Flush    => Flush);
         CRC32 (Filter.CRC, In_Data (In_Data'First .. In_Last));
      end if;
      if Filter.Stream_End and then Out_Last <= Out_Data'Last then
@@ -642,10 +668,11 @@ package body ZLib is
   procedure Write
     (Filter : in out Filter_Type;
      Item   : in     Ada.Streams.Stream_Element_Array;
-      Flush  : in     Flush_Mode)
+      Flush  : in     Flush_Mode := No_Flush)
   is
-      Buffer : Stream_Element_Array (1 .. Buffer_Size);
+      Buffer   : Stream_Element_Array (1 .. Buffer_Size);
-      In_Last, Out_Last : Stream_Element_Offset;
+      In_Last  : Stream_Element_Offset;
      Out_Last : Stream_Element_Offset;
      In_First : Stream_Element_Offset := Item'First;
   begin
      if Item'Length = 0 and Flush = No_Flush then
@@ -654,7 +681,7 @@ package body ZLib is
      loop
         Translate
-           (Filter => Filter,
+           (Filter   => Filter,
            In_Data  => Item (In_First .. Item'Last),
            In_Last  => In_Last,
            Out_Data => Buffer,
--- a/contrib/ada/zlib.ads
+++ b/contrib/ada/zlib.ads
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                      ZLib for Ada thick binding.                         --
 --                                                                          --
--              Copyright (C) 2002-2003 Dmitriy Anisimkov                   --
+--              Copyright (C) 2002-2004 Dmitriy Anisimkov                   --
 --                                                                          --
 --  This library is free software; you can redistribute it and/or modify    --
 --  it under the terms of the GNU General Public License as published by    --
@@ -25,7 +25,7 @@
 --  covered by the  GNU Public License.                                     --
 ------------------------------------------------------------------------------
--  $Id: zlib.ads,v 1.17 2003/08/12 13:19:07 vagul Exp $
+--  $Id: zlib.ads,v 1.26 2004/09/06 06:53:19 vagul Exp $
 with Ada.Streams;
@@ -33,7 +33,8 @@ with Interfaces;
 package ZLib is
-   ZLib_Error : exception;
+   ZLib_Error   : exception;
   Status_Error : exception;
   type Compression_Level is new Integer range -1 .. 9;
@@ -55,12 +56,15 @@ package ZLib is
   subtype Count is Ada.Streams.Stream_Element_Count;
   Default_Memory_Level : constant Memory_Level_Type := 8;
   Default_Window_Bits  : constant Window_Bits_Type  := 15;
   ----------------------------------
   -- Compression method constants --
   ----------------------------------
   Deflated : constant Compression_Method;
-   --  Only one method allowed in this ZLib version.
+   --  Only one method allowed in this ZLib version
   ---------------------------------
   -- Compression level constants --
@@ -79,21 +83,29 @@ package ZLib is
   --  Regular way for compression, no flush
   Partial_Flush : constant Flush_Mode;
-   --  will be removed, use Z_SYNC_FLUSH instead
+   --  Will be removed, use Z_SYNC_FLUSH instead
   Sync_Flush    : constant Flush_Mode;
-   --  all pending output is flushed to the output buffer and the output
+   --  All pending output is flushed to the output buffer and the output
   --  is aligned on a byte boundary, so that the decompressor can get all
   --  input data available so far. (In particular avail_in is zero after the
   --  call if enough output space has been provided  before the call.)
   --  Flushing may degrade compression for some compression algorithms and so
   --  it should be used only when necessary.
   Block_Flush   : constant Flush_Mode;
   --  Z_BLOCK requests that inflate() stop
   --  if and when it get to the next deflate block boundary. When decoding the
   --  zlib or gzip format, this will cause inflate() to return immediately
   --  after the header and before the first block. When doing a raw inflate,
   --  inflate() will go ahead and process the first block, and will return
   --  when it gets to the end of that block, or when it runs out of data.
   Full_Flush    : constant Flush_Mode;
-   --  all output is flushed as with SYNC_FLUSH, and the compression state
+   --  All output is flushed as with SYNC_FLUSH, and the compression state
   --  is reset so that decompression can restart from this point if previous
   --  compressed data has been damaged or if random access is desired. Using
-   --  FULL_FLUSH too often can seriously degrade the compression.
+   --  Full_Flush too often can seriously degrade the compression.
   Finish        : constant Flush_Mode;
   --  Just for tell the compressor that input data is complete.
@@ -111,7 +123,7 @@ package ZLib is
   Default_Buffer_Size : constant := 4096;
-   type Filter_Type is limited private;
+   type Filter_Type is tagged limited private;
   --  The filter is for compression and for decompression.
   --  The usage of the type is depend of its initialization.
@@ -124,8 +136,8 @@ package ZLib is
      Level        : in     Compression_Level  := Default_Compression;
      Strategy     : in     Strategy_Type      := Default_Strategy;
      Method       : in     Compression_Method := Deflated;
-      Window_Bits  : in     Window_Bits_Type   := 15;
+      Window_Bits  : in     Window_Bits_Type   := Default_Window_Bits;
-      Memory_Level : in     Memory_Level_Type  := 8;
+      Memory_Level : in     Memory_Level_Type  := Default_Memory_Level;
      Header       : in     Header_Type        := Default);
   --  Compressor initialization.
   --  When Header parameter is Auto or Default, then default zlib header
@@ -136,7 +148,7 @@ package ZLib is
   procedure Inflate_Init
     (Filter      : in out Filter_Type;
-      Window_Bits : in     Window_Bits_Type := 15;
+      Window_Bits : in     Window_Bits_Type := Default_Window_Bits;
      Header      : in     Header_Type      := Default);
   --  Decompressor initialization.
   --  Default header type mean that ZLib default header is expecting in the
@@ -146,10 +158,14 @@ package ZLib is
   --  input compressed stream.
   --  Auto header type mean that header type (GZip or Native) would be
   --  detected automatically in the input stream.
-   --  Note that header types parameter values None, GZip and Auto is
+   --  Note that header types parameter values None, GZip and Auto are
-   --  supporting for inflate routine only in ZLib versions 1.2.0.2 and later.
+   --  supported for inflate routine only in ZLib versions 1.2.0.2 and later.
   --  Deflate_Init is supporting all header types.
   function Is_Open (Filter : in Filter_Type) return Boolean;
   pragma Inline (Is_Open);
   --  Is the filter opened for compression or decompression.
   procedure Close
     (Filter       : in out Filter_Type;
      Ignore_Error : in     Boolean := False);
@@ -167,31 +183,31 @@ package ZLib is
     (Filter          : in out Filter_Type;
      In_Buffer_Size  : in     Integer := Default_Buffer_Size;
      Out_Buffer_Size : in     Integer := Default_Buffer_Size);
-   --  Compressing/decompressing data arrived from Data_In routine
+   --  Compress/decompress data fetch from Data_In routine and pass the result
   --  to the Data_Out routine. User should provide Data_In and Data_Out
   --  for compression/decompression data flow.
-   --  Compression or decompression depend on initialization of Filter.
+   --  Compression or decompression depend on Filter initialization.
   function Total_In (Filter : in Filter_Type) return Count;
   pragma Inline (Total_In);
-   --  Return total number of input bytes read so far.
+   --  Returns total number of input bytes read so far
   function Total_Out (Filter : in Filter_Type) return Count;
   pragma Inline (Total_Out);
-   --  Return total number of bytes output so far.
+   --  Returns total number of bytes output so far
   function CRC32
     (CRC    : in Unsigned_32;
      Data   : in Ada.Streams.Stream_Element_Array)
      return Unsigned_32;
   pragma Inline (CRC32);
-   --  Calculate CRC32, it could be necessary for make gzip format.
+   --  Compute CRC32, it could be necessary for make gzip format
   procedure CRC32
     (CRC  : in out Unsigned_32;
      Data : in     Ada.Streams.Stream_Element_Array);
   pragma Inline (CRC32);
-   --  Calculate CRC32, it could be necessary for make gzip format.
+   --  Compute CRC32, it could be necessary for make gzip format
   -------------------------------------------------
   --  Below is more complex low level routines.  --
@@ -204,15 +220,11 @@ package ZLib is
      Out_Data  :    out Ada.Streams.Stream_Element_Array;
      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
      Flush     : in     Flush_Mode);
-   --  Compressing/decompressing the datas from In_Data buffer to the
+   --  Compress/decompress the In_Data buffer and place the result into
-   --  Out_Data buffer.
+   --  Out_Data. In_Last is the index of last element from In_Data accepted by
-   --  In_Data is incoming data portion,
+   --  the Filter. Out_Last is the last element of the received data from
-   --  In_Last is the index of last element from In_Data accepted by the
+   --  Filter. To tell the filter that incoming data are complete put the
-   --  Filter.
+   --  Flush parameter to Finish.
   --  Out_Data is the buffer for output data from the filter.
   --  Out_Last is the last element of the received data from Filter.
   --  To tell the filter that incoming data is complete put the
   --  Flush parameter to FINISH.
   function Stream_End (Filter : in Filter_Type) return Boolean;
   pragma Inline (Stream_End);
@@ -239,10 +251,9 @@ package ZLib is
   procedure Write
     (Filter  : in out Filter_Type;
      Item    : in     Ada.Streams.Stream_Element_Array;
-      Flush   : in     Flush_Mode);
+      Flush   : in     Flush_Mode := No_Flush);
-   --  Compressing/Decompressing data from Item to the
+   --  Compress/Decompress data from Item to the generic parameter procedure
-   --  generic parameter procedure Write.
+   --  Write. Output buffer size could be set in Buffer_Size generic parameter.
   --  Output buffer size could be set in Buffer_Size generic parameter.
   generic
      with procedure Read
@@ -257,33 +268,41 @@ package ZLib is
      Rest_First, Rest_Last : in out Ada.Streams.Stream_Element_Offset;
      --  Rest_First have to be initialized to Buffer'Last + 1
      --  Rest_Last have to be initialized to Buffer'Last
      --  before usage.
      Allow_Read_Some : in Boolean := False;
      --  Is it allowed to return Last < Item'Last before end of data.
   procedure Read
     (Filter : in out Filter_Type;
      Item   :    out Ada.Streams.Stream_Element_Array;
-      Last   :    out Ada.Streams.Stream_Element_Offset);
+      Last   :    out Ada.Streams.Stream_Element_Offset;
-   --  Compressing/Decompressing data from generic parameter
+      Flush  : in     Flush_Mode := No_Flush);
-   --  procedure Read to the Item.
+   --  Compress/Decompress data from generic parameter procedure Read to the
-   --  User should provide Buffer for the operation
+   --  Item. User should provide Buffer and initialized Rest_First, Rest_Last
-   --  and Rest_First variable first time initialized to the Buffer'Last + 1.
+   --  indicators. If Allow_Read_Some is True, Read routines could return
   --  Last < Item'Last only at end of stream.
 private
   use Ada.Streams;
-   type Flush_Mode is new Integer range 0 .. 4;
+   pragma Assert (Ada.Streams.Stream_Element'Size    =    8);
   pragma Assert (Ada.Streams.Stream_Element'Modulus = 2**8);
   type Flush_Mode is new Integer range 0 .. 5;
   type Compression_Method is new Integer range 8 .. 8;
   type Strategy_Type is new Integer range 0 .. 3;
   No_Flush      : constant Flush_Mode := 0;
   Partial_Flush : constant Flush_Mode := 1;
   Sync_Flush    : constant Flush_Mode := 2;
   Full_Flush    : constant Flush_Mode := 3;
   Finish        : constant Flush_Mode := 4;
-   Partial_Flush : constant Flush_Mode := 1;
+   Block_Flush   : constant Flush_Mode := 5;
   --  will be removed, use Z_SYNC_FLUSH instead
   Filtered         : constant Strategy_Type := 1;
   Huffman_Only     : constant Strategy_Type := 2;
@@ -296,7 +315,7 @@ private
   type Z_Stream_Access is access all Z_Stream;
-   type Filter_Type is record
+   type Filter_Type is tagged limited record
      Strm        : Z_Stream_Access;
      Compression : Boolean;
      Stream_End  : Boolean;
@@ -304,8 +323,6 @@ private
      CRC         : Unsigned_32;
      Offset      : Stream_Element_Offset;
      --  Offset for gzip header/footer output.
      Opened      : Boolean := False;
   end record;
 end ZLib;
--- a/contrib/ada/zlib.gpr
+++ b/contrib/ada/zlib.gpr
@@ -3,10 +3,10 @@ project Zlib is
   for Languages use ("Ada");
   for Source_Dirs use (".");
   for Object_Dir use ".";
-   for Main use ("test.adb", "mtest.adb", "read.adb");
+   for Main use ("test.adb", "mtest.adb", "read.adb", "buffer_demo");
   package Compiler is
-      for Default_Switches ("ada") use ("-gnatwbcfilopru", "-gnatVcdfimorst", "-gnatyabcefhiklmnoprst");
+      for Default_Switches ("ada") use ("-gnatwcfilopru", "-gnatVcdfimorst", "-gnatyabcefhiklmnoprst");
   end Compiler;
   package Linker is
@@ -18,4 +18,3 @@ project Zlib is
   end Builder;
 end Zlib;
--- a/contrib/amd64/amd64-match.S
+++ b/contrib/amd64/amd64-match.S
@@ -0,0 +1,357 @@
 /*
 * match.S -- optimized version of longest_match()
 * based on the similar work by Gilles Vollant, and Brian Raiter, written 1998
 *
 * This is free software; you can redistribute it and/or modify it
 * under the terms of the BSD License. Use by owners of Che Guevarra
 * parafernalia is prohibited, where possible, and highly discouraged
 * elsewhere.
 */
 #ifndef NO_UNDERLINE
 #	define	match_init	_match_init
 #	define	longest_match	_longest_match
 #endif
 #define	scanend		ebx
 #define	scanendw	bx
 #define	chainlenwmask	edx /* high word: current chain len low word: s->wmask */
 #define	curmatch	rsi
 #define	curmatchd	esi
 #define	windowbestlen	r8
 #define	scanalign	r9
 #define	scanalignd	r9d
 #define	window		r10
 #define	bestlen		r11
 #define	bestlend	r11d
 #define	scanstart	r12d
 #define	scanstartw	r12w
 #define scan		r13
 #define nicematch	r14d
 #define	limit		r15
 #define	limitd		r15d
 #define prev		rcx
 /*
 * The 258 is a "magic number, not a parameter -- changing it
 * breaks the hell loose
 */
 #define	MAX_MATCH	(258)
 #define	MIN_MATCH	(3)
 #define	MIN_LOOKAHEAD	(MAX_MATCH + MIN_MATCH + 1)
 #define	MAX_MATCH_8	((MAX_MATCH + 7) & ~7)
 /* stack frame offsets */
 #define	LocalVarsSize	(112)
 #define _chainlenwmask	( 8-LocalVarsSize)(%rsp)
 #define _windowbestlen	(16-LocalVarsSize)(%rsp)
 #define save_r14        (24-LocalVarsSize)(%rsp)
 #define save_rsi        (32-LocalVarsSize)(%rsp)
 #define save_rbx        (40-LocalVarsSize)(%rsp)
 #define save_r12        (56-LocalVarsSize)(%rsp)
 #define save_r13        (64-LocalVarsSize)(%rsp)
 #define save_r15        (80-LocalVarsSize)(%rsp)
 /*
 * On AMD64 the first argument of a function (in our case -- the pointer to
 * deflate_state structure) is passed in %rdi, hence our offsets below are
 * all off of that.
 */
 #ifndef STRUCT_OFFSET
 #	define STRUCT_OFFSET	(0)
 #endif
 #define dsWSize		( 56 + STRUCT_OFFSET)(%rdi)
 #define dsWMask		( 64 + STRUCT_OFFSET)(%rdi)
 #define dsWindow	( 72 + STRUCT_OFFSET)(%rdi)
 #define dsPrev		( 88 + STRUCT_OFFSET)(%rdi)
 #define dsMatchLen	(136 + STRUCT_OFFSET)(%rdi)
 #define dsPrevMatch	(140 + STRUCT_OFFSET)(%rdi)
 #define dsStrStart	(148 + STRUCT_OFFSET)(%rdi)
 #define dsMatchStart	(152 + STRUCT_OFFSET)(%rdi)
 #define dsLookahead	(156 + STRUCT_OFFSET)(%rdi)
 #define dsPrevLen	(160 + STRUCT_OFFSET)(%rdi)
 #define dsMaxChainLen	(164 + STRUCT_OFFSET)(%rdi)
 #define dsGoodMatch	(180 + STRUCT_OFFSET)(%rdi)
 #define dsNiceMatch	(184 + STRUCT_OFFSET)(%rdi)
 .globl	match_init, longest_match
 .text
 /* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
 longest_match:
 /*
 * Retrieve the function arguments. %curmatch will hold cur_match
 * throughout the entire function (passed via rsi on amd64).
 * rdi will hold the pointer to the deflate_state (first arg on amd64)
 */
 		mov     %rsi, save_rsi
 		mov     %rbx, save_rbx
 		mov	%r12, save_r12
 		mov     %r13, save_r13
 		mov     %r14, save_r14
 		mov     %r15, save_r15
 /* uInt wmask = s->w_mask;						*/
 /* unsigned chain_length = s->max_chain_length;				*/
 /* if (s->prev_length >= s->good_match) {				*/
 /*     chain_length >>= 2;						*/
 /* }									*/
 		movl	dsPrevLen, %eax
 		movl	dsGoodMatch, %ebx
 		cmpl	%ebx, %eax
 		movl	dsWMask, %eax
 		movl	dsMaxChainLen, %chainlenwmask
 		jl	LastMatchGood
 		shrl	$2, %chainlenwmask
 LastMatchGood:
 /* chainlen is decremented once beforehand so that the function can	*/
 /* use the sign flag instead of the zero flag for the exit test.	*/
 /* It is then shifted into the high word, to make room for the wmask	*/
 /* value, which it will always accompany.				*/
 		decl	%chainlenwmask
 		shll	$16, %chainlenwmask
 		orl	%eax, %chainlenwmask
 /* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;	*/
 		movl	dsNiceMatch, %eax
 		movl	dsLookahead, %ebx
 		cmpl	%eax, %ebx
 		jl	LookaheadLess
 		movl	%eax, %ebx
 LookaheadLess:	movl	%ebx, %nicematch
 /* register Bytef *scan = s->window + s->strstart;			*/
 		mov	dsWindow, %window
 		movl	dsStrStart, %limitd
 		lea	(%limit, %window), %scan
 /* Determine how many bytes the scan ptr is off from being		*/
 /* dword-aligned.							*/
 		mov	%scan, %scanalign
 		negl	%scanalignd
 		andl	$3, %scanalignd
 /* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?			*/
 /*     s->strstart - (IPos)MAX_DIST(s) : NIL;				*/
 		movl	dsWSize, %eax
 		subl	$MIN_LOOKAHEAD, %eax
 		xorl	%ecx, %ecx
 		subl	%eax, %limitd
 		cmovng	%ecx, %limitd
 /* int best_len = s->prev_length;					*/
 		movl	dsPrevLen, %bestlend
 /* Store the sum of s->window + best_len in %windowbestlen locally, and in memory.	*/
 		lea	(%window, %bestlen), %windowbestlen
 		mov	%windowbestlen, _windowbestlen
 /* register ush scan_start = *(ushf*)scan;				*/
 /* register ush scan_end   = *(ushf*)(scan+best_len-1);			*/
 /* Posf *prev = s->prev;						*/
 		movzwl	(%scan), %scanstart
 		movzwl	-1(%scan, %bestlen), %scanend
 		mov	dsPrev, %prev
 /* Jump into the main loop.						*/
 		movl	%chainlenwmask, _chainlenwmask
 		jmp	LoopEntry
 .balign 16
 /* do {
 *     match = s->window + cur_match;
 *     if (*(ushf*)(match+best_len-1) != scan_end ||
 *         *(ushf*)match != scan_start) continue;
 *     [...]
 * } while ((cur_match = prev[cur_match & wmask]) > limit
 *          && --chain_length != 0);
 *
 * Here is the inner loop of the function. The function will spend the
 * majority of its time in this loop, and majority of that time will
 * be spent in the first ten instructions.
 */
 LookupLoop:
 		andl	%chainlenwmask, %curmatchd
 		movzwl	(%prev, %curmatch, 2), %curmatchd
 		cmpl	%limitd, %curmatchd
 		jbe	LeaveNow
 		subl	$0x00010000, %chainlenwmask
 		js	LeaveNow
 LoopEntry:	cmpw	-1(%windowbestlen, %curmatch), %scanendw
 		jne	LookupLoop
 		cmpw	%scanstartw, (%window, %curmatch)
 		jne	LookupLoop
 /* Store the current value of chainlen.					*/
 		movl	%chainlenwmask, _chainlenwmask
 /* %scan is the string under scrutiny, and %prev to the string we	*/
 /* are hoping to match it up with. In actuality, %esi and %edi are	*/
 /* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is	*/
 /* initialized to -(MAX_MATCH_8 - scanalign).				*/
 		mov	$(-MAX_MATCH_8), %rdx
 		lea	(%curmatch, %window), %windowbestlen
 		lea	MAX_MATCH_8(%windowbestlen, %scanalign), %windowbestlen
 		lea	MAX_MATCH_8(%scan, %scanalign), %prev
 /* the prefetching below makes very little difference... */
 		prefetcht1	(%windowbestlen, %rdx)
 		prefetcht1	(%prev, %rdx)
 /*
 * Test the strings for equality, 8 bytes at a time. At the end,
 * adjust %rdx so that it is offset to the exact byte that mismatched.
 *
 * It should be confessed that this loop usually does not represent
 * much of the total running time. Replacing it with a more
 * straightforward "rep cmpsb" would not drastically degrade
 * performance -- unrolling it, for example, makes no difference.
 */
 #undef USE_SSE	/* works, but is 6-7% slower, than non-SSE... */
 LoopCmps:
 #ifdef USE_SSE
 		/* Preload the SSE registers */
 		movdqu	  (%windowbestlen, %rdx), %xmm1
 		movdqu	  (%prev, %rdx), %xmm2
 		pcmpeqb	%xmm2, %xmm1
 		movdqu	16(%windowbestlen, %rdx), %xmm3
 		movdqu	16(%prev, %rdx), %xmm4
 		pcmpeqb	%xmm4, %xmm3
 		movdqu	32(%windowbestlen, %rdx), %xmm5
 		movdqu	32(%prev, %rdx), %xmm6
 		pcmpeqb	%xmm6, %xmm5
 		movdqu	48(%windowbestlen, %rdx), %xmm7
 		movdqu	48(%prev, %rdx), %xmm8
 		pcmpeqb	%xmm8, %xmm7
 		/* Check the comparisions' results */
 		pmovmskb %xmm1, %rax
 		notw	%ax
 		bsfw	%ax, %ax
 		jnz	LeaveLoopCmps
 		add	$16, %rdx
 		pmovmskb %xmm3, %rax
 		notw	%ax
 		bsfw	%ax, %ax
 		jnz	LeaveLoopCmps
 		add	$16, %rdx
 		pmovmskb %xmm5, %rax
 		notw	%ax
 		bsfw	%ax, %ax
 		jnz	LeaveLoopCmps
 		add	$16, %rdx
 		pmovmskb %xmm7, %rax
 		notw	%ax
 		bsfw	%ax, %ax
 		jnz	LeaveLoopCmps
 		add	$16, %rdx
 		jmp	LoopCmps
 LeaveLoopCmps:	add	%rax, %rdx
 #else
 		mov	(%windowbestlen, %rdx), %rax
 		xor	(%prev, %rdx), %rax
 		jnz	LeaveLoopCmps
 		add	$8, %rdx
 		jnz	LoopCmps
 		jmp	LenMaximum
 #	if 0
 /*
 * This three-liner is tantalizingly simple, but bsf is a slow instruction,
 * and the complicated alternative down below is quite a bit faster. Sad...
 */
 LeaveLoopCmps:	bsf	%rax, %rax /* find the first non-zero bit */
 		shrl	$3, %eax /* divide by 8 to get the byte */
 		add	%rax, %rdx
 #	else
 LeaveLoopCmps:	testl   $0xFFFFFFFF, %eax /* Check the first 4 bytes */
 		jnz     Check16
 		add     $4, %rdx
 		shr     $32, %rax
 Check16:        testw   $0xFFFF, %ax
 		jnz     LenLower
 		add	$2, %rdx
 		shrl	$16, %eax
 LenLower:	subb	$1, %al
 		adc	$0, %rdx
 #	endif
 #endif
 /* Calculate the length of the match. If it is longer than MAX_MATCH,	*/
 /* then automatically accept it as the best possible match and leave.	*/
 		lea	(%prev, %rdx), %rax
 		sub	%scan, %rax
 		cmpl	$MAX_MATCH, %eax
 		jge	LenMaximum
 /* If the length of the match is not longer than the best match we	*/
 /* have so far, then forget it and return to the lookup loop.		*/
 		cmpl	%bestlend, %eax
 		jg	LongerMatch
 		mov	_windowbestlen, %windowbestlen
 		mov	dsPrev, %prev
 		movl	_chainlenwmask, %edx
 		jmp	LookupLoop
 /*         s->match_start = cur_match;					*/
 /*         best_len = len;						*/
 /*         if (len >= nice_match) break;				*/
 /*         scan_end = *(ushf*)(scan+best_len-1);			*/
 LongerMatch:
 		movl	%eax, %bestlend
 		movl	%curmatchd, dsMatchStart
 		cmpl	%nicematch, %eax
 		jge	LeaveNow
 		lea	(%window, %bestlen), %windowbestlen
 		mov	%windowbestlen, _windowbestlen
 		movzwl	-1(%scan, %rax), %scanend
 		mov	dsPrev, %prev
 		movl	_chainlenwmask, %chainlenwmask
 		jmp	LookupLoop
 /* Accept the current string, with the maximum possible length.		*/
 LenMaximum:
 		movl	$MAX_MATCH, %bestlend
 		movl	%curmatchd, dsMatchStart
 /* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;		*/
 /* return s->lookahead;							*/
 LeaveNow:
 		movl	dsLookahead, %eax
 		cmpl	%eax, %bestlend
 		cmovngl	%bestlend, %eax
 LookaheadRet:
 /* Restore the registers and return from whence we came.			*/
 	mov	save_rsi, %rsi
 	mov	save_rbx, %rbx
 	mov	save_r12, %r12
 	mov	save_r13, %r13
 	mov	save_r14, %r14
 	mov	save_r15, %r15
 	ret
 match_init:	ret
--- a/contrib/asm586/match.S
+++ b/contrib/asm586/match.S
@@ -45,19 +45,29 @@
 * program to crash horribly, without so much as a warning at
 * compile time. Sigh.)
 */
-#define	dsWSize			36
+
-#define	dsWMask			44
+/* All the +zlib1222add offsets are due to the addition of fields
-#define	dsWindow		48
+ *  in zlib in the deflate_state structure since the asm code was first written
-#define	dsPrev			56
+ * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
-#define	dsMatchLen		88
+ * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
-#define	dsPrevMatch		92
+ * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
-#define	dsStrStart		100
+ */
-#define	dsMatchStart		104
+
-#define	dsLookahead		108
+#define zlib1222add		(8)
-#define	dsPrevLen		112
+
-#define	dsMaxChainLen		116
+#define	dsWSize			(36+zlib1222add)
-#define	dsGoodMatch		132
+#define	dsWMask			(44+zlib1222add)
-#define	dsNiceMatch		136
+#define	dsWindow		(48+zlib1222add)
 #define	dsPrev			(56+zlib1222add)
 #define	dsMatchLen		(88+zlib1222add)
 #define	dsPrevMatch		(92+zlib1222add)
 #define	dsStrStart		(100+zlib1222add)
 #define	dsMatchStart		(104+zlib1222add)
 #define	dsLookahead		(108+zlib1222add)
 #define	dsPrevLen		(112+zlib1222add)
 #define	dsMaxChainLen		(116+zlib1222add)
 #define	dsGoodMatch		(132+zlib1222add)
 #define	dsNiceMatch		(136+zlib1222add)
 .file "match.S"
--- a/contrib/asm686/match.S
+++ b/contrib/asm686/match.S
@@ -38,26 +38,28 @@
 #define	deflatestate		56	/* the function arguments	*/
 #define	curmatch		60
-/* Offsets for fields in the deflate_state structure. These numbers
+/* All the +zlib1222add offsets are due to the addition of fields
- * are calculated from the definition of deflate_state, with the
+ *  in zlib in the deflate_state structure since the asm code was first written
- * assumption that the compiler will dword-align the fields. (Thus,
+ * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
- * changing the definition of deflate_state could easily cause this
+ * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
- * program to crash horribly, without so much as a warning at
+ * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
 * compile time. Sigh.)
 */
-#define	dsWSize			36
+
-#define	dsWMask			44
+#define zlib1222add		(8)
-#define	dsWindow		48
+
-#define	dsPrev			56
+#define	dsWSize			(36+zlib1222add)
-#define	dsMatchLen		88
+#define	dsWMask			(44+zlib1222add)
-#define	dsPrevMatch		92
+#define	dsWindow		(48+zlib1222add)
-#define	dsStrStart		100
+#define	dsPrev			(56+zlib1222add)
-#define	dsMatchStart		104
+#define	dsMatchLen		(88+zlib1222add)
-#define	dsLookahead		108
+#define	dsPrevMatch		(92+zlib1222add)
-#define	dsPrevLen		112
+#define	dsStrStart		(100+zlib1222add)
-#define	dsMaxChainLen		116
+#define	dsMatchStart		(104+zlib1222add)
-#define	dsGoodMatch		132
+#define	dsLookahead		(108+zlib1222add)
-#define	dsNiceMatch		136
+#define	dsPrevLen		(112+zlib1222add)
 #define	dsMaxChainLen		(116+zlib1222add)
 #define	dsGoodMatch		(132+zlib1222add)
 #define	dsNiceMatch		(136+zlib1222add)
 .file "match.S"
--- a/contrib/delphi/ZLib.pas
+++ b/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.1';
+  zlib_version = '1.2.3';
 type
  EZlibError = class(Exception);
@@ -344,7 +344,7 @@ begin
    strm.avail_out := OutBytes;
    DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
    try
-      while DCheck(inflate(strm, Z_FINISH)) <> Z_STREAM_END do
+      while DCheck(inflate(strm, Z_NO_FLUSH)) <> Z_STREAM_END do
      begin
        P := OutBuf;
        Inc(OutBytes, BufInc);
@@ -510,7 +510,7 @@ begin
        Result := Count - FZRec.avail_out;
        Exit;
      end;
-          FZRec.next_in := FBuffer;
+      FZRec.next_in := FBuffer;
      FStrmPos := FStrm.Position;
      Progress(Self);
    end;
--- a/contrib/delphi/readme.txt
+++ b/contrib/delphi/readme.txt
@@ -14,7 +14,7 @@ we recommend the users to update their ZLib unit.
 Summary of modifications
 ========================
- Improved makefile, adapted to zlib version 1.2.0.
+- Improved makefile, adapted to zlib version 1.2.1.
 - Some field types from TZStreamRec are changed from Integer to
  Longint, for consistency with the zlib.h header, and for 64-bit
--- a/contrib/delphi/zlibd32.mak
+++ b/contrib/delphi/zlibd32.mak
@@ -18,10 +18,10 @@ LDFLAGS =
 # variables
 ZLIB_LIB = zlib.lib
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj
-OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzio.obj+gzlib.obj+gzread.obj
-OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
 # targets
@@ -38,8 +38,16 @@ crc32.obj: crc32.c zlib.h zconf.h crc32.h
 deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
 gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
 gzio.obj: gzio.c zutil.h zlib.h zconf.h
 gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
 gzread.obj: gzread.c zlib.h zconf.h gzguts.h
 gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
 infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
 inffast.h inffixed.h
--- a/contrib/dotzlib/DotZLib.build
+++ b/contrib/dotzlib/DotZLib.build
@@ -0,0 +1,33 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <project name="DotZLib" default="build" basedir="./DotZLib">
 	<description>A .Net wrapper library around ZLib1.dll</description>
 	<property name="nunit.location" value="c:/program files/NUnit V2.1/bin" />
 	<property name="build.root" value="bin" />
 	<property name="debug" value="true" />
 	<property name="nunit" value="true" />
 	<property name="build.folder" value="${build.root}/debug/" if="${debug}" />
 	<property name="build.folder" value="${build.root}/release/" unless="${debug}" />
 	<target name="clean" description="Remove all generated files">
 		<delete dir="${build.root}" failonerror="false" />
 	</target>
 	<target name="build" description="compiles the source code">
 		<mkdir dir="${build.folder}" />
 		<csc target="library" output="${build.folder}DotZLib.dll" debug="${debug}">
 			<references basedir="${nunit.location}">
 				<includes if="${nunit}" name="nunit.framework.dll" />
 			</references>
 			<sources>
 				<includes name="*.cs" />
 				<excludes name="UnitTests.cs" unless="${nunit}" />
 			</sources>
 			<arg value="/d:nunit" if="${nunit}" />
 		</csc>
 	</target>
 </project>
--- a/contrib/dotzlib/DotZLib.chm
+++ b/contrib/dotzlib/DotZLib.chm
--- a/contrib/dotzlib/DotZLib.sln
+++ b/contrib/dotzlib/DotZLib.sln
@@ -0,0 +1,21 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotZLib", "DotZLib\DotZLib.csproj", "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.ActiveCfg = Debug|.NET
 		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.Build.0 = Debug|.NET
 		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.ActiveCfg = Release|.NET
 		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.Build.0 = Release|.NET
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
 	GlobalSection(ExtensibilityAddIns) = postSolution
 	EndGlobalSection
 EndGlobal
--- a/contrib/dotzlib/DotZLib/AssemblyInfo.cs
+++ b/contrib/dotzlib/DotZLib/AssemblyInfo.cs
@@ -0,0 +1,58 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 //
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 //
 [assembly: AssemblyTitle("DotZLib")]
 [assembly: AssemblyDescription(".Net bindings for ZLib compression dll 1.2.x")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Henrik Ravn")]
 [assembly: AssemblyProduct("")]
 [assembly: AssemblyCopyright("(c) 2004 by Henrik Ravn")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]		
 //
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
 //      Minor Version 
 //      Build Number
 //      Revision
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.0.*")]
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
 // Microsoft .NET Framework documentation for more information on assembly signing.
 //
 // Use the attributes below to control which key is used for signing. 
 //
 // Notes: 
 //   (*) If no key is specified, the assembly is not signed.
 //   (*) KeyName refers to a key that has been installed in the Crypto Service
 //       Provider (CSP) on your machine. KeyFile refers to a file which contains
 //       a key.
 //   (*) If the KeyFile and the KeyName values are both specified, the 
 //       following processing occurs:
 //       (1) If the KeyName can be found in the CSP, that key is used.
 //       (2) If the KeyName does not exist and the KeyFile does exist, the key 
 //           in the KeyFile is installed into the CSP and used.
 //   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
 //       When specifying the KeyFile, the location of the KeyFile should be
 //       relative to the project output directory which is
 //       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
 //       located in the project directory, you would specify the AssemblyKeyFile 
 //       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
 //       documentation for more information on this.
 //
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
--- a/contrib/dotzlib/DotZLib/ChecksumImpl.cs
+++ b/contrib/dotzlib/DotZLib/ChecksumImpl.cs
@@ -0,0 +1,202 @@
 //
 // <20> 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)
 //
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
 namespace DotZLib
 {
    #region ChecksumGeneratorBase
    /// <summary>
    /// Implements the common functionality needed for all <see cref="ChecksumGenerator"/>s
    /// </summary>
    /// <example></example>
    public abstract class ChecksumGeneratorBase : ChecksumGenerator
    {
        /// <summary>
        /// The value of the current checksum
        /// </summary>
        protected uint _current;
        /// <summary>
        /// Initializes a new instance of the checksum generator base - the current checksum is 
        /// set to zero
        /// </summary>
        public ChecksumGeneratorBase()
        {
            _current = 0;
        }
        /// <summary>
        /// Initializes a new instance of the checksum generator basewith a specified value
        /// </summary>
        /// <param name="initialValue">The value to set the current checksum to</param>
        public ChecksumGeneratorBase(uint initialValue)
        {
            _current = initialValue;
        }
        /// <summary>
        /// Resets the current checksum to zero
        /// </summary>
        public void Reset() { _current = 0; }
        /// <summary>
        /// Gets the current checksum value
        /// </summary>
        public uint Value { get { return _current; } }
        /// <summary>
        /// Updates the current checksum with part of an array of bytes
        /// </summary>
        /// <param name="data">The data to update the checksum with</param>
        /// <param name="offset">Where in <c>data</c> to start updating</param>
        /// <param name="count">The number of bytes from <c>data</c> to use</param>
        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
        /// <remarks>All the other <c>Update</c> methods are implmeneted in terms of this one. 
        /// This is therefore the only method a derived class has to implement</remarks>
        public abstract void Update(byte[] data, int offset, int count);
        /// <summary>
        /// Updates the current checksum with an array of bytes.
        /// </summary>
        /// <param name="data">The data to update the checksum with</param>
        public void Update(byte[] data)
        {
            Update(data, 0, data.Length);
        }
        /// <summary>
        /// Updates the current checksum with the data from a string
        /// </summary>
        /// <param name="data">The string to update the checksum with</param>
        /// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks>
        public void Update(string data)
        {
 			Update(Encoding.UTF8.GetBytes(data));
        }
        /// <summary>
        /// Updates the current checksum with the data from a string, using a specific encoding
        /// </summary>
        /// <param name="data">The string to update the checksum with</param>
        /// <param name="encoding">The encoding to use</param>
        public void Update(string data, Encoding encoding)
        {
            Update(encoding.GetBytes(data));
        }
    }
    #endregion
    #region CRC32
    /// <summary>
    /// Implements a CRC32 checksum generator
    /// </summary>
    public sealed class CRC32Checksum : ChecksumGeneratorBase    
    {
        #region DLL imports
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern uint crc32(uint crc, int data, uint length);
        #endregion
        /// <summary>
        /// Initializes a new instance of the CRC32 checksum generator
        /// </summary>
        public CRC32Checksum() : base() {}
        /// <summary>
        /// Initializes a new instance of the CRC32 checksum generator with a specified value
        /// </summary>
        /// <param name="initialValue">The value to set the current checksum to</param>
        public CRC32Checksum(uint initialValue) : base(initialValue) {}
        /// <summary>
        /// Updates the current checksum with part of an array of bytes
        /// </summary>
        /// <param name="data">The data to update the checksum with</param>
        /// <param name="offset">Where in <c>data</c> to start updating</param>
        /// <param name="count">The number of bytes from <c>data</c> to use</param>
        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
        public override void Update(byte[] data, int offset, int count)
        {
            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
            if ((offset+count) > data.Length) throw new ArgumentException();
            GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned);
            try
            {
                _current = crc32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count);
            }
            finally
            {
                hData.Free();
            }
        }
    }
    #endregion
    #region Adler
    /// <summary>
    /// Implements a checksum generator that computes the Adler checksum on data
    /// </summary>
    public sealed class AdlerChecksum : ChecksumGeneratorBase    
    {
        #region DLL imports
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern uint adler32(uint adler, int data, uint length);
        #endregion
        /// <summary>
        /// Initializes a new instance of the Adler checksum generator
        /// </summary>
        public AdlerChecksum() : base() {}
        /// <summary>
        /// Initializes a new instance of the Adler checksum generator with a specified value
        /// </summary>
        /// <param name="initialValue">The value to set the current checksum to</param>
        public AdlerChecksum(uint initialValue) : base(initialValue) {}
        /// <summary>
        /// Updates the current checksum with part of an array of bytes
        /// </summary>
        /// <param name="data">The data to update the checksum with</param>
        /// <param name="offset">Where in <c>data</c> to start updating</param>
        /// <param name="count">The number of bytes from <c>data</c> to use</param>
        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
        public override void Update(byte[] data, int offset, int count)
        {
            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
            if ((offset+count) > data.Length) throw new ArgumentException();
            GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned);
            try
            {
                _current = adler32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count);
            }
            finally
            {
                hData.Free();
            }
        }
    }
    #endregion
 }
--- a/contrib/dotzlib/DotZLib/CircularBuffer.cs
+++ b/contrib/dotzlib/DotZLib/CircularBuffer.cs
@@ -0,0 +1,83 @@
 //
 // <20> 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)
 //
 using System;
 using System.Diagnostics;
 namespace DotZLib
 {
 	/// <summary>
 	/// This class implements a circular buffer
 	/// </summary>
 	internal class CircularBuffer
 	{
        #region Private data
        private int _capacity;
        private int _head;
        private int _tail;
        private int _size;
        private byte[] _buffer;
        #endregion
        public CircularBuffer(int capacity)
        {    
            Debug.Assert( capacity > 0 );
            _buffer = new byte[capacity];
            _capacity = capacity;
            _head = 0;
            _tail = 0;
            _size = 0;
        }
        public int Size { get { return _size; } }
        public int Put(byte[] source, int offset, int count)
        {
            Debug.Assert( count > 0 );
            int trueCount = Math.Min(count, _capacity - Size);
            for (int i = 0; i < trueCount; ++i)
                _buffer[(_tail+i) % _capacity] = source[offset+i];
            _tail += trueCount;
            _tail %= _capacity;
            _size += trueCount;
            return trueCount;
        }
        public bool Put(byte b)
        {
            if (Size == _capacity) // no room
                return false;
            _buffer[_tail++] = b;
            _tail %= _capacity;
            ++_size;
            return true;
        }
        public int Get(byte[] destination, int offset, int count)
        {
            int trueCount = Math.Min(count,Size);
            for (int i = 0; i < trueCount; ++i)
                destination[offset + i] = _buffer[(_head+i) % _capacity];
            _head += trueCount;
            _head %= _capacity;
            _size -= trueCount;
            return trueCount;
        }
        public int Get()
        {
            if (Size == 0)
                return -1;
            int result = (int)_buffer[_head++ % _capacity];
            --_size;
            return result;
        }
    }
 }
--- a/contrib/dotzlib/DotZLib/CodecBase.cs
+++ b/contrib/dotzlib/DotZLib/CodecBase.cs
@@ -0,0 +1,198 @@
 //
 // <20> 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)
 //
 using System;
 using System.Runtime.InteropServices;
 namespace DotZLib
 {
 	/// <summary>
 	/// Implements the common functionality needed for all <see cref="Codec"/>s
 	/// </summary>
 	public abstract class CodecBase : Codec, IDisposable
 	{
        #region Data members
        /// <summary>
        /// Instance of the internal zlib buffer structure that is 
        /// passed to all functions in the zlib dll
        /// </summary>
        internal ZStream _ztream = new ZStream();
        /// <summary>
        /// True if the object instance has been disposed, false otherwise
        /// </summary>
        protected bool _isDisposed = false;
        /// <summary>
        /// The size of the internal buffers
        /// </summary>
        protected const int kBufferSize = 16384;
        private byte[] _outBuffer = new byte[kBufferSize];
        private byte[] _inBuffer = new byte[kBufferSize];
        private GCHandle _hInput;
        private GCHandle _hOutput;
        private uint _checksum = 0;
        #endregion
        /// <summary>
        /// Initializes a new instance of the <c>CodeBase</c> class. 
        /// </summary>
 		public CodecBase()
 		{
            try
            {
                _hInput = GCHandle.Alloc(_inBuffer, GCHandleType.Pinned);
                _hOutput = GCHandle.Alloc(_outBuffer, GCHandleType.Pinned);
            }
            catch (Exception)
            {
                CleanUp(false);
                throw;
            }
        }
        #region Codec Members
        /// <summary>
        /// Occurs when more processed data are available.
        /// </summary>
        public event DataAvailableHandler DataAvailable;
        /// <summary>
        /// Fires the <see cref="DataAvailable"/> event
        /// </summary>
        protected void OnDataAvailable()
        {
            if (_ztream.total_out > 0)
            {
                if (DataAvailable != null)
                    DataAvailable( _outBuffer, 0, (int)_ztream.total_out); 
                resetOutput();
            }
        }
        /// <summary>
        /// Adds more data to the codec to be processed.
        /// </summary>
        /// <param name="data">Byte array containing the data to be added to the codec</param>
        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
        public void Add(byte[] data)
        {
            Add(data,0,data.Length);
        }
        /// <summary>
        /// Adds more data to the codec to be processed.
        /// </summary>
        /// <param name="data">Byte array containing the data to be added to the codec</param>
        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
        /// <param name="count">The number of bytes to add</param>
        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
        /// <remarks>This must be implemented by a derived class</remarks>
        public abstract void Add(byte[] data, int offset, int count);
        /// <summary>
        /// Finishes up any pending data that needs to be processed and handled.
        /// </summary>
        /// <remarks>This must be implemented by a derived class</remarks>
        public abstract void Finish();
        /// <summary>
        /// Gets the checksum of the data that has been added so far
        /// </summary>
        public uint Checksum { get { return _checksum; } }
        #endregion
        #region Destructor & IDisposable stuff
        /// <summary>
        /// Destroys this instance
        /// </summary>
        ~CodecBase()
        {
            CleanUp(false);
        }
        /// <summary>
        /// Releases any unmanaged resources and calls the <see cref="CleanUp()"/> method of the derived class
        /// </summary>
        public void Dispose()
        {
            CleanUp(true);
        }
        /// <summary>
        /// Performs any codec specific cleanup
        /// </summary>
        /// <remarks>This must be implemented by a derived class</remarks>
        protected abstract void CleanUp();
        // performs the release of the handles and calls the dereived CleanUp()
        private void CleanUp(bool isDisposing)
        {
            if (!_isDisposed)
            {
                CleanUp();
                if (_hInput.IsAllocated)
                    _hInput.Free();
                if (_hOutput.IsAllocated)
                    _hOutput.Free();
                _isDisposed = true;
            }
        }
        #endregion
        #region Helper methods
        /// <summary>
        /// Copies a number of bytes to the internal codec buffer - ready for proccesing
        /// </summary>
        /// <param name="data">The byte array that contains the data to copy</param>
        /// <param name="startIndex">The index of the first byte to copy</param>
        /// <param name="count">The number of bytes to copy from <c>data</c></param>
        protected void copyInput(byte[] data, int startIndex, int count)
        {
            Array.Copy(data, startIndex, _inBuffer,0, count);
            _ztream.next_in = _hInput.AddrOfPinnedObject();
            _ztream.total_in = 0;
            _ztream.avail_in = (uint)count;
        }
        /// <summary>
        /// Resets the internal output buffers to a known state - ready for processing
        /// </summary>
        protected void resetOutput()
        {
            _ztream.total_out = 0;
            _ztream.avail_out = kBufferSize;
            _ztream.next_out = _hOutput.AddrOfPinnedObject();
        }
        /// <summary>
        /// Updates the running checksum property
        /// </summary>
        /// <param name="newSum">The new checksum value</param>
        protected void setChecksum(uint newSum)
        {
            _checksum = newSum;
        }
        #endregion
    }
 }
--- a/contrib/dotzlib/DotZLib/Deflater.cs
+++ b/contrib/dotzlib/DotZLib/Deflater.cs
@@ -0,0 +1,106 @@
 //
 // <20> 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)
 //
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 namespace DotZLib
 {
    /// <summary>
    /// Implements a data compressor, using the deflate algorithm in the ZLib dll
    /// </summary>
 	public sealed class Deflater : CodecBase
 	{
        #region Dll imports
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]
        private static extern int deflateInit_(ref ZStream sz, int level, string vs, int size);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int deflate(ref ZStream sz, int flush);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int deflateReset(ref ZStream sz);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int deflateEnd(ref ZStream sz);
        #endregion
        /// <summary>
        /// Constructs an new instance of the <c>Deflater</c>
        /// </summary>
        /// <param name="level">The compression level to use for this <c>Deflater</c></param>
 		public Deflater(CompressLevel level) : base()
 		{
            int retval = deflateInit_(ref _ztream, (int)level, Info.Version, Marshal.SizeOf(_ztream));
            if (retval != 0)
                throw new ZLibException(retval, "Could not initialize deflater");
            resetOutput();
 		}
        /// <summary>
        /// Adds more data to the codec to be processed.
        /// </summary>
        /// <param name="data">Byte array containing the data to be added to the codec</param>
        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
        /// <param name="count">The number of bytes to add</param>
        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
        public override void Add(byte[] data, int offset, int count)
        {
            if (data == null) throw new ArgumentNullException();
            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
            if ((offset+count) > data.Length) throw new ArgumentException();
            int total = count;
            int inputIndex = offset;
            int err = 0;
            while (err >= 0 && inputIndex < total)
            {
                copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize));
                while (err >= 0 && _ztream.avail_in > 0)
                {
                    err = deflate(ref _ztream, (int)FlushTypes.None);
                    if (err == 0)
                        while (_ztream.avail_out == 0)
                        {
                            OnDataAvailable();
                            err = deflate(ref _ztream, (int)FlushTypes.None);
                        }
                    inputIndex += (int)_ztream.total_in;
                }
            }
            setChecksum( _ztream.adler );
        }
        /// <summary>
        /// Finishes up any pending data that needs to be processed and handled.
        /// </summary>
        public override void Finish()
        {
            int err;
            do 
            {
                err = deflate(ref _ztream, (int)FlushTypes.Finish);
                OnDataAvailable();
            }
            while (err == 0);
            setChecksum( _ztream.adler );
            deflateReset(ref _ztream);
            resetOutput();
        }
        /// <summary>
        /// Closes the internal zlib deflate stream
        /// </summary>
        protected override void CleanUp() { deflateEnd(ref _ztream); }
    }
 }
--- a/contrib/dotzlib/DotZLib/DotZLib.cs
+++ b/contrib/dotzlib/DotZLib/DotZLib.cs
@@ -0,0 +1,288 @@
 //
 // <20> 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)
 //
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
 namespace DotZLib
 {
    #region Internal types
    /// <summary>
    /// Defines constants for the various flush types used with zlib
    /// </summary>
    internal enum FlushTypes 
    {
        None,  Partial,  Sync,  Full,  Finish,  Block
    }
    #region ZStream structure
    // internal mapping of the zlib zstream structure for marshalling
    [StructLayoutAttribute(LayoutKind.Sequential, Pack=4, Size=0, CharSet=CharSet.Ansi)]
    internal struct ZStream
    {
        public IntPtr next_in;
        public uint avail_in;
        public uint total_in;
        public IntPtr next_out;
        public uint avail_out;
        public uint total_out;
        [MarshalAs(UnmanagedType.LPStr)]
        string msg; 
        uint state;
        uint zalloc;
        uint zfree;
        uint opaque;
        int data_type;
        public uint adler;
        uint reserved;
    }
    #endregion
    #endregion
    #region Public enums
    /// <summary>
    /// Defines constants for the available compression levels in zlib
    /// </summary>
    public enum CompressLevel : int
    {
        /// <summary>
        /// The default compression level with a reasonable compromise between compression and speed
        /// </summary>
        Default = -1,   
        /// <summary>
        /// No compression at all. The data are passed straight through.
        /// </summary>
        None = 0,
        /// <summary>
        /// The maximum compression rate available.
        /// </summary>
        Best = 9,   
        /// <summary>
        /// The fastest available compression level.
        /// </summary>
        Fastest = 1
    }
    #endregion
    #region Exception classes
    /// <summary>
    /// The exception that is thrown when an error occurs on the zlib dll
    /// </summary>
    public class ZLibException : ApplicationException
    {
        /// <summary>
        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified 
        /// error message and error code
        /// </summary>
        /// <param name="errorCode">The zlib error code that caused the exception</param>
        /// <param name="msg">A message that (hopefully) describes the error</param>
        public ZLibException(int errorCode, string msg) : base(String.Format("ZLib error {0} {1}", errorCode, msg))
        {
        }
        /// <summary>
        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified 
        /// error code
        /// </summary>
        /// <param name="errorCode">The zlib error code that caused the exception</param>
        public ZLibException(int errorCode) : base(String.Format("ZLib error {0}", errorCode))
        {
        }
    }
    #endregion
    #region Interfaces
    /// <summary>
    /// Declares methods and properties that enables a running checksum to be calculated 
    /// </summary>
    public interface ChecksumGenerator
    {
        /// <summary>
        /// Gets the current value of the checksum
        /// </summary>
        uint Value { get; }
        /// <summary>
        /// Clears the current checksum to 0
        /// </summary>
        void Reset();
        /// <summary>
        /// Updates the current checksum with an array of bytes
        /// </summary>
        /// <param name="data">The data to update the checksum with</param>
        void Update(byte[] data);
        /// <summary>
        /// Updates the current checksum with part of an array of bytes
        /// </summary>
        /// <param name="data">The data to update the checksum with</param>
        /// <param name="offset">Where in <c>data</c> to start updating</param>
        /// <param name="count">The number of bytes from <c>data</c> to use</param>
        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
        /// <exception cref="ArgumentNullException"><c>data</c> is a null reference</exception>
        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
        void Update(byte[] data, int offset, int count);
        /// <summary>
        /// Updates the current checksum with the data from a string
        /// </summary>
        /// <param name="data">The string to update the checksum with</param>
        /// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks>
        void Update(string data);
        /// <summary>
        /// Updates the current checksum with the data from a string, using a specific encoding
        /// </summary>
        /// <param name="data">The string to update the checksum with</param>
        /// <param name="encoding">The encoding to use</param>
        void Update(string data, Encoding encoding);
    }
    /// <summary>
    /// Represents the method that will be called from a codec when new data
    /// are available.
    /// </summary>
    /// <paramref name="data">The byte array containing the processed data</paramref>
    /// <paramref name="startIndex">The index of the first processed byte in <c>data</c></paramref>
    /// <paramref name="count">The number of processed bytes available</paramref>
    /// <remarks>On return from this method, the data may be overwritten, so grab it while you can. 
    /// You cannot assume that startIndex will be zero.
    /// </remarks>
    public delegate void DataAvailableHandler(byte[] data, int startIndex, int count);
    /// <summary>
    /// Declares methods and events for implementing compressors/decompressors
    /// </summary>
    public interface Codec
    {
        /// <summary>
        /// Occurs when more processed data are available.
        /// </summary>
        event DataAvailableHandler DataAvailable;
        /// <summary>
        /// Adds more data to the codec to be processed.
        /// </summary>
        /// <param name="data">Byte array containing the data to be added to the codec</param>
        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
        void Add(byte[] data);
        /// <summary>
        /// Adds more data to the codec to be processed.
        /// </summary>
        /// <param name="data">Byte array containing the data to be added to the codec</param>
        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
        /// <param name="count">The number of bytes to add</param>
        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
        void Add(byte[] data, int offset, int count);
        /// <summary>
        /// Finishes up any pending data that needs to be processed and handled.
        /// </summary>
        void Finish();
        /// <summary>
        /// Gets the checksum of the data that has been added so far
        /// </summary>
        uint Checksum { get; }
    }
    #endregion
    #region Classes
    /// <summary>
    /// Encapsulates general information about the ZLib library
    /// </summary>
    public class Info
    {
        #region DLL imports
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern uint zlibCompileFlags();
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern string zlibVersion();
        #endregion
        #region Private stuff
        private uint _flags;
        // helper function that unpacks a bitsize mask
        private static int bitSize(uint bits)
        {
            switch (bits)
            {
                case 0: return 16;
                case 1: return 32;
                case 2: return 64;
            }
            return -1;
        }
        #endregion
        /// <summary>
        /// Constructs an instance of the <c>Info</c> class.
        /// </summary>
        public Info()
        {
            _flags = zlibCompileFlags();
        }
        /// <summary>
        /// True if the library is compiled with debug info
        /// </summary>
        public bool HasDebugInfo { get { return 0 != (_flags & 0x100); } }
        /// <summary>
        /// True if the library is compiled with assembly optimizations
        /// </summary>
        public bool UsesAssemblyCode { get { return 0 != (_flags & 0x200); } }
        /// <summary>
        /// Gets the size of the unsigned int that was compiled into Zlib
        /// </summary>
        public int SizeOfUInt { get { return bitSize(_flags & 3); } }
        /// <summary>
        /// Gets the size of the unsigned long that was compiled into Zlib
        /// </summary>
        public int SizeOfULong { get { return bitSize((_flags >> 2) & 3); } }
        /// <summary>
        /// Gets the size of the pointers that were compiled into Zlib
        /// </summary>
        public int SizeOfPointer { get { return bitSize((_flags >> 4) & 3); } }
        /// <summary>
        /// Gets the size of the z_off_t type that was compiled into Zlib
        /// </summary>
        public int SizeOfOffset { get { return bitSize((_flags >> 6) & 3); } }
        /// <summary>
        /// Gets the version of ZLib as a string, e.g. "1.2.1"
        /// </summary>
        public static string Version { get { return zlibVersion(); } }
    }
    #endregion
 }
--- a/contrib/dotzlib/DotZLib/DotZLib.csproj
+++ b/contrib/dotzlib/DotZLib/DotZLib.csproj
@@ -0,0 +1,141 @@
 <VisualStudioProject>
    <CSHARP
        ProjectType = "Local"
        ProductVersion = "7.10.3077"
        SchemaVersion = "2.0"
        ProjectGuid = "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"
    >
        <Build>
            <Settings
                ApplicationIcon = ""
                AssemblyKeyContainerName = ""
                AssemblyName = "DotZLib"
                AssemblyOriginatorKeyFile = ""
                DefaultClientScript = "JScript"
                DefaultHTMLPageLayout = "Grid"
                DefaultTargetSchema = "IE50"
                DelaySign = "false"
                OutputType = "Library"
                PreBuildEvent = ""
                PostBuildEvent = ""
                RootNamespace = "DotZLib"
                RunPostBuildEvent = "OnBuildSuccess"
                StartupObject = ""
            >
                <Config
                    Name = "Debug"
                    AllowUnsafeBlocks = "false"
                    BaseAddress = "285212672"
                    CheckForOverflowUnderflow = "false"
                    ConfigurationOverrideFile = ""
                    DefineConstants = "DEBUG;TRACE"
                    DocumentationFile = "docs\DotZLib.xml"
                    DebugSymbols = "true"
                    FileAlignment = "4096"
                    IncrementalBuild = "false"
                    NoStdLib = "false"
                    NoWarn = "1591"
                    Optimize = "false"
                    OutputPath = "bin\Debug\"
                    RegisterForComInterop = "false"
                    RemoveIntegerChecks = "false"
                    TreatWarningsAsErrors = "false"
                    WarningLevel = "4"
                />
                <Config
                    Name = "Release"
                    AllowUnsafeBlocks = "false"
                    BaseAddress = "285212672"
                    CheckForOverflowUnderflow = "false"
                    ConfigurationOverrideFile = ""
                    DefineConstants = "TRACE"
                    DocumentationFile = "docs\DotZLib.xml"
                    DebugSymbols = "false"
                    FileAlignment = "4096"
                    IncrementalBuild = "false"
                    NoStdLib = "false"
                    NoWarn = ""
                    Optimize = "true"
                    OutputPath = "bin\Release\"
                    RegisterForComInterop = "false"
                    RemoveIntegerChecks = "false"
                    TreatWarningsAsErrors = "false"
                    WarningLevel = "4"
                />
            </Settings>
            <References>
                <Reference
                    Name = "System"
                    AssemblyName = "System"
                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.dll"
                />
                <Reference
                    Name = "System.Data"
                    AssemblyName = "System.Data"
                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
                />
                <Reference
                    Name = "System.XML"
                    AssemblyName = "System.Xml"
                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
                />
                <Reference
                    Name = "nunit.framework"
                    AssemblyName = "nunit.framework"
                    HintPath = "E:\apps\NUnit V2.1\\bin\nunit.framework.dll"
                    AssemblyFolderKey = "hklm\dn\nunit.framework"
                />
            </References>
        </Build>
        <Files>
            <Include>
                <File
                    RelPath = "AssemblyInfo.cs"
                    SubType = "Code"
                    BuildAction = "Compile"
                />
                <File
                    RelPath = "ChecksumImpl.cs"
                    SubType = "Code"
                    BuildAction = "Compile"
                />
                <File
                    RelPath = "CircularBuffer.cs"
                    SubType = "Code"
                    BuildAction = "Compile"
                />
                <File
                    RelPath = "CodecBase.cs"
                    SubType = "Code"
                    BuildAction = "Compile"
                />
                <File
                    RelPath = "Deflater.cs"
                    SubType = "Code"
                    BuildAction = "Compile"
                />
                <File
                    RelPath = "DotZLib.cs"
                    SubType = "Code"
                    BuildAction = "Compile"
                />
                <File
                    RelPath = "GZipStream.cs"
                    SubType = "Code"
                    BuildAction = "Compile"
                />
                <File
                    RelPath = "Inflater.cs"
                    SubType = "Code"
                    BuildAction = "Compile"
                />
                <File
                    RelPath = "UnitTests.cs"
                    SubType = "Code"
                    BuildAction = "Compile"
                />
            </Include>
        </Files>
    </CSHARP>
 </VisualStudioProject>
--- a/contrib/dotzlib/DotZLib/GZipStream.cs
+++ b/contrib/dotzlib/DotZLib/GZipStream.cs
@@ -0,0 +1,301 @@
 //
 // <20> 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)
 //
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
 namespace DotZLib
 {
 	/// <summary>
 	/// Implements a compressed <see cref="Stream"/>, in GZip (.gz) format.
 	/// </summary>
 	public class GZipStream : Stream, IDisposable
 	{
        #region Dll Imports
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]
        private static extern IntPtr gzopen(string name, string mode);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int gzclose(IntPtr gzFile);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int gzwrite(IntPtr gzFile, int data, int length);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int gzread(IntPtr gzFile, int data, int length);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int gzgetc(IntPtr gzFile);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int gzputc(IntPtr gzFile, int c);
        #endregion
        #region Private data
        private IntPtr _gzFile;
        private bool _isDisposed = false;
        private bool _isWriting;
        #endregion
        #region Constructors
        /// <summary>
        /// Creates a new file as a writeable GZipStream
        /// </summary>
        /// <param name="fileName">The name of the compressed file to create</param>
        /// <param name="level">The compression level to use when adding data</param>
        /// <exception cref="ZLibException">If an error occurred in the internal zlib function</exception>
 		public GZipStream(string fileName, CompressLevel level)
 		{
            _isWriting = true;
            _gzFile = gzopen(fileName, String.Format("wb{0}", (int)level));
            if (_gzFile == IntPtr.Zero)
                throw new ZLibException(-1, "Could not open " + fileName);
 		}
        /// <summary>
        /// Opens an existing file as a readable GZipStream
        /// </summary>
        /// <param name="fileName">The name of the file to open</param>
        /// <exception cref="ZLibException">If an error occurred in the internal zlib function</exception>
        public GZipStream(string fileName)
        {
            _isWriting = false;
            _gzFile = gzopen(fileName, "rb");
            if (_gzFile == IntPtr.Zero)
                throw new ZLibException(-1, "Could not open " + fileName);
        }
        #endregion
        #region Access properties
        /// <summary>
        /// Returns true of this stream can be read from, false otherwise
        /// </summary>
        public override bool CanRead
        {
            get
            {
                return !_isWriting;
            }
        }
        /// <summary>
        /// Returns false.
        /// </summary>
        public override bool CanSeek
        {
            get
            {
                return false;
            }
        }
        /// <summary>
        /// Returns true if this tsream is writeable, false otherwise
        /// </summary>
        public override bool CanWrite
        {
            get
            {
                return _isWriting;
            }
        }
        #endregion
        #region Destructor & IDispose stuff
        /// <summary>
        /// Destroys this instance
        /// </summary>
        ~GZipStream()
        {
            cleanUp(false);
        }
        /// <summary>
        /// Closes the external file handle
        /// </summary>
        public void Dispose()
        {
            cleanUp(true);
        }
        // Does the actual closing of the file handle.
        private void cleanUp(bool isDisposing)
        {
            if (!_isDisposed)
            {
                gzclose(_gzFile);
                _isDisposed = true;
            }
        }
        #endregion
        #region Basic reading and writing
        /// <summary>
        /// Attempts to read a number of bytes from the stream.
        /// </summary>
        /// <param name="buffer">The destination data buffer</param>
        /// <param name="offset">The index of the first destination byte in <c>buffer</c></param>
        /// <param name="count">The number of bytes requested</param>
        /// <returns>The number of bytes read</returns>
        /// <exception cref="ArgumentNullException">If <c>buffer</c> is null</exception>
        /// <exception cref="ArgumentOutOfRangeException">If <c>count</c> or <c>offset</c> are negative</exception>
        /// <exception cref="ArgumentException">If <c>offset</c>  + <c>count</c> is &gt; buffer.Length</exception>
        /// <exception cref="NotSupportedException">If this stream is not readable.</exception>
        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>
        public override int Read(byte[] buffer, int offset, int count)
        {
            if (!CanRead) throw new NotSupportedException();
            if (buffer == null) throw new ArgumentNullException();
            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
            if ((offset+count) > buffer.Length) throw new ArgumentException();
            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
            GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned);
            int result;
            try
            {
                result = gzread(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count);
                if (result < 0)
                    throw new IOException();
            }
            finally
            {
                h.Free();
            }
            return result;
        }
        /// <summary>
        /// Attempts to read a single byte from the stream.
        /// </summary>
        /// <returns>The byte that was read, or -1 in case of error or End-Of-File</returns>
        public override int ReadByte()
        {
            if (!CanRead) throw new NotSupportedException();
            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
            return gzgetc(_gzFile);
        }
        /// <summary>
        /// Writes a number of bytes to the stream
        /// </summary>
        /// <param name="buffer"></param>
        /// <param name="offset"></param>
        /// <param name="count"></param>
        /// <exception cref="ArgumentNullException">If <c>buffer</c> is null</exception>
        /// <exception cref="ArgumentOutOfRangeException">If <c>count</c> or <c>offset</c> are negative</exception>
        /// <exception cref="ArgumentException">If <c>offset</c>  + <c>count</c> is &gt; buffer.Length</exception>
        /// <exception cref="NotSupportedException">If this stream is not writeable.</exception>
        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>
        public override void Write(byte[] buffer, int offset, int count)
        {
            if (!CanWrite) throw new NotSupportedException();
            if (buffer == null) throw new ArgumentNullException();
            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
            if ((offset+count) > buffer.Length) throw new ArgumentException();
            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
            GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned);
            try
            {
                int result = gzwrite(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count);
                if (result < 0)
                    throw new IOException();
            }
            finally
            {
                h.Free();
            }
        }
        /// <summary>
        /// Writes a single byte to the stream
        /// </summary>
        /// <param name="value">The byte to add to the stream.</param>
        /// <exception cref="NotSupportedException">If this stream is not writeable.</exception>
        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>
        public override void WriteByte(byte value)
        {
            if (!CanWrite) throw new NotSupportedException();
            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
            int result = gzputc(_gzFile, (int)value);
            if (result < 0)
                throw new IOException();
        }
        #endregion
        #region Position & length stuff
        /// <summary>
        /// Not supported.
        /// </summary>
        /// <param name="value"></param>
        /// <exception cref="NotSupportedException">Always thrown</exception>
        public override void SetLength(long value)
        {
            throw new NotSupportedException();
        }
        /// <summary>
        ///  Not suppported.
        /// </summary>
        /// <param name="offset"></param>
        /// <param name="origin"></param>
        /// <returns></returns>
        /// <exception cref="NotSupportedException">Always thrown</exception>
        public override long Seek(long offset, SeekOrigin origin)
        {
            throw new NotSupportedException();
        }
        /// <summary>
        /// Flushes the <c>GZipStream</c>.
        /// </summary>
        /// <remarks>In this implementation, this method does nothing. This is because excessive
        /// flushing may degrade the achievable compression rates.</remarks>
        public override void Flush()
        {
            // left empty on purpose
        }
        /// <summary>
        /// Gets/sets the current position in the <c>GZipStream</c>. Not suppported.
        /// </summary>
        /// <remarks>In this implementation this property is not supported</remarks>
        /// <exception cref="NotSupportedException">Always thrown</exception>
        public override long Position
        {
            get
            {
                throw new NotSupportedException();
            }
            set
            {
                throw new NotSupportedException();
            }
        }
        /// <summary>
        /// Gets the size of the stream. Not suppported.
        /// </summary>
        /// <remarks>In this implementation this property is not supported</remarks>
        /// <exception cref="NotSupportedException">Always thrown</exception>
        public override long Length
        {
            get
            {
                throw new NotSupportedException();
            }
        }
        #endregion
    }
 }
--- a/contrib/dotzlib/DotZLib/Inflater.cs
+++ b/contrib/dotzlib/DotZLib/Inflater.cs
@@ -0,0 +1,105 @@
 //
 // <20> 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)
 //
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 namespace DotZLib
 {
    /// <summary>
    /// Implements a data decompressor, using the inflate algorithm in the ZLib dll
    /// </summary>
    public class Inflater : CodecBase
 	{
        #region Dll imports
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]
        private static extern int inflateInit_(ref ZStream sz, string vs, int size);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int inflate(ref ZStream sz, int flush);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int inflateReset(ref ZStream sz);
        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
        private static extern int inflateEnd(ref ZStream sz);
        #endregion
        /// <summary>
        /// Constructs an new instance of the <c>Inflater</c>
        /// </summary>
        public Inflater() : base()
 		{
            int retval = inflateInit_(ref _ztream, Info.Version, Marshal.SizeOf(_ztream));
            if (retval != 0)
                throw new ZLibException(retval, "Could not initialize inflater");
            resetOutput();
        }
        /// <summary>
        /// Adds more data to the codec to be processed.
        /// </summary>
        /// <param name="data">Byte array containing the data to be added to the codec</param>
        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
        /// <param name="count">The number of bytes to add</param>
        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
        public override void Add(byte[] data, int offset, int count)
        {
            if (data == null) throw new ArgumentNullException();
            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
            if ((offset+count) > data.Length) throw new ArgumentException();
            int total = count;
            int inputIndex = offset;
            int err = 0;
            while (err >= 0 && inputIndex < total)
            {
                copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize));
                err = inflate(ref _ztream, (int)FlushTypes.None);
                if (err == 0)
                    while (_ztream.avail_out == 0)
                    {
                        OnDataAvailable();
                        err = inflate(ref _ztream, (int)FlushTypes.None);
                    }
                inputIndex += (int)_ztream.total_in;
            }
            setChecksum( _ztream.adler );
        }
        /// <summary>
        /// Finishes up any pending data that needs to be processed and handled.
        /// </summary>
        public override void Finish()
        {
            int err;
            do 
            {
                err = inflate(ref _ztream, (int)FlushTypes.Finish);
                OnDataAvailable();
            }
            while (err == 0);
            setChecksum( _ztream.adler );
            inflateReset(ref _ztream);
            resetOutput();
        }
        /// <summary>
        /// Closes the internal zlib inflate stream
        /// </summary>
        protected override void CleanUp() { inflateEnd(ref _ztream); }
 	}
 }
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -0,0 +1,274 @@
 //
 // <20> 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)
 //
 using System;
 using System.Collections;
 using System.IO;
 // uncomment the define below to include unit tests
 //#define nunit
 #if nunit
 using NUnit.Framework;
 // Unit tests for the DotZLib class library
 // ----------------------------------------
 //
 // Use this with NUnit 2 from http://www.nunit.org
 //
 namespace DotZLibTests
 {
    using DotZLib;
    // helper methods
    internal class Utils
    {
        public static bool byteArrEqual( byte[] lhs, byte[] rhs )
        {
            if (lhs.Length != rhs.Length)
                return false;
            for (int i = lhs.Length-1; i >= 0; --i)
                if (lhs[i] != rhs[i])
                    return false;
            return true;
        }
    }
    [TestFixture]
    public class CircBufferTests
    {
        #region Circular buffer tests
        [Test]
        public void SinglePutGet()
        {
            CircularBuffer buf = new CircularBuffer(10);
            Assert.AreEqual( 0, buf.Size );
            Assert.AreEqual( -1, buf.Get() );
            Assert.IsTrue(buf.Put( 1 ));
            Assert.AreEqual( 1, buf.Size );
            Assert.AreEqual( 1, buf.Get() );
            Assert.AreEqual( 0, buf.Size );
            Assert.AreEqual( -1, buf.Get() );
        }
        [Test]
        public void BlockPutGet()
        {
            CircularBuffer buf = new CircularBuffer(10);
            byte[] arr = {1,2,3,4,5,6,7,8,9,10};
            Assert.AreEqual( 10, buf.Put(arr,0,10) );
            Assert.AreEqual( 10, buf.Size );
            Assert.IsFalse( buf.Put(11) );
            Assert.AreEqual( 1, buf.Get() );
            Assert.IsTrue( buf.Put(11) );
            byte[] arr2 = (byte[])arr.Clone();
            Assert.AreEqual( 9, buf.Get(arr2,1,9) );
            Assert.IsTrue( Utils.byteArrEqual(arr,arr2) );
        }
        #endregion
    }
    [TestFixture]
    public class ChecksumTests
    {
        #region CRC32 Tests
        [Test]
        public void CRC32_Null()
        {
            CRC32Checksum crc32 = new CRC32Checksum();
            Assert.AreEqual( 0, crc32.Value );
            crc32 = new CRC32Checksum(1);
            Assert.AreEqual( 1, crc32.Value );
            crc32 = new CRC32Checksum(556);
            Assert.AreEqual( 556, crc32.Value );
        }
        [Test]
        public void CRC32_Data()
        {
            CRC32Checksum crc32 = new CRC32Checksum();
            byte[] data = { 1,2,3,4,5,6,7 };
            crc32.Update(data);
            Assert.AreEqual( 0x70e46888, crc32.Value  );
            crc32 = new CRC32Checksum();
            crc32.Update("penguin");
            Assert.AreEqual( 0x0e5c1a120, crc32.Value );
            crc32 = new CRC32Checksum(1);
            crc32.Update("penguin");
            Assert.AreEqual(0x43b6aa94, crc32.Value);
        }
        #endregion
        #region Adler tests
        [Test]
        public void Adler_Null()
        {
            AdlerChecksum adler = new AdlerChecksum();
            Assert.AreEqual(0, adler.Value);
            adler = new AdlerChecksum(1);
            Assert.AreEqual( 1, adler.Value );
            adler = new AdlerChecksum(556);
            Assert.AreEqual( 556, adler.Value );
        }
        [Test]
        public void Adler_Data()
        {
            AdlerChecksum adler = new AdlerChecksum(1);
            byte[] data = { 1,2,3,4,5,6,7 };
            adler.Update(data);
            Assert.AreEqual( 0x5b001d, adler.Value  );
            adler = new AdlerChecksum();
            adler.Update("penguin");
            Assert.AreEqual(0x0bcf02f6, adler.Value );
            adler = new AdlerChecksum(1);
            adler.Update("penguin");
            Assert.AreEqual(0x0bd602f7, adler.Value);
        }
        #endregion
    }
    [TestFixture]
    public class InfoTests
    {
        #region Info tests
        [Test]
        public void Info_Version()
        {
            Info info = new Info();
            Assert.AreEqual("1.2.3", Info.Version);
            Assert.AreEqual(32, info.SizeOfUInt);
            Assert.AreEqual(32, info.SizeOfULong);
            Assert.AreEqual(32, info.SizeOfPointer);
            Assert.AreEqual(32, info.SizeOfOffset);
        }
        #endregion
    }
    [TestFixture]
    public class DeflateInflateTests
    {
        #region Deflate tests
        [Test]
        public void Deflate_Init()
        {
            using (Deflater def = new Deflater(CompressLevel.Default))
            {
            }
        }
        private ArrayList compressedData = new ArrayList();
        private uint adler1;
        private ArrayList uncompressedData = new ArrayList();
        private uint adler2;
        public void CDataAvail(byte[] data, int startIndex, int count)
        {
            for (int i = 0; i < count; ++i)
                compressedData.Add(data[i+startIndex]);
        }
        [Test]
        public void Deflate_Compress()
        {
            compressedData.Clear();
            byte[] testData = new byte[35000];
            for (int i = 0; i < testData.Length; ++i)
                testData[i] = 5;
            using (Deflater def = new Deflater((CompressLevel)5))
            {
                def.DataAvailable += new DataAvailableHandler(CDataAvail);
                def.Add(testData);
                def.Finish();
                adler1 = def.Checksum;
            }
        }
        #endregion
        #region Inflate tests
        [Test]
        public void Inflate_Init()
        {
            using (Inflater inf = new Inflater())
            {
            }
        }
        private void DDataAvail(byte[] data, int startIndex, int count)
        {
            for (int i = 0; i < count; ++i)
                uncompressedData.Add(data[i+startIndex]);
        }
        [Test]
        public void Inflate_Expand()
        { 
            uncompressedData.Clear();
            using (Inflater inf = new Inflater())
            {
                inf.DataAvailable += new DataAvailableHandler(DDataAvail);
                inf.Add((byte[])compressedData.ToArray(typeof(byte)));
                inf.Finish();
                adler2 = inf.Checksum;
            }
            Assert.AreEqual( adler1, adler2 );
        }
        #endregion
    }
    [TestFixture]
    public class GZipStreamTests
    {
        #region GZipStream test
        [Test]
        public void GZipStream_WriteRead()
        {
            using (GZipStream gzOut = new GZipStream("gzstream.gz", CompressLevel.Best))
            {
                BinaryWriter writer = new BinaryWriter(gzOut);
                writer.Write("hi there");
                writer.Write(Math.PI);
                writer.Write(42);
            }
            using (GZipStream gzIn = new GZipStream("gzstream.gz"))
            {
                BinaryReader reader = new BinaryReader(gzIn);
                string s = reader.ReadString();
                Assert.AreEqual("hi there",s);
                double d = reader.ReadDouble();
                Assert.AreEqual(Math.PI, d);
                int i = reader.ReadInt32();
                Assert.AreEqual(42,i);
            }
        }
        #endregion
 	}
 }
 #endif
--- a/contrib/dotzlib/LICENSE_1_0.txt
+++ b/contrib/dotzlib/LICENSE_1_0.txt
@@ -0,0 +1,23 @@
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization
 obtaining a copy of the software and accompanying documentation covered by
 this license (the "Software") to use, reproduce, display, distribute,
 execute, and transmit the Software, and to prepare derivative works of the
 Software, and to permit third-parties to whom the Software is furnished to
 do so, all subject to the following:
 The copyright notices in the Software and this entire statement, including
 the above license grant, this restriction and the following disclaimer,
 must be included in all copies of the Software, in whole or in part, and
 all derivative works of the Software, unless such copies or derivative
 works are solely in the form of machine-executable object code generated by
 a source language processor.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
--- a/contrib/dotzlib/readme.txt
+++ b/contrib/dotzlib/readme.txt
@@ -0,0 +1,58 @@
 This directory contains a .Net wrapper class library for the ZLib1.dll
 The wrapper includes support for inflating/deflating memory buffers, 
 .Net streaming wrappers for the gz streams part of zlib, and wrappers
 for the checksum parts of zlib. See DotZLib/UnitTests.cs for examples.
 Directory structure:
 --------------------
 LICENSE_1_0.txt       - License file.
 readme.txt            - This file.
 DotZLib.chm           - Class library documentation
 DotZLib.build         - NAnt build file
 DotZLib.sln           - Microsoft Visual Studio 2003 solution file
 DotZLib\*.cs          - Source files for the class library
 Unit tests:
 -----------
 The file DotZLib/UnitTests.cs contains unit tests for use with NUnit 2.1 or higher.
 To include unit tests in the build, define nunit before building.
 Build instructions:
 -------------------
 1. Using Visual Studio.Net 2003:
   Open DotZLib.sln in VS.Net and build from there. Output file (DotZLib.dll)
   will be found ./DotZLib/bin/release or ./DotZLib/bin/debug, depending on 
   you are building the release or debug version of the library. Check 
   DotZLib/UnitTests.cs for instructions on how to include unit tests in the
   build.
 2. Using NAnt:
   Open a command prompt with access to the build environment and run nant
   in the same directory as the DotZLib.build file.
   You can define 2 properties on the nant command-line to control the build:
   debug={true|false} to toggle between release/debug builds (default=true).
   nunit={true|false} to include or esclude unit tests (default=true).
   Also the target clean will remove binaries.
   Output file (DotZLib.dll) will be found in either ./DotZLib/bin/release 
   or ./DotZLib/bin/debug, depending on whether you are building the release 
   or debug version of the library.
   Examples: 
     nant -D:debug=false -D:nunit=false
       will build a release mode version of the library without unit tests.
     nant
       will build a debug version of the library with unit tests 
     nant clean
       will remove all previously built files.
 ---------------------------------
 Copyright (c) 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)
--- a/contrib/infback9/infback9.c
+++ b/contrib/infback9/infback9.c
@@ -1,5 +1,5 @@
 /* infback9.c -- inflate deflate64 data using a call-back interface
- * Copyright (C) 1995-2003 Mark Adler
+ * Copyright (C) 1995-2008 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@@ -242,7 +242,7 @@ void FAR *out_desc;
    code const FAR *distcode;   /* starting table for distance codes */
    unsigned lenbits;           /* index bits for lencode */
    unsigned distbits;          /* index bits for distcode */
-    code this;                  /* current decoding table entry */
+    code here;                  /* current decoding table entry */
    code last;                  /* parent table entry */
    unsigned len;               /* length to copy for repeats, bits to drop */
    int ret;                    /* return code */
@@ -384,19 +384,19 @@ void FAR *out_desc;
            state->have = 0;
            while (state->have < state->nlen + state->ndist) {
                for (;;) {
-                    this = lencode[BITS(lenbits)];
+                    here = lencode[BITS(lenbits)];
-                    if ((unsigned)(this.bits) <= bits) break;
+                    if ((unsigned)(here.bits) <= bits) break;
                    PULLBYTE();
                }
-                if (this.val < 16) {
+                if (here.val < 16) {
-                    NEEDBITS(this.bits);
+                    NEEDBITS(here.bits);
-                    DROPBITS(this.bits);
+                    DROPBITS(here.bits);
-                    state->lens[state->have++] = this.val;
+                    state->lens[state->have++] = here.val;
                }
                else {
-                    if (this.val == 16) {
+                    if (here.val == 16) {
-                        NEEDBITS(this.bits + 2);
+                        NEEDBITS(here.bits + 2);
-                        DROPBITS(this.bits);
+                        DROPBITS(here.bits);
                        if (state->have == 0) {
                            strm->msg = (char *)"invalid bit length repeat";
                            mode = BAD;
@@ -406,16 +406,16 @@ void FAR *out_desc;
                        copy = 3 + BITS(2);
                        DROPBITS(2);
                    }
-                    else if (this.val == 17) {
+                    else if (here.val == 17) {
-                        NEEDBITS(this.bits + 3);
+                        NEEDBITS(here.bits + 3);
-                        DROPBITS(this.bits);
+                        DROPBITS(here.bits);
                        len = 0;
                        copy = 3 + BITS(3);
                        DROPBITS(3);
                    }
                    else {
-                        NEEDBITS(this.bits + 7);
+                        NEEDBITS(here.bits + 7);
-                        DROPBITS(this.bits);
+                        DROPBITS(here.bits);
                        len = 0;
                        copy = 11 + BITS(7);
                        DROPBITS(7);
@@ -430,7 +430,19 @@ void FAR *out_desc;
                }
            }
-            /* build code tables */
+            /* handle error breaks in while */
            if (mode == BAD) break;
            /* check for end-of-block code (better have one) */
            if (state->lens[256] == 0) {
                strm->msg = (char *)"invalid code -- missing end-of-block";
                mode = BAD;
                break;
            }
            /* build code tables -- note: do not change the lenbits or distbits
               values here (9 and 6) without reading the comments in inftree9.h
               concerning the ENOUGH constants, which depend on those values */
            state->next = state->codes;
            lencode = (code const FAR *)(state->next);
            lenbits = 9;
@@ -457,28 +469,28 @@ void FAR *out_desc;
        case LEN:
            /* get a literal, length, or end-of-block code */
            for (;;) {
-                this = lencode[BITS(lenbits)];
+                here = lencode[BITS(lenbits)];
-                if ((unsigned)(this.bits) <= bits) break;
+                if ((unsigned)(here.bits) <= bits) break;
                PULLBYTE();
            }
-            if (this.op && (this.op & 0xf0) == 0) {
+            if (here.op && (here.op & 0xf0) == 0) {
-                last = this;
+                last = here;
                for (;;) {
-                    this = lencode[last.val +
+                    here = lencode[last.val +
                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
                    PULLBYTE();
                }
                DROPBITS(last.bits);
            }
-            DROPBITS(this.bits);
+            DROPBITS(here.bits);
-            length = (unsigned)this.val;
+            length = (unsigned)here.val;
            /* process literal */
-            if (this.op == 0) {
+            if (here.op == 0) {
-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", this.val));
+                        "inflate:         literal 0x%02x\n", here.val));
                ROOM();
                *put++ = (unsigned char)(length);
                left--;
@@ -487,21 +499,21 @@ void FAR *out_desc;
            }
            /* process end of block */
-            if (this.op & 32) {
+            if (here.op & 32) {
                Tracevv((stderr, "inflate:         end of block\n"));
                mode = TYPE;
                break;
            }
            /* invalid code */
-            if (this.op & 64) {
+            if (here.op & 64) {
                strm->msg = (char *)"invalid literal/length code";
                mode = BAD;
                break;
            }
            /* length code -- get extra bits, if any */
-            extra = (unsigned)(this.op) & 31;
+            extra = (unsigned)(here.op) & 31;
            if (extra != 0) {
                NEEDBITS(extra);
                length += BITS(extra);
@@ -511,30 +523,30 @@ void FAR *out_desc;
            /* get distance code */
            for (;;) {
-                this = distcode[BITS(distbits)];
+                here = distcode[BITS(distbits)];
-                if ((unsigned)(this.bits) <= bits) break;
+                if ((unsigned)(here.bits) <= bits) break;
                PULLBYTE();
            }
-            if ((this.op & 0xf0) == 0) {
+            if ((here.op & 0xf0) == 0) {
-                last = this;
+                last = here;
                for (;;) {
-                    this = distcode[last.val +
+                    here = distcode[last.val +
                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
                    PULLBYTE();
                }
                DROPBITS(last.bits);
            }
-            DROPBITS(this.bits);
+            DROPBITS(here.bits);
-            if (this.op & 64) {
+            if (here.op & 64) {
                strm->msg = (char *)"invalid distance code";
                mode = BAD;
                break;
            }
-            offset = (unsigned)this.val;
+            offset = (unsigned)here.val;
            /* get distance extra bits, if any */
-            extra = (unsigned)(this.op) & 15;
+            extra = (unsigned)(here.op) & 15;
            if (extra != 0) {
                NEEDBITS(extra);
                offset += BITS(extra);
--- a/contrib/infback9/infback9.h
+++ b/contrib/infback9/infback9.h
@@ -16,6 +16,10 @@
 * zlib.h must be included before this header file.
 */
 #ifdef __cplusplus
 extern "C" {
 #endif
 ZEXTERN int ZEXPORT inflateBack9 OF((z_stream FAR *strm,
                                    in_func in, void FAR *in_desc,
                                    out_func out, void FAR *out_desc));
@@ -27,3 +31,7 @@ ZEXTERN int ZEXPORT inflateBack9Init_ OF((z_stream FAR *strm,
 #define inflateBack9Init(strm, window) \
        inflateBack9Init_((strm), (window), \
        ZLIB_VERSION, sizeof(z_stream))
 #ifdef __cplusplus
 }
 #endif
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
 /* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2003 Mark Adler
+ * Copyright (C) 1995-2008 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.0.8 Copyright 1995-2003 Mark Adler ";
+   " inflate9 1.2.3.5 Copyright 1995-2009 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, 76, 203};
+        133, 133, 133, 133, 144, 69, 199};
    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,
@@ -128,7 +128,7 @@ unsigned short FAR *work;
        left -= count[len];
        if (left < 0) return -1;        /* over-subscribed */
    }
-    if (left > 0 && (type == CODES || (codes - count[0] != 1)))
+    if (left > 0 && (type == CODES || max != 1))
        return -1;                      /* incomplete set */
    /* generate offsets into symbol table for each length for sorting */
@@ -160,11 +160,10 @@ unsigned short FAR *work;
       entered in the tables.
       used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked when a LENS table is being made
+       provided *table space.  It is checked for LENS and DIST tables against
-       against the space in *table, ENOUGH, minus the maximum space needed by
+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-       the worst case distance code, MAXD.  This should never happen, but the
+       the initial root table size constants.  See the comments in inftree9.h
-       sufficiency of ENOUGH has not been proven exhaustively, hence the check.
+       for more information.
       This assumes that when type == LENS, bits == 9.
       sym increments through all symbols, and the loop terminates when
       all codes of length max, i.e. all codes, have been processed.  This
@@ -203,7 +202,8 @@ unsigned short FAR *work;
    mask = used - 1;            /* mask for comparing low */
    /* check available table space */
-    if (type == LENS && used >= ENOUGH - MAXD)
+    if ((type == LENS && used >= ENOUGH_LENS) ||
        (type == DISTS && used >= ENOUGH_DISTS))
        return 1;
    /* process all codes and make table entries */
@@ -270,7 +270,8 @@ unsigned short FAR *work;
            /* check for enough space */
            used += 1U << curr;
-            if (type == LENS && used >= ENOUGH - MAXD)
+            if ((type == LENS && used >= ENOUGH_LENS) ||
                (type == DISTS && used >= ENOUGH_DISTS))
                return 1;
            /* point entry in root table to sub-table */
--- a/contrib/infback9/inftree9.h
+++ b/contrib/infback9/inftree9.h
@@ -1,5 +1,5 @@
 /* inftree9.h -- header to use inftree9.c
- * Copyright (C) 1995-2003 Mark Adler
+ * Copyright (C) 1995-2008 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@@ -35,15 +35,21 @@ typedef struct {
    01000000 - invalid code
 */
-/* Maximum size of dynamic tree.  The maximum found in a long but non-
+/* Maximum size of the dynamic table.  The maximum number of code structures is
-   exhaustive search was 1004 code structures (850 for length/literals
+   1446, which is the sum of 852 for literal/length codes and 594 for distance
-   and 154 for distances, the latter actually the result of an
+   codes.  These values were found by exhaustive searches using the program
-   exhaustive search).  The true maximum is not known, but the value
+   examples/enough.c found in the zlib distribtution.  The arguments to that
-   below is more than safe. */
+   program are the number of symbols, the initial root table size, and the
-#define ENOUGH 1440
+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-#define MAXD 154
+   returns returns 852, and "enough 32 6 15" for distance codes returns 594.
   The initial root table size (9 or 6) is found in the fifth argument of the
   inflate_table() calls in infback9.c.  If the root table size is changed,
   then these maximum sizes would be need to be recalculated and updated. */
 #define ENOUGH_LENS 852
 #define ENOUGH_DISTS 594
 #define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
-/* Type of code to build for inftable() */
+/* Type of code to build for inflate_table9() */
 typedef enum {
    CODES,
    LENS,
--- a/contrib/inflate86/inffas86.c
+++ b/contrib/inflate86/inffas86.c
--- a/contrib/inflate86/inffast.S
+++ b/contrib/inflate86/inffast.S
@@ -188,17 +188,8 @@
 /*
 * typedef enum inflate_mode consts, in inflate.h
 */
 #ifndef NO_GUNZIP
 #define GUNZIP
 #endif
 #ifdef GUNZIP
 #define INFLATE_MODE_TYPE 11  /* state->mode flags enum-ed in inflate.h */
 #define INFLATE_MODE_BAD  26
 #else
 #define INFLATE_MODE_TYPE 3
 #define INFLATE_MODE_BAD  17
 #endif
 #if ! defined( USE_MMX ) && ! defined( NO_MMX )
--- a/contrib/masm686/match.asm
+++ b/contrib/masm686/match.asm
@@ -1,408 +1,413 @@
-
+
-; match.asm -- Pentium-Pro optimized version of longest_match()
+; match.asm -- Pentium-Pro optimized version of longest_match()
-;
+;
-; Updated for zlib 1.1.3 and converted to MASM 6.1x
+; Updated for zlib 1.1.3 and converted to MASM 6.1x
-; Copyright (C) 2000 Dan Higdon <hdan@kinesoft.com>
+; Copyright (C) 2000 Dan Higdon <hdan@kinesoft.com>
-;                    and Chuck Walbourn <chuckw@kinesoft.com>
+;                    and Chuck Walbourn <chuckw@kinesoft.com>
-; Corrections by Cosmin Truta <cosmint@cs.ubbcluj.ro>
+; Corrections by Cosmin Truta <cosmint@cs.ubbcluj.ro>
-;
+;
-; This is free software; you can redistribute it and/or modify it
+; This is free software; you can redistribute it and/or modify it
-; under the terms of the GNU General Public License.
+; under the terms of the GNU General Public License.
-
+
-; Based on match.S
+; Based on match.S
-; Written for zlib 1.1.2
+; Written for zlib 1.1.2
-; Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>
+; Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>
-
+;
-	.686P
+; Modified by Gilles Vollant (2005) for add gzhead and gzindex
-	.MODEL	FLAT
+
-
+	.686P
-;===========================================================================
+	.MODEL	FLAT
-; EQUATES
+
-;===========================================================================
+;===========================================================================
-
+; EQUATES
-MAX_MATCH	EQU 258
+;===========================================================================
-MIN_MATCH	EQU 3
+
-MIN_LOOKAHEAD	EQU (MAX_MATCH + MIN_MATCH + 1)
+MAX_MATCH	EQU 258
-MAX_MATCH_8	EQU ((MAX_MATCH + 7) AND (NOT 7))
+MIN_MATCH	EQU 3
-
+MIN_LOOKAHEAD	EQU (MAX_MATCH + MIN_MATCH + 1)
-;===========================================================================
+MAX_MATCH_8	EQU ((MAX_MATCH + 7) AND (NOT 7))
-; STRUCTURES
+
-;===========================================================================
+;===========================================================================
-
+; STRUCTURES
-; This STRUCT assumes a 4-byte alignment
+;===========================================================================
-
+
-DEFLATE_STATE	STRUCT
+; This STRUCT assumes a 4-byte alignment
-ds_strm			dd ?
+
-ds_status		dd ?
+DEFLATE_STATE	STRUCT
-ds_pending_buf		dd ?
+ds_strm			dd ?
-ds_pending_buf_size	dd ?
+ds_status		dd ?
-ds_pending_out		dd ?
+ds_pending_buf		dd ?
-ds_pending		dd ?
+ds_pending_buf_size	dd ?
-ds_wrap			dd ?
+ds_pending_out		dd ?
-ds_data_type		db ?
+ds_pending		dd ?
-ds_method		db ?
+ds_wrap			dd ?
-			db ?	; padding
+; gzhead and gzindex are added in zlib 1.2.2.2 (see deflate.h)
-			db ?	; padding
+ds_gzhead               dd ?
-ds_last_flush		dd ?
+ds_gzindex              dd ?
-ds_w_size		dd ?	; used
+ds_data_type		db ?
-ds_w_bits		dd ?
+ds_method		db ?
-ds_w_mask		dd ?	; used
+			db ?	; padding
-ds_window		dd ?	; used
+			db ?	; padding
-ds_window_size		dd ?
+ds_last_flush		dd ?
-ds_prev			dd ?	; used
+ds_w_size		dd ?	; used
-ds_head			dd ?
+ds_w_bits		dd ?
-ds_ins_h		dd ?
+ds_w_mask		dd ?	; used
-ds_hash_size		dd ?
+ds_window		dd ?	; used
-ds_hash_bits		dd ?
+ds_window_size		dd ?
-ds_hash_mask		dd ?
+ds_prev			dd ?	; used
-ds_hash_shift		dd ?
+ds_head			dd ?
-ds_block_start		dd ?
+ds_ins_h		dd ?
-ds_match_length		dd ?	; used
+ds_hash_size		dd ?
-ds_prev_match		dd ?	; used
+ds_hash_bits		dd ?
-ds_match_available	dd ?
+ds_hash_mask		dd ?
-ds_strstart		dd ?	; used
+ds_hash_shift		dd ?
-ds_match_start		dd ?	; used
+ds_block_start		dd ?
-ds_lookahead		dd ?	; used
+ds_match_length		dd ?	; used
-ds_prev_length		dd ?	; used
+ds_prev_match		dd ?	; used
-ds_max_chain_length	dd ?	; used
+ds_match_available	dd ?
-ds_max_laxy_match	dd ?
+ds_strstart		dd ?	; used
-ds_level		dd ?
+ds_match_start		dd ?	; used
-ds_strategy		dd ?
+ds_lookahead		dd ?	; used
-ds_good_match		dd ?	; used
+ds_prev_length		dd ?	; used
-ds_nice_match		dd ?	; used
+ds_max_chain_length	dd ?	; used
-
+ds_max_laxy_match	dd ?
-; Don't need anymore of the struct for match
+ds_level		dd ?
-DEFLATE_STATE	ENDS
+ds_strategy		dd ?
-
+ds_good_match		dd ?	; used
-;===========================================================================
+ds_nice_match		dd ?	; used
-; CODE
+
-;===========================================================================
+; Don't need anymore of the struct for match
-_TEXT	SEGMENT
+DEFLATE_STATE	ENDS
-
+
-;---------------------------------------------------------------------------
+;===========================================================================
-; match_init
+; CODE
-;---------------------------------------------------------------------------
+;===========================================================================
-	ALIGN	4
+_TEXT	SEGMENT
-PUBLIC	_match_init
+
-_match_init	PROC
+;---------------------------------------------------------------------------
-	; no initialization needed
+; match_init
-	ret
+;---------------------------------------------------------------------------
-_match_init	ENDP
+	ALIGN	4
-
+PUBLIC	_match_init
-;---------------------------------------------------------------------------
+_match_init	PROC
-; uInt longest_match(deflate_state *deflatestate, IPos curmatch)
+	; no initialization needed
-;---------------------------------------------------------------------------
+	ret
-	ALIGN	4
+_match_init	ENDP
-
+
-PUBLIC	_longest_match
+;---------------------------------------------------------------------------
-_longest_match	PROC
+; uInt longest_match(deflate_state *deflatestate, IPos curmatch)
-
+;---------------------------------------------------------------------------
-; Since this code uses EBP for a scratch register, the stack frame must
+	ALIGN	4
-; be manually constructed and referenced relative to the ESP register.
+
-
+PUBLIC	_longest_match
-; Stack image
+_longest_match	PROC
-; Variables
+
-chainlenwmask	=  0	; high word: current chain len
+; Since this code uses EBP for a scratch register, the stack frame must
-			; low word: s->wmask
+; be manually constructed and referenced relative to the ESP register.
-window		=  4	; local copy of s->window
+
-windowbestlen	=  8	; s->window + bestlen
+; Stack image
-scanend		= 12	; last two bytes of string
+; Variables
-scanstart	= 16	; first two bytes of string
+chainlenwmask	=  0	; high word: current chain len
-scanalign	= 20	; dword-misalignment of string
+			; low word: s->wmask
-nicematch	= 24	; a good enough match size
+window		=  4	; local copy of s->window
-bestlen		= 28	; size of best match so far
+windowbestlen	=  8	; s->window + bestlen
-scan		= 32	; ptr to string wanting match
+scanend		= 12	; last two bytes of string
-varsize		= 36	; number of bytes (also offset to last saved register)
+scanstart	= 16	; first two bytes of string
-
+scanalign	= 20	; dword-misalignment of string
-; Saved Registers (actually pushed into place)
+nicematch	= 24	; a good enough match size
-ebx_save	= 36
+bestlen		= 28	; size of best match so far
-edi_save	= 40
+scan		= 32	; ptr to string wanting match
-esi_save	= 44
+varsize		= 36	; number of bytes (also offset to last saved register)
-ebp_save	= 48
+
-
+; Saved Registers (actually pushed into place)
-; Parameters
+ebx_save	= 36
-retaddr		= 52
+edi_save	= 40
-deflatestate	= 56
+esi_save	= 44
-curmatch	= 60
+ebp_save	= 48
-
+
-; Save registers that the compiler may be using
+; Parameters
-	push	ebp
+retaddr		= 52
-	push	edi
+deflatestate	= 56
-	push	esi
+curmatch	= 60
-	push	ebx
+
-
+; Save registers that the compiler may be using
-; Allocate local variable space
+	push	ebp
-	sub	esp,varsize
+	push	edi
-
+	push	esi
-; Retrieve the function arguments. ecx will hold cur_match
+	push	ebx
-; throughout the entire function. edx will hold the pointer to the
+
-; deflate_state structure during the function's setup (before
+; Allocate local variable space
-; entering the main loop).
+	sub	esp,varsize
-
+
-	mov	edx, [esp+deflatestate]
+; Retrieve the function arguments. ecx will hold cur_match
-ASSUME	edx:PTR DEFLATE_STATE
+; throughout the entire function. edx will hold the pointer to the
-
+; deflate_state structure during the function's setup (before
-	mov	ecx, [esp+curmatch]
+; entering the main loop).
-
+
-; uInt wmask = s->w_mask;
+	mov	edx, [esp+deflatestate]
-; unsigned chain_length = s->max_chain_length;
+ASSUME	edx:PTR DEFLATE_STATE
-; if (s->prev_length >= s->good_match) {
+
-;     chain_length >>= 2;
+	mov	ecx, [esp+curmatch]
-; }
+
-
+; uInt wmask = s->w_mask;
-	mov	eax, [edx].ds_prev_length
+; unsigned chain_length = s->max_chain_length;
-	mov	ebx, [edx].ds_good_match
+; if (s->prev_length >= s->good_match) {
-	cmp	eax, ebx
+;     chain_length >>= 2;
-	mov	eax, [edx].ds_w_mask
+; }
-	mov	ebx, [edx].ds_max_chain_length
+
-	jl	SHORT LastMatchGood
+	mov	eax, [edx].ds_prev_length
-	shr	ebx, 2
+	mov	ebx, [edx].ds_good_match
-LastMatchGood:
+	cmp	eax, ebx
-
+	mov	eax, [edx].ds_w_mask
-; chainlen is decremented once beforehand so that the function can
+	mov	ebx, [edx].ds_max_chain_length
-; use the sign flag instead of the zero flag for the exit test.
+	jl	SHORT LastMatchGood
-; It is then shifted into the high word, to make room for the wmask
+	shr	ebx, 2
-; value, which it will always accompany.
+LastMatchGood:
-
+
-	dec	ebx
+; chainlen is decremented once beforehand so that the function can
-	shl	ebx, 16
+; use the sign flag instead of the zero flag for the exit test.
-	or	ebx, eax
+; It is then shifted into the high word, to make room for the wmask
-	mov	[esp+chainlenwmask], ebx
+; value, which it will always accompany.
-
+
-; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+	dec	ebx
-
+	shl	ebx, 16
-	mov	eax, [edx].ds_nice_match
+	or	ebx, eax
-	mov	ebx, [edx].ds_lookahead
+	mov	[esp+chainlenwmask], ebx
-	cmp	ebx, eax
+
-	jl	SHORT LookaheadLess
+; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-	mov	ebx, eax
+
-LookaheadLess:
+	mov	eax, [edx].ds_nice_match
-	mov	[esp+nicematch], ebx
+	mov	ebx, [edx].ds_lookahead
-
+	cmp	ebx, eax
-;/* register Bytef *scan = s->window + s->strstart;                     */
+	jl	SHORT LookaheadLess
-
+	mov	ebx, eax
-	mov	esi, [edx].ds_window
+LookaheadLess:
-	mov	[esp+window], esi
+	mov	[esp+nicematch], ebx
-	mov	ebp, [edx].ds_strstart
+
-	lea	edi, [esi+ebp]
+;/* register Bytef *scan = s->window + s->strstart;                     */
-	mov	[esp+scan],edi
+
-
+	mov	esi, [edx].ds_window
-;/* Determine how many bytes the scan ptr is off from being             */
+	mov	[esp+window], esi
-;/* dword-aligned.                                                      */
+	mov	ebp, [edx].ds_strstart
-
+	lea	edi, [esi+ebp]
-	mov	eax, edi
+	mov	[esp+scan],edi
-	neg	eax
+
-	and	eax, 3
+;/* Determine how many bytes the scan ptr is off from being             */
-	mov	[esp+scanalign], eax
+;/* dword-aligned.                                                      */
-
+
-;/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?                      */
+	mov	eax, edi
-;/*     s->strstart - (IPos)MAX_DIST(s) : NIL;                          */
+	neg	eax
-
+	and	eax, 3
-	mov	eax, [edx].ds_w_size
+	mov	[esp+scanalign], eax
-	sub	eax, MIN_LOOKAHEAD
+
-	sub	ebp, eax
+;/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?                      */
-	jg	SHORT LimitPositive
+;/*     s->strstart - (IPos)MAX_DIST(s) : NIL;                          */
-	xor	ebp, ebp
+
-LimitPositive:
+	mov	eax, [edx].ds_w_size
-
+	sub	eax, MIN_LOOKAHEAD
-;/* int best_len = s->prev_length;                                      */
+	sub	ebp, eax
-
+	jg	SHORT LimitPositive
-	mov	eax, [edx].ds_prev_length
+	xor	ebp, ebp
-	mov	[esp+bestlen], eax
+LimitPositive:
-
+
-;/* Store the sum of s->window + best_len in %esi locally, and in %esi. */
+;/* int best_len = s->prev_length;                                      */
-
+
-	add	esi, eax
+	mov	eax, [edx].ds_prev_length
-	mov	[esp+windowbestlen], esi
+	mov	[esp+bestlen], eax
-
+
-;/* register ush scan_start = *(ushf*)scan;                             */
+;/* Store the sum of s->window + best_len in %esi locally, and in %esi. */
-;/* register ush scan_end   = *(ushf*)(scan+best_len-1);                */
+
-;/* Posf *prev = s->prev;                                               */
+	add	esi, eax
-
+	mov	[esp+windowbestlen], esi
-	movzx	ebx, WORD PTR[edi]
+
-	mov	[esp+scanstart], ebx
+;/* register ush scan_start = *(ushf*)scan;                             */
-	movzx	ebx, WORD PTR[eax+edi-1]
+;/* register ush scan_end   = *(ushf*)(scan+best_len-1);                */
-	mov	[esp+scanend], ebx
+;/* Posf *prev = s->prev;                                               */
-	mov	edi, [edx].ds_prev
+
-
+	movzx	ebx, WORD PTR[edi]
-;/* Jump into the main loop.                                            */
+	mov	[esp+scanstart], ebx
-
+	movzx	ebx, WORD PTR[eax+edi-1]
-	mov	edx, [esp+chainlenwmask]
+	mov	[esp+scanend], ebx
-	jmp	SHORT LoopEntry
+	mov	edi, [edx].ds_prev
-
+
-;/* do {
+;/* Jump into the main loop.                                            */
-; *     match = s->window + cur_match;
+
-; *     if (*(ushf*)(match+best_len-1) != scan_end ||
+	mov	edx, [esp+chainlenwmask]
-; *         *(ushf*)match != scan_start) continue;
+	jmp	SHORT LoopEntry
-; *     [...]
+
-; * } while ((cur_match = prev[cur_match & wmask]) > limit
+;/* do {
-; *          && --chain_length != 0);
+; *     match = s->window + cur_match;
-; *
+; *     if (*(ushf*)(match+best_len-1) != scan_end ||
-; * Here is the inner loop of the function. The function will spend the
+; *         *(ushf*)match != scan_start) continue;
-; * majority of its time in this loop, and majority of that time will
+; *     [...]
-; * be spent in the first ten instructions.
+; * } while ((cur_match = prev[cur_match & wmask]) > limit
-; *
+; *          && --chain_length != 0);
-; * Within this loop:
+; *
-; * %ebx = scanend
+; * Here is the inner loop of the function. The function will spend the
-; * %ecx = curmatch
+; * majority of its time in this loop, and majority of that time will
-; * %edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
+; * be spent in the first ten instructions.
-; * %esi = windowbestlen - i.e., (window + bestlen)
+; *
-; * %edi = prev
+; * Within this loop:
-; * %ebp = limit
+; * %ebx = scanend
-; */
+; * %ecx = curmatch
-
+; * %edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
-	ALIGN	4
+; * %esi = windowbestlen - i.e., (window + bestlen)
-LookupLoop:
+; * %edi = prev
-	and	ecx, edx
+; * %ebp = limit
-	movzx	ecx, WORD PTR[edi+ecx*2]
+; */
-	cmp	ecx, ebp
+
-	jbe	LeaveNow
+	ALIGN	4
-	sub	edx, 000010000H
+LookupLoop:
-	js	LeaveNow
+	and	ecx, edx
-
+	movzx	ecx, WORD PTR[edi+ecx*2]
-LoopEntry:
+	cmp	ecx, ebp
-	movzx	eax, WORD PTR[esi+ecx-1]
+	jbe	LeaveNow
-	cmp	eax, ebx
+	sub	edx, 000010000H
-	jnz	SHORT LookupLoop
+	js	LeaveNow
-
+
-	mov	eax, [esp+window]
+LoopEntry:
-	movzx	eax, WORD PTR[eax+ecx]
+	movzx	eax, WORD PTR[esi+ecx-1]
-	cmp	eax, [esp+scanstart]
+	cmp	eax, ebx
-	jnz	SHORT LookupLoop
+	jnz	SHORT LookupLoop
-
+
-;/* Store the current value of chainlen.                                */
+	mov	eax, [esp+window]
-
+	movzx	eax, WORD PTR[eax+ecx]
-	mov	[esp+chainlenwmask], edx
+	cmp	eax, [esp+scanstart]
-
+	jnz	SHORT LookupLoop
-;/* Point %edi to the string under scrutiny, and %esi to the string we  */
+
-;/* are hoping to match it up with. In actuality, %esi and %edi are     */
+;/* Store the current value of chainlen.                                */
-;/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is     */
+
-;/* initialized to -(MAX_MATCH_8 - scanalign).                          */
+	mov	[esp+chainlenwmask], edx
-
+
-	mov	esi, [esp+window]
+;/* Point %edi to the string under scrutiny, and %esi to the string we  */
-	mov	edi, [esp+scan]
+;/* are hoping to match it up with. In actuality, %esi and %edi are     */
-	add	esi, ecx
+;/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is     */
-	mov	eax, [esp+scanalign]
+;/* initialized to -(MAX_MATCH_8 - scanalign).                          */
-	mov	edx, -MAX_MATCH_8
+
-	lea	edi, [edi+eax+MAX_MATCH_8]
+	mov	esi, [esp+window]
-	lea	esi, [esi+eax+MAX_MATCH_8]
+	mov	edi, [esp+scan]
-
+	add	esi, ecx
-;/* Test the strings for equality, 8 bytes at a time. At the end,
+	mov	eax, [esp+scanalign]
-; * adjust %edx so that it is offset to the exact byte that mismatched.
+	mov	edx, -MAX_MATCH_8
-; *
+	lea	edi, [edi+eax+MAX_MATCH_8]
-; * We already know at this point that the first three bytes of the
+	lea	esi, [esi+eax+MAX_MATCH_8]
-; * strings match each other, and they can be safely passed over before
+
-; * starting the compare loop. So what this code does is skip over 0-3
+;/* Test the strings for equality, 8 bytes at a time. At the end,
-; * bytes, as much as necessary in order to dword-align the %edi
+; * adjust %edx so that it is offset to the exact byte that mismatched.
-; * pointer. (%esi will still be misaligned three times out of four.)
+; *
-; *
+; * We already know at this point that the first three bytes of the
-; * It should be confessed that this loop usually does not represent
+; * strings match each other, and they can be safely passed over before
-; * much of the total running time. Replacing it with a more
+; * starting the compare loop. So what this code does is skip over 0-3
-; * straightforward "rep cmpsb" would not drastically degrade
+; * bytes, as much as necessary in order to dword-align the %edi
-; * performance.
+; * pointer. (%esi will still be misaligned three times out of four.)
-; */
+; *
-
+; * It should be confessed that this loop usually does not represent
-LoopCmps:
+; * much of the total running time. Replacing it with a more
-	mov	eax, DWORD PTR[esi+edx]
+; * straightforward "rep cmpsb" would not drastically degrade
-	xor	eax, DWORD PTR[edi+edx]
+; * performance.
-	jnz	SHORT LeaveLoopCmps
+; */
-
+
-	mov	eax, DWORD PTR[esi+edx+4]
+LoopCmps:
-	xor	eax, DWORD PTR[edi+edx+4]
+	mov	eax, DWORD PTR[esi+edx]
-	jnz	SHORT LeaveLoopCmps4
+	xor	eax, DWORD PTR[edi+edx]
-
+	jnz	SHORT LeaveLoopCmps
-	add	edx, 8
+
-	jnz	SHORT LoopCmps
+	mov	eax, DWORD PTR[esi+edx+4]
-	jmp	LenMaximum
+	xor	eax, DWORD PTR[edi+edx+4]
-	ALIGN	4
+	jnz	SHORT LeaveLoopCmps4
-
+
-LeaveLoopCmps4:
+	add	edx, 8
-	add	edx, 4
+	jnz	SHORT LoopCmps
-
+	jmp	LenMaximum
-LeaveLoopCmps:
+	ALIGN	4
-	test	eax, 00000FFFFH
+
-	jnz	SHORT LenLower
+LeaveLoopCmps4:
-
+	add	edx, 4
-	add	edx, 2
+
-	shr	eax, 16
+LeaveLoopCmps:
-
+	test	eax, 00000FFFFH
-LenLower:
+	jnz	SHORT LenLower
-	sub	al, 1
+
-	adc	edx, 0
+	add	edx, 2
-
+	shr	eax, 16
-;/* Calculate the length of the match. If it is longer than MAX_MATCH,  */
+
-;/* then automatically accept it as the best possible match and leave.  */
+LenLower:
-
+	sub	al, 1
-	lea	eax, [edi+edx]
+	adc	edx, 0
-	mov	edi, [esp+scan]
+
-	sub	eax, edi
+;/* Calculate the length of the match. If it is longer than MAX_MATCH,  */
-	cmp	eax, MAX_MATCH
+;/* then automatically accept it as the best possible match and leave.  */
-	jge	SHORT LenMaximum
+
-
+	lea	eax, [edi+edx]
-;/* If the length of the match is not longer than the best match we     */
+	mov	edi, [esp+scan]
-;/* have so far, then forget it and return to the lookup loop.          */
+	sub	eax, edi
-
+	cmp	eax, MAX_MATCH
-	mov	edx, [esp+deflatestate]
+	jge	SHORT LenMaximum
-	mov	ebx, [esp+bestlen]
+
-	cmp	eax, ebx
+;/* If the length of the match is not longer than the best match we     */
-	jg	SHORT LongerMatch
+;/* have so far, then forget it and return to the lookup loop.          */
-	mov	esi, [esp+windowbestlen]
+
-	mov	edi, [edx].ds_prev
+	mov	edx, [esp+deflatestate]
-	mov	ebx, [esp+scanend]
+	mov	ebx, [esp+bestlen]
-	mov	edx, [esp+chainlenwmask]
+	cmp	eax, ebx
-	jmp	LookupLoop
+	jg	SHORT LongerMatch
-	ALIGN	4
+	mov	esi, [esp+windowbestlen]
-
+	mov	edi, [edx].ds_prev
-;/*         s->match_start = cur_match;                                 */
+	mov	ebx, [esp+scanend]
-;/*         best_len = len;                                             */
+	mov	edx, [esp+chainlenwmask]
-;/*         if (len >= nice_match) break;                               */
+	jmp	LookupLoop
-;/*         scan_end = *(ushf*)(scan+best_len-1);                       */
+	ALIGN	4
-
+
-LongerMatch:
+;/*         s->match_start = cur_match;                                 */
-	mov	ebx, [esp+nicematch]
+;/*         best_len = len;                                             */
-	mov	[esp+bestlen], eax
+;/*         if (len >= nice_match) break;                               */
-	mov	[edx].ds_match_start, ecx
+;/*         scan_end = *(ushf*)(scan+best_len-1);                       */
-	cmp	eax, ebx
+
-	jge	SHORT LeaveNow
+LongerMatch:
-	mov	esi, [esp+window]
+	mov	ebx, [esp+nicematch]
-	add	esi, eax
+	mov	[esp+bestlen], eax
-	mov	[esp+windowbestlen], esi
+	mov	[edx].ds_match_start, ecx
-	movzx	ebx, WORD PTR[edi+eax-1]
+	cmp	eax, ebx
-	mov	edi, [edx].ds_prev
+	jge	SHORT LeaveNow
-	mov	[esp+scanend], ebx
+	mov	esi, [esp+window]
-	mov	edx, [esp+chainlenwmask]
+	add	esi, eax
-	jmp	LookupLoop
+	mov	[esp+windowbestlen], esi
-	ALIGN	4
+	movzx	ebx, WORD PTR[edi+eax-1]
-
+	mov	edi, [edx].ds_prev
-;/* Accept the current string, with the maximum possible length.        */
+	mov	[esp+scanend], ebx
-
+	mov	edx, [esp+chainlenwmask]
-LenMaximum:
+	jmp	LookupLoop
-	mov	edx, [esp+deflatestate]
+	ALIGN	4
-	mov	DWORD PTR[esp+bestlen], MAX_MATCH
+
-	mov	[edx].ds_match_start, ecx
+;/* Accept the current string, with the maximum possible length.        */
-
+
-;/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;          */
+LenMaximum:
-;/* return s->lookahead;                                                */
+	mov	edx, [esp+deflatestate]
-
+	mov	DWORD PTR[esp+bestlen], MAX_MATCH
-LeaveNow:
+	mov	[edx].ds_match_start, ecx
-	mov	edx, [esp+deflatestate]
+
-	mov	ebx, [esp+bestlen]
+;/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;          */
-	mov	eax, [edx].ds_lookahead
+;/* return s->lookahead;                                                */
-	cmp	ebx, eax
+
-	jg	SHORT LookaheadRet
+LeaveNow:
-	mov	eax, ebx
+	mov	edx, [esp+deflatestate]
-LookaheadRet:
+	mov	ebx, [esp+bestlen]
-
+	mov	eax, [edx].ds_lookahead
-; Restore the stack and return from whence we came.
+	cmp	ebx, eax
-
+	jg	SHORT LookaheadRet
-	add	esp, varsize
+	mov	eax, ebx
-	pop	ebx
+LookaheadRet:
-	pop	esi
+
-	pop	edi
+; Restore the stack and return from whence we came.
-	pop	ebp
+
-	ret
+	add	esp, varsize
-
+	pop	ebx
-_longest_match	ENDP
+	pop	esi
-
+	pop	edi
-_TEXT	ENDS
+	pop	ebp
-END
+	ret
 _longest_match	ENDP
 _TEXT	ENDS
 END
--- a/contrib/masmx64/bld_ml64.bat
+++ b/contrib/masmx64/bld_ml64.bat
@@ -0,0 +1,2 @@
 ml64.exe /Flinffasx64 /c /Zi inffasx64.asm
 ml64.exe /Flgvmat64   /c /Zi gvmat64.asm
--- a/contrib/masmx64/gvmat64.asm
+++ b/contrib/masmx64/gvmat64.asm
@@ -0,0 +1,513 @@
 ;uInt longest_match_x64(
 ;    deflate_state *s,
 ;    IPos cur_match);                             /* current match */
 ; gvmat64.asm -- Asm portion of the optimized longest_match for 32 bits x86
 ; Copyright (C) 1995-2005 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
 ;
 ; File written by Gilles Vollant, by converting to assembly the longest_match
 ;  from Jean-loup Gailly in deflate.c of zLib and infoZip zip.
 ;
 ;  and by taking inspiration on asm686 with masm, optimised assembly code
 ;        from Brian Raiter, written 1998
 ;
 ;         http://www.zlib.net
 ;         http://www.winimage.com/zLibDll
 ;         http://www.muppetlabs.com/~breadbox/software/assembly.html
 ;
 ; to compile this file for infozip Zip, I use option:
 ;   ml64.exe /Flgvmat64 /c /Zi /DINFOZIP gvmat64.asm
 ;
 ; to compile this file for zLib, I use option:
 ;   ml64.exe /Flgvmat64 /c /Zi gvmat64.asm
 ; Be carrefull to adapt zlib1222add below to your version of zLib
 ;   (if you use a version of zLib before 1.0.4 or after 1.2.2.2, change
 ;    value of zlib1222add later)
 ;
 ; This file compile with Microsoft Macro Assembler (x64) for AMD64
 ;
 ;   ml64.exe is given with Visual Studio 2005 and Windows 2003 server DDK
 ;
 ;   (you can get Windows 2003 server DDK with ml64 and cl for AMD64 from
 ;      http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price)
 ;
 ;uInt longest_match(s, cur_match)
 ;    deflate_state *s;
 ;    IPos cur_match;                             /* current match */
 .code
 longest_match PROC
 ;LocalVarsSize   equ 88
 LocalVarsSize   equ 72
 ; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12
 ; free register :  r14,r15
 ; register can be saved : rsp
 chainlenwmask   equ  rsp + 8 - LocalVarsSize    ; high word: current chain len
                                                 ; low word: s->wmask
 ;window          equ  rsp + xx - LocalVarsSize   ; local copy of s->window ; stored in r10
 ;windowbestlen   equ  rsp + xx - LocalVarsSize   ; s->window + bestlen , use r10+r11
 ;scanstart       equ  rsp + xx - LocalVarsSize   ; first two bytes of string ; stored in r12w
 ;scanend         equ  rsp + xx - LocalVarsSize   ; last two bytes of string use ebx
 ;scanalign       equ  rsp + xx - LocalVarsSize   ; dword-misalignment of string r13
 ;bestlen         equ  rsp + xx - LocalVarsSize   ; size of best match so far -> r11d
 ;scan            equ  rsp + xx - LocalVarsSize   ; ptr to string wanting match -> r9
 IFDEF INFOZIP
 ELSE
 nicematch       equ  (rsp + 16 - LocalVarsSize) ; a good enough match size
 ENDIF
 save_rdi        equ  rsp + 24 - LocalVarsSize
 save_rsi        equ  rsp + 32 - LocalVarsSize
 save_rbx        equ  rsp + 40 - LocalVarsSize
 save_rbp        equ  rsp + 48 - LocalVarsSize
 save_r12        equ  rsp + 56 - LocalVarsSize
 save_r13        equ  rsp + 64 - LocalVarsSize
 ;save_r14        equ  rsp + 72 - LocalVarsSize
 ;save_r15        equ  rsp + 80 - LocalVarsSize
 ;  all the +4 offsets are due to the addition of pending_buf_size (in zlib
 ;  in the deflate_state structure since the asm code was first written
 ;  (if you compile with zlib 1.0.4 or older, remove the +4).
 ;  Note : these value are good with a 8 bytes boundary pack structure
    MAX_MATCH           equ     258
    MIN_MATCH           equ     3
    MIN_LOOKAHEAD       equ     (MAX_MATCH+MIN_MATCH+1)
 ;;; Offsets for fields in the deflate_state structure. These numbers
 ;;; are calculated from the definition of deflate_state, with the
 ;;; assumption that the compiler will dword-align the fields. (Thus,
 ;;; changing the definition of deflate_state could easily cause this
 ;;; program to crash horribly, without so much as a warning at
 ;;; compile time. Sigh.)
 ;  all the +zlib1222add offsets are due to the addition of fields
 ;  in zlib in the deflate_state structure since the asm code was first written
 ;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
 ;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
 ;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
 IFDEF INFOZIP
 _DATA   SEGMENT
 COMM    window_size:DWORD
 ; WMask ; 7fff
 COMM    window:BYTE:010040H
 COMM    prev:WORD:08000H
 ; MatchLen : unused
 ; PrevMatch : unused
 COMM    strstart:DWORD
 COMM    match_start:DWORD
 ; Lookahead : ignore
 COMM    prev_length:DWORD ; PrevLen
 COMM    max_chain_length:DWORD
 COMM    good_match:DWORD
 COMM    nice_match:DWORD
 prev_ad equ OFFSET prev
 window_ad equ OFFSET window
 nicematch equ nice_match
 _DATA ENDS
 WMask equ 07fffh
 ELSE
  IFNDEF zlib1222add
    zlib1222add equ 8
  ENDIF
 dsWSize         equ 56+zlib1222add+(zlib1222add/2)
 dsWMask         equ 64+zlib1222add+(zlib1222add/2)
 dsWindow        equ 72+zlib1222add
 dsPrev          equ 88+zlib1222add
 dsMatchLen      equ 128+zlib1222add
 dsPrevMatch     equ 132+zlib1222add
 dsStrStart      equ 140+zlib1222add
 dsMatchStart    equ 144+zlib1222add
 dsLookahead     equ 148+zlib1222add
 dsPrevLen       equ 152+zlib1222add
 dsMaxChainLen   equ 156+zlib1222add
 dsGoodMatch     equ 172+zlib1222add
 dsNiceMatch     equ 176+zlib1222add
 window_size     equ [ rcx + dsWSize]
 WMask           equ [ rcx + dsWMask]
 window_ad       equ [ rcx + dsWindow]
 prev_ad         equ [ rcx + dsPrev]
 strstart        equ [ rcx + dsStrStart]
 match_start     equ [ rcx + dsMatchStart]
 Lookahead       equ [ rcx + dsLookahead] ; 0ffffffffh on infozip
 prev_length     equ [ rcx + dsPrevLen]
 max_chain_length equ [ rcx + dsMaxChainLen]
 good_match      equ [ rcx + dsGoodMatch]
 nice_match      equ [ rcx + dsNiceMatch]
 ENDIF
 ; parameter 1 in r8(deflate state s), param 2 in rdx (cur match)
 ; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
 ; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
 ;
 ; All registers must be preserved across the call, except for
 ;   rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.
 ;;; Save registers that the compiler may be using, and adjust esp to
 ;;; make room for our stack frame.
 ;;; Retrieve the function arguments. r8d will hold cur_match
 ;;; throughout the entire function. edx will hold the pointer to the
 ;;; deflate_state structure during the function's setup (before
 ;;; entering the main loop.
 ; parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match)
 ; this clear high 32 bits of r8, which can be garbage in both r8 and rdx
        mov [save_rdi],rdi
        mov [save_rsi],rsi
        mov [save_rbx],rbx
        mov [save_rbp],rbp
 IFDEF INFOZIP
        mov r8d,ecx
 ELSE
        mov r8d,edx
 ENDIF
        mov [save_r12],r12
        mov [save_r13],r13
 ;        mov [save_r14],r14
 ;        mov [save_r15],r15
 ;;; uInt wmask = s->w_mask;
 ;;; unsigned chain_length = s->max_chain_length;
 ;;; if (s->prev_length >= s->good_match) {
 ;;;     chain_length >>= 2;
 ;;; }
        mov edi, prev_length
        mov esi, good_match
        mov eax, WMask
        mov ebx, max_chain_length
        cmp edi, esi
        jl  LastMatchGood
        shr ebx, 2
 LastMatchGood:
 ;;; chainlen is decremented once beforehand so that the function can
 ;;; use the sign flag instead of the zero flag for the exit test.
 ;;; It is then shifted into the high word, to make room for the wmask
 ;;; value, which it will always accompany.
        dec ebx
        shl ebx, 16
        or  ebx, eax
 ;;; on zlib only
 ;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
 IFDEF INFOZIP
        mov [chainlenwmask], ebx
 ; on infozip nice_match = [nice_match]
 ELSE
        mov eax, nice_match
        mov [chainlenwmask], ebx
        mov r10d, Lookahead
        cmp r10d, eax
        cmovnl r10d, eax
        mov [nicematch],r10d
 ENDIF
 ;;; register Bytef *scan = s->window + s->strstart;
        mov r10, window_ad
        mov ebp, strstart
        lea r13, [r10 + rbp]
 ;;; Determine how many bytes the scan ptr is off from being
 ;;; dword-aligned.
         mov r9,r13
         neg r13
         and r13,3
 ;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
 ;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;
 IFDEF INFOZIP
        mov eax,07efah ; MAX_DIST = (WSIZE-MIN_LOOKAHEAD) (0x8000-(3+8+1))
 ELSE
        mov eax, window_size
        sub eax, MIN_LOOKAHEAD
 ENDIF
        xor edi,edi
        sub ebp, eax
        mov r11d, prev_length
        cmovng ebp,edi
 ;;; int best_len = s->prev_length;
 ;;; Store the sum of s->window + best_len in esi locally, and in esi.
       lea  rsi,[r10+r11]
 ;;; register ush scan_start = *(ushf*)scan;
 ;;; register ush scan_end   = *(ushf*)(scan+best_len-1);
 ;;; Posf *prev = s->prev;
        movzx r12d,word ptr [r9]
        movzx ebx, word ptr [r9 + r11 - 1]
        mov rdi, prev_ad
 ;;; Jump into the main loop.
        mov edx, [chainlenwmask]
        cmp bx,word ptr [rsi + r8 - 1]
        jz  LookupLoopIsZero
 LookupLoop1:
        and r8d, edx
        movzx   r8d, word ptr [rdi + r8*2]
        cmp r8d, ebp
        jbe LeaveNow
        sub edx, 00010000h
        js  LeaveNow
 LoopEntry1:
        cmp bx,word ptr [rsi + r8 - 1]
        jz  LookupLoopIsZero
 LookupLoop2:
        and r8d, edx
        movzx   r8d, word ptr [rdi + r8*2]
        cmp r8d, ebp
        jbe LeaveNow
        sub edx, 00010000h
        js  LeaveNow
 LoopEntry2:
        cmp bx,word ptr [rsi + r8 - 1]
        jz  LookupLoopIsZero
 LookupLoop4:
        and r8d, edx
        movzx   r8d, word ptr [rdi + r8*2]
        cmp r8d, ebp
        jbe LeaveNow
        sub edx, 00010000h
        js  LeaveNow
 LoopEntry4:
        cmp bx,word ptr [rsi + r8 - 1]
        jnz LookupLoop1
        jmp LookupLoopIsZero
 ;;; do {
 ;;;     match = s->window + cur_match;
 ;;;     if (*(ushf*)(match+best_len-1) != scan_end ||
 ;;;         *(ushf*)match != scan_start) continue;
 ;;;     [...]
 ;;; } while ((cur_match = prev[cur_match & wmask]) > limit
 ;;;          && --chain_length != 0);
 ;;;
 ;;; Here is the inner loop of the function. The function will spend the
 ;;; majority of its time in this loop, and majority of that time will
 ;;; be spent in the first ten instructions.
 ;;;
 ;;; Within this loop:
 ;;; ebx = scanend
 ;;; r8d = curmatch
 ;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
 ;;; esi = windowbestlen - i.e., (window + bestlen)
 ;;; edi = prev
 ;;; ebp = limit
 LookupLoop:
        and r8d, edx
        movzx   r8d, word ptr [rdi + r8*2]
        cmp r8d, ebp
        jbe LeaveNow
        sub edx, 00010000h
        js  LeaveNow
 LoopEntry:
        cmp bx,word ptr [rsi + r8 - 1]
        jnz LookupLoop1
 LookupLoopIsZero:
        cmp     r12w, word ptr [r10 + r8]
        jnz LookupLoop1
 ;;; Store the current value of chainlen.
        mov [chainlenwmask], edx
 ;;; Point edi to the string under scrutiny, and esi to the string we
 ;;; are hoping to match it up with. In actuality, esi and edi are
 ;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
 ;;; initialized to -(MAX_MATCH_8 - scanalign).
        lea rsi,[r8+r10]
        mov rdx, 0fffffffffffffef8h; -(MAX_MATCH_8)
        lea rsi, [rsi + r13 + 0108h] ;MAX_MATCH_8]
        lea rdi, [r9 + r13 + 0108h] ;MAX_MATCH_8]
        prefetcht1 [rsi+rdx]
        prefetcht1 [rdi+rdx]
 ;;; Test the strings for equality, 8 bytes at a time. At the end,
 ;;; adjust rdx so that it is offset to the exact byte that mismatched.
 ;;;
 ;;; We already know at this point that the first three bytes of the
 ;;; strings match each other, and they can be safely passed over before
 ;;; starting the compare loop. So what this code does is skip over 0-3
 ;;; bytes, as much as necessary in order to dword-align the edi
 ;;; pointer. (rsi will still be misaligned three times out of four.)
 ;;;
 ;;; It should be confessed that this loop usually does not represent
 ;;; much of the total running time. Replacing it with a more
 ;;; straightforward "rep cmpsb" would not drastically degrade
 ;;; performance.
 LoopCmps:
        mov rax, [rsi + rdx]
        xor rax, [rdi + rdx]
        jnz LeaveLoopCmps
        mov rax, [rsi + rdx + 8]
        xor rax, [rdi + rdx + 8]
        jnz LeaveLoopCmps8
        mov rax, [rsi + rdx + 8+8]
        xor rax, [rdi + rdx + 8+8]
        jnz LeaveLoopCmps16
        add rdx,8+8+8
        jmp short LoopCmps
 LeaveLoopCmps16: add rdx,8
 LeaveLoopCmps8: add rdx,8
 LeaveLoopCmps:
        test    eax, 0000FFFFh
        jnz LenLower
        test eax,0ffffffffh
        jnz LenLower32
        add rdx,4
        shr rax,32
        or ax,ax
        jnz LenLower
 LenLower32:
        shr eax,16
        add rdx,2
 LenLower:   sub al, 1
        adc rdx, 0
 ;;; Calculate the length of the match. If it is longer than MAX_MATCH,
 ;;; then automatically accept it as the best possible match and leave.
        lea rax, [rdi + rdx]
        sub rax, r9
        cmp eax, MAX_MATCH
        jge LenMaximum
 ;;; If the length of the match is not longer than the best match we
 ;;; have so far, then forget it and return to the lookup loop.
 ;///////////////////////////////////
        cmp eax, r11d
        jg  LongerMatch
        lea rsi,[r10+r11]
        mov rdi, prev_ad
        mov edx, [chainlenwmask]
        jmp LookupLoop
 ;;;         s->match_start = cur_match;
 ;;;         best_len = len;
 ;;;         if (len >= nice_match) break;
 ;;;         scan_end = *(ushf*)(scan+best_len-1);
 LongerMatch:
        mov r11d, eax
        mov match_start, r8d
        cmp eax, [nicematch]
        jge LeaveNow
        lea rsi,[r10+rax]
        movzx   ebx, word ptr [r9 + rax - 1]
        mov rdi, prev_ad
        mov edx, [chainlenwmask]
        jmp LookupLoop
 ;;; Accept the current string, with the maximum possible length.
 LenMaximum:
        mov r11d,MAX_MATCH
        mov match_start, r8d
 ;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
 ;;; return s->lookahead;
 LeaveNow:
 IFDEF INFOZIP
        mov eax,r11d
 ELSE
        mov eax, Lookahead
        cmp r11d, eax
        cmovng eax, r11d
 ENDIF
 ;;; Restore the stack and return from whence we came.
        mov rsi,[save_rsi]
        mov rdi,[save_rdi]
        mov rbx,[save_rbx]
        mov rbp,[save_rbp]
        mov r12,[save_r12]
        mov r13,[save_r13]
 ;        mov r14,[save_r14]
 ;        mov r15,[save_r15]
        ret 0
 ; please don't remove this string !
 ; Your can freely use gvmat64 in any free or commercial app
 ; but it is far better don't remove the string in the binary!
    db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0
 longest_match   ENDP
 match_init PROC
  ret 0
 match_init ENDP
 END
--- a/contrib/masmx64/gvmat64.obj
+++ b/contrib/masmx64/gvmat64.obj
--- a/contrib/masmx64/inffas8664.c
+++ b/contrib/masmx64/inffas8664.c
@@ -0,0 +1,186 @@
 /* inffas8664.c is a hand tuned assembler version of inffast.c - fast decoding
 * version for AMD64 on Windows using Microsoft C compiler
 *
 * Copyright (C) 1995-2003 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 *
 * Copyright (C) 2003 Chris Anderson <christop@charm.net>
 * Please use the copyright conditions above.
 *
 * 2005 - Adaptation to Microsoft C Compiler for AMD64 by Gilles Vollant
 *
 * inffas8664.c call function inffas8664fnc in inffasx64.asm
 *  inffasx64.asm is automatically convert from AMD64 portion of inffas86.c
 *
 * Dec-29-2003 -- I added AMD64 inflate asm support.  This version is also
 * slightly quicker on x86 systems because, instead of using rep movsb to copy
 * data, it uses rep movsw, which moves data in 2-byte chunks instead of single
 * bytes.  I've tested the AMD64 code on a Fedora Core 1 + the x86_64 updates
 * from http://fedora.linux.duke.edu/fc1_x86_64
 * which is running on an Athlon 64 3000+ / Gigabyte GA-K8VT800M system with
 * 1GB ram.  The 64-bit version is about 4% faster than the 32-bit version,
 * when decompressing mozilla-source-1.3.tar.gz.
 *
 * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
 * the gcc -S output of zlib-1.2.0/inffast.c.  Zlib-1.2.0 is in beta release at
 * the moment.  I have successfully compiled and tested this code with gcc2.96,
 * gcc3.2, icc5.0, msvc6.0.  It is very close to the speed of inffast.S
 * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
 * enabled.  I will attempt to merge the MMX code into this version.  Newer
 * versions of this and inffast.S can be found at
 * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
 *
 */
 #include <stdio.h>
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"
 /* Mark Adler's comments from inffast.c: */
 /*
   Decode literal, length, and distance codes and write out the resulting
   literal and match bytes until either not enough input or output is
   available, an end-of-block is encountered, or a data error is encountered.
   When large enough input and output buffers are supplied to inflate(), for
   example, a 16K input buffer and a 64K output buffer, more than 95% of the
   inflate execution time is spent in this routine.
   Entry assumptions:
        state->mode == LEN
        strm->avail_in >= 6
        strm->avail_out >= 258
        start >= strm->avail_out
        state->bits < 8
   On return, state->mode is one of:
        LEN -- ran out of enough output space or enough available input
        TYPE -- reached end of block code, inflate() to interpret next block
        BAD -- error in block data
   Notes:
    - The maximum input bits used by a length/distance pair is 15 bits for the
      length code, 5 bits for the length extra, 15 bits for the distance code,
      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
      Therefore if strm->avail_in >= 6, then there is enough input to avoid
      checking for available input while decoding.
    - The maximum bytes that a single length/distance pair can output is 258
      bytes, which is the maximum length that can be coded.  inflate_fast()
      requires strm->avail_out >= 258 for each loop to avoid checking for
      output space.
 */
    typedef struct inffast_ar {
 /* 64   32                               x86  x86_64 */
 /* ar offset                              register */
 /*  0    0 */ void *esp;                /* esp save */
 /*  8    4 */ void *ebp;                /* ebp save */
 /* 16    8 */ unsigned char FAR *in;    /* esi rsi  local strm->next_in */
 /* 24   12 */ unsigned char FAR *last;  /*     r9   while in < last */
 /* 32   16 */ unsigned char FAR *out;   /* edi rdi  local strm->next_out */
 /* 40   20 */ unsigned char FAR *beg;   /*          inflate()'s init next_out */
 /* 48   24 */ unsigned char FAR *end;   /*     r10  while out < end */
 /* 56   28 */ unsigned char FAR *window;/*          size of window, wsize!=0 */
 /* 64   32 */ code const FAR *lcode;    /* ebp rbp  local strm->lencode */
 /* 72   36 */ code const FAR *dcode;    /*     r11  local strm->distcode */
 /* 80   40 */ size_t /*unsigned long */hold;       /* edx rdx  local strm->hold */
 /* 88   44 */ unsigned bits;            /* ebx rbx  local strm->bits */
 /* 92   48 */ unsigned wsize;           /*          window size */
 /* 96   52 */ unsigned write;           /*          window write index */
 /*100   56 */ unsigned lmask;           /*     r12  mask for lcode */
 /*104   60 */ unsigned dmask;           /*     r13  mask for dcode */
 /*108   64 */ unsigned len;             /*     r14  match length */
 /*112   68 */ unsigned dist;            /*     r15  match distance */
 /*116   72 */ unsigned status;          /*          set when state chng*/
    } type_ar;
 #ifdef ASMINF
 void inflate_fast(strm, start)
 z_streamp strm;
 unsigned start;         /* inflate()'s starting value for strm->avail_out */
 {
    struct inflate_state FAR *state;
    type_ar ar;
    void inffas8664fnc(struct inffast_ar * par);
 #if (defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )) || (defined(_MSC_VER) && defined(_M_AMD64))
 #define PAD_AVAIL_IN 6
 #define PAD_AVAIL_OUT 258    
 #else
 #define PAD_AVAIL_IN 5
 #define PAD_AVAIL_OUT 257
 #endif
    /* copy state to local variables */
    state = (struct inflate_state FAR *)strm->state;
    ar.in = strm->next_in;
    ar.last = ar.in + (strm->avail_in - PAD_AVAIL_IN);
    ar.out = strm->next_out;
    ar.beg = ar.out - (start - strm->avail_out);
    ar.end = ar.out + (strm->avail_out - PAD_AVAIL_OUT);
    ar.wsize = state->wsize;
    ar.write = state->write;
    ar.window = state->window;
    ar.hold = state->hold;
    ar.bits = state->bits;
    ar.lcode = state->lencode;
    ar.dcode = state->distcode;
    ar.lmask = (1U << state->lenbits) - 1;
    ar.dmask = (1U << state->distbits) - 1;
    /* decode literals and length/distances until end-of-block or not enough
       input data or output space */
    /* align in on 1/2 hold size boundary */
    while (((size_t)(void *)ar.in & (sizeof(ar.hold) / 2 - 1)) != 0) {
        ar.hold += (unsigned long)*ar.in++ << ar.bits;
        ar.bits += 8;
    }
    inffas8664fnc(&ar);
    if (ar.status > 1) {
        if (ar.status == 2)
            strm->msg = "invalid literal/length code";
        else if (ar.status == 3)
            strm->msg = "invalid distance code";
        else
            strm->msg = "invalid distance too far back";
        state->mode = BAD;
    }
    else if ( ar.status == 1 ) {
        state->mode = TYPE;
    }
    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
    ar.len = ar.bits >> 3;
    ar.in -= ar.len;
    ar.bits -= ar.len << 3;
    ar.hold &= (1U << ar.bits) - 1;
    /* update state and return */
    strm->next_in = ar.in;
    strm->next_out = ar.out;
    strm->avail_in = (unsigned)(ar.in < ar.last ?
                                PAD_AVAIL_IN + (ar.last - ar.in) :
                                PAD_AVAIL_IN - (ar.in - ar.last));
    strm->avail_out = (unsigned)(ar.out < ar.end ?
                                 PAD_AVAIL_OUT + (ar.end - ar.out) :
                                 PAD_AVAIL_OUT - (ar.out - ar.end));
    state->hold = (unsigned long)ar.hold;
    state->bits = ar.bits;
    return;
 }
 #endif
--- a/contrib/masmx64/inffasx64.asm
+++ b/contrib/masmx64/inffasx64.asm
@@ -0,0 +1,392 @@
 ; inffasx64.asm is a hand tuned assembler version of inffast.c - fast decoding
 ; version for AMD64 on Windows using Microsoft C compiler
 ;
 ; inffasx64.asm is automatically convert from AMD64 portion of inffas86.c
 ; inffasx64.asm is called by inffas8664.c, which contain more info.
 ; to compile this file, I use option
 ;   ml64.exe /Flinffasx64 /c /Zi inffasx64.asm
 ;   with Microsoft Macro Assembler (x64) for AMD64
 ;
 ;   ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK
 ;
 ;   (you can get Windows 2003 server DDK with ml64 and cl.exe for AMD64 from 
 ;      http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price)
 ;
 .code
 inffas8664fnc PROC
 ; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
 ; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
 ;
 ; All registers must be preserved across the call, except for
 ;   rax, rcx, rdx, r8, r-9, r10, and r11, which are scratch.
 	mov [rsp-8],rsi
 	mov [rsp-16],rdi
 	mov [rsp-24],r12
 	mov [rsp-32],r13
 	mov [rsp-40],r14
 	mov [rsp-48],r15
 	mov [rsp-56],rbx
 	mov rax,rcx
 	mov	[rax+8], rbp       ; /* save regs rbp and rsp */
 	mov	[rax], rsp
 	mov	rsp, rax          ; /* make rsp point to &ar */
 	mov	rsi, [rsp+16]      ; /* rsi  = in */
 	mov	rdi, [rsp+32]      ; /* rdi  = out */
 	mov	r9, [rsp+24]       ; /* r9   = last */
 	mov	r10, [rsp+48]      ; /* r10  = end */
 	mov	rbp, [rsp+64]      ; /* rbp  = lcode */
 	mov	r11, [rsp+72]      ; /* r11  = dcode */
 	mov	rdx, [rsp+80]      ; /* rdx  = hold */
 	mov	ebx, [rsp+88]      ; /* ebx  = bits */
 	mov	r12d, [rsp+100]    ; /* r12d = lmask */
 	mov	r13d, [rsp+104]    ; /* r13d = dmask */
                                          ; /* r14d = len */
                                          ; /* r15d = dist */
 	cld
 	cmp	r10, rdi
 	je	L_one_time           ; /* if only one decode left */
 	cmp	r9, rsi
    jne L_do_loop
 L_one_time:
 	mov	r8, r12           ; /* r8 = lmask */
 	cmp	bl, 32
 	ja	L_get_length_code_one_time
 	lodsd                         ; /* eax = *(uint *)in++ */
 	mov	cl, bl            ; /* cl = bits, needs it for shifting */
 	add	bl, 32             ; /* bits += 32 */
 	shl	rax, cl
 	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */
 	jmp	L_get_length_code_one_time
 ALIGN 4
 L_while_test:
 	cmp	r10, rdi
 	jbe	L_break_loop
 	cmp	r9, rsi
 	jbe	L_break_loop
 L_do_loop:
 	mov	r8, r12           ; /* r8 = lmask */
 	cmp	bl, 32
 	ja	L_get_length_code    ; /* if (32 < bits) */
 	lodsd                         ; /* eax = *(uint *)in++ */
 	mov	cl, bl            ; /* cl = bits, needs it for shifting */
 	add	bl, 32             ; /* bits += 32 */
 	shl	rax, cl
 	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */
 L_get_length_code:
 	and	r8, rdx            ; /* r8 &= hold */
 	mov	eax, [rbp+r8*4]  ; /* eax = lcode[hold & lmask] */
 	mov	cl, ah            ; /* cl = this.bits */
 	sub	bl, ah            ; /* bits -= this.bits */
 	shr	rdx, cl           ; /* hold >>= this.bits */
 	test	al, al
 	jnz	L_test_for_length_base ; /* if (op != 0) 45.7% */
 	mov	r8, r12            ; /* r8 = lmask */
 	shr	eax, 16            ; /* output this.val char */
 	stosb
 L_get_length_code_one_time:
 	and	r8, rdx            ; /* r8 &= hold */
 	mov	eax, [rbp+r8*4] ; /* eax = lcode[hold & lmask] */
 L_dolen:
 	mov	cl, ah            ; /* cl = this.bits */
 	sub	bl, ah            ; /* bits -= this.bits */
 	shr	rdx, cl           ; /* hold >>= this.bits */
 	test	al, al
 	jnz	L_test_for_length_base ; /* if (op != 0) 45.7% */
 	shr	eax, 16            ; /* output this.val char */
 	stosb
 	jmp	L_while_test
 ALIGN 4
 L_test_for_length_base:
 	mov	r14d, eax         ; /* len = this */
 	shr	r14d, 16           ; /* len = this.val */
 	mov	cl, al
 	test	al, 16
 	jz	L_test_for_second_level_length ; /* if ((op & 16) == 0) 8% */
 	and	cl, 15             ; /* op &= 15 */
 	jz	L_decode_distance    ; /* if (!op) */
 L_add_bits_to_len:
 	sub	bl, cl
 	xor	eax, eax
 	inc	eax
 	shl	eax, cl
 	dec	eax
 	and	eax, edx          ; /* eax &= hold */
 	shr	rdx, cl
 	add	r14d, eax         ; /* len += hold & mask[op] */
 L_decode_distance:
 	mov	r8, r13           ; /* r8 = dmask */
 	cmp	bl, 32
 	ja	L_get_distance_code  ; /* if (32 < bits) */
 	lodsd                         ; /* eax = *(uint *)in++ */
 	mov	cl, bl            ; /* cl = bits, needs it for shifting */
 	add	bl, 32             ; /* bits += 32 */
 	shl	rax, cl
 	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */
 L_get_distance_code:
 	and	r8, rdx           ; /* r8 &= hold */
 	mov	eax, [r11+r8*4] ; /* eax = dcode[hold & dmask] */
 L_dodist:
 	mov	r15d, eax         ; /* dist = this */
 	shr	r15d, 16           ; /* dist = this.val */
 	mov	cl, ah
 	sub	bl, ah            ; /* bits -= this.bits */
 	shr	rdx, cl           ; /* hold >>= this.bits */
 	mov	cl, al            ; /* cl = this.op */
 	test	al, 16             ; /* if ((op & 16) == 0) */
 	jz	L_test_for_second_level_dist
 	and	cl, 15             ; /* op &= 15 */
 	jz	L_check_dist_one
 L_add_bits_to_dist:
 	sub	bl, cl
 	xor	eax, eax
 	inc	eax
 	shl	eax, cl
 	dec	eax                 ; /* (1 << op) - 1 */
 	and	eax, edx          ; /* eax &= hold */
 	shr	rdx, cl
 	add	r15d, eax         ; /* dist += hold & ((1 << op) - 1) */
 L_check_window:
 	mov	r8, rsi           ; /* save in so from can use it's reg */
 	mov	rax, rdi
 	sub	rax, [rsp+40]      ; /* nbytes = out - beg */
 	cmp	eax, r15d
 	jb	L_clip_window        ; /* if (dist > nbytes) 4.2% */
 	mov	ecx, r14d         ; /* ecx = len */
 	mov	rsi, rdi
 	sub	rsi, r15          ; /* from = out - dist */
 	sar	ecx, 1
 	jnc	L_copy_two           ; /* if len % 2 == 0 */
 	rep     movsw
 	mov	al, [rsi]
 	mov	[rdi], al
 	inc	rdi
 	mov	rsi, r8           ; /* move in back to %rsi, toss from */
 	jmp	L_while_test
 L_copy_two:
 	rep     movsw
 	mov	rsi, r8           ; /* move in back to %rsi, toss from */
 	jmp	L_while_test
 ALIGN 4
 L_check_dist_one:
 	cmp	r15d, 1            ; /* if dist 1, is a memset */
 	jne	L_check_window
 	cmp	[rsp+40], rdi      ; /* if out == beg, outside window */
 	je	L_check_window
 	mov	ecx, r14d         ; /* ecx = len */
 	mov	al, [rdi-1]
 	mov	ah, al
 	sar	ecx, 1
 	jnc	L_set_two
 	mov	[rdi], al
 	inc	rdi
 L_set_two:
 	rep     stosw
 	jmp	L_while_test
 ALIGN 4
 L_test_for_second_level_length:
 	test	al, 64
 	jnz	L_test_for_end_of_block ; /* if ((op & 64) != 0) */
 	xor	eax, eax
 	inc	eax
 	shl	eax, cl
 	dec	eax
 	and	eax, edx         ; /* eax &= hold */
 	add	eax, r14d        ; /* eax += len */
 	mov	eax, [rbp+rax*4] ; /* eax = lcode[val+(hold&mask[op])]*/
 	jmp	L_dolen
 ALIGN 4
 L_test_for_second_level_dist:
 	test	al, 64
 	jnz	L_invalid_distance_code ; /* if ((op & 64) != 0) */
 	xor	eax, eax
 	inc	eax
 	shl	eax, cl
 	dec	eax
 	and	eax, edx         ; /* eax &= hold */
 	add	eax, r15d        ; /* eax += dist */
 	mov	eax, [r11+rax*4] ; /* eax = dcode[val+(hold&mask[op])]*/
 	jmp	L_dodist
 ALIGN 4
 L_clip_window:
 	mov	ecx, eax         ; /* ecx = nbytes */
 	mov	eax, [rsp+92]     ; /* eax = wsize, prepare for dist cmp */
 	neg	ecx                ; /* nbytes = -nbytes */
 	cmp	eax, r15d
 	jb	L_invalid_distance_too_far ; /* if (dist > wsize) */
 	add	ecx, r15d         ; /* nbytes = dist - nbytes */
 	cmp	dword ptr [rsp+96], 0
 	jne	L_wrap_around_window ; /* if (write != 0) */
 	mov	rsi, [rsp+56]     ; /* from  = window */
 	sub	eax, ecx         ; /* eax  -= nbytes */
 	add	rsi, rax         ; /* from += wsize - nbytes */
 	mov	eax, r14d        ; /* eax = len */
 	cmp	r14d, ecx
 	jbe	L_do_copy           ; /* if (nbytes >= len) */
 	sub	eax, ecx         ; /* eax -= nbytes */
 	rep     movsb
 	mov	rsi, rdi
 	sub	rsi, r15         ; /* from = &out[ -dist ] */
 	jmp	L_do_copy
 ALIGN 4
 L_wrap_around_window:
 	mov	eax, [rsp+96]     ; /* eax = write */
 	cmp	ecx, eax
 	jbe	L_contiguous_in_window ; /* if (write >= nbytes) */
 	mov	esi, [rsp+92]     ; /* from  = wsize */
 	add	rsi, [rsp+56]     ; /* from += window */
 	add	rsi, rax         ; /* from += write */
 	sub	rsi, rcx         ; /* from -= nbytes */
 	sub	ecx, eax         ; /* nbytes -= write */
 	mov	eax, r14d        ; /* eax = len */
 	cmp	eax, ecx
 	jbe	L_do_copy           ; /* if (nbytes >= len) */
 	sub	eax, ecx         ; /* len -= nbytes */
 	rep     movsb
 	mov	rsi, [rsp+56]     ; /* from = window */
 	mov	ecx, [rsp+96]     ; /* nbytes = write */
 	cmp	eax, ecx
 	jbe	L_do_copy           ; /* if (nbytes >= len) */
 	sub	eax, ecx         ; /* len -= nbytes */
 	rep     movsb
 	mov	rsi, rdi
 	sub	rsi, r15         ; /* from = out - dist */
 	jmp	L_do_copy
 ALIGN 4
 L_contiguous_in_window:
 	mov	rsi, [rsp+56]     ; /* rsi = window */
 	add	rsi, rax
 	sub	rsi, rcx         ; /* from += write - nbytes */
 	mov	eax, r14d        ; /* eax = len */
 	cmp	eax, ecx
 	jbe	L_do_copy           ; /* if (nbytes >= len) */
 	sub	eax, ecx         ; /* len -= nbytes */
 	rep     movsb
 	mov	rsi, rdi
 	sub	rsi, r15         ; /* from = out - dist */
 	jmp	L_do_copy           ; /* if (nbytes >= len) */
 ALIGN 4
 L_do_copy:
 	mov	ecx, eax         ; /* ecx = len */
 	rep     movsb
 	mov	rsi, r8          ; /* move in back to %esi, toss from */
 	jmp	L_while_test
 L_test_for_end_of_block:
 	test	al, 32
 	jz	L_invalid_literal_length_code
 	mov	dword ptr [rsp+116], 1
 	jmp	L_break_loop_with_status
 L_invalid_literal_length_code:
 	mov	dword ptr [rsp+116], 2
 	jmp	L_break_loop_with_status
 L_invalid_distance_code:
 	mov	dword ptr [rsp+116], 3
 	jmp	L_break_loop_with_status
 L_invalid_distance_too_far:
 	mov	dword ptr [rsp+116], 4
 	jmp	L_break_loop_with_status
 L_break_loop:
 	mov	dword ptr [rsp+116], 0
 L_break_loop_with_status:
 ; /* put in, out, bits, and hold back into ar and pop esp */
 	mov	[rsp+16], rsi     ; /* in */
 	mov	[rsp+32], rdi     ; /* out */
 	mov	[rsp+88], ebx     ; /* bits */
 	mov	[rsp+80], rdx     ; /* hold */
 	mov	rax, [rsp]       ; /* restore rbp and rsp */
 	mov	rbp, [rsp+8]
 	mov	rsp, rax
 	mov rsi,[rsp-8]
 	mov rdi,[rsp-16]
 	mov r12,[rsp-24]
 	mov r13,[rsp-32]
 	mov r14,[rsp-40]
 	mov r15,[rsp-48]
 	mov rbx,[rsp-56]
    ret 0
 ;          :
 ;          : "m" (ar)
 ;          : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi",
 ;            "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
 ;    );
 inffas8664fnc 	ENDP
 ;_TEXT	ENDS
 END
--- a/contrib/masmx64/inffasx64.obj
+++ b/contrib/masmx64/inffasx64.obj
--- a/contrib/masmx64/readme.txt
+++ b/contrib/masmx64/readme.txt
@@ -0,0 +1,28 @@
 Summary
 -------
 This directory contains ASM implementations of the functions
 longest_match() and inflate_fast(), for 64 bits x86 (both AMD64 and Intel EM64t),
 for use with Microsoft Macro Assembler (x64) for AMD64 and Microsoft C++ 64 bits.
 gvmat64.asm is written by Gilles Vollant (2005), by using Brian Raiter 686/32 bits
   assembly optimized version from Jean-loup Gailly original longest_match function
 inffasx64.asm and inffas8664.c were written by Chris Anderson, by optimizing
   original function from Mark Adler
 Use instructions
 ----------------
 Copy these files into the zlib source directory.
 define ASMV and ASMINF in your project. Include inffas8664.c in your source tree,
 and inffasx64.obj and gvmat64.obj as object to link.
 Build instructions
 ------------------
 run bld_64.bat with Microsoft Macro Assembler (x64) for AMD64 (ml64.exe)
 ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK
 You can get Windows 2003 server DDK with ml64 and cl for AMD64 from 
  http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price)
--- a/contrib/masmx86/bld_ml32.bat
+++ b/contrib/masmx86/bld_ml32.bat
@@ -0,0 +1,2 @@
 ml /coff /Zi /c /Flgvmat32.lst  gvmat32.asm 
 ml /coff /Zi /c /Flinffas32.lst inffas32.asm 
--- a/contrib/masmx86/gvmat32.asm
+++ b/contrib/masmx86/gvmat32.asm
--- a/contrib/masmx86/gvmat32.obj
+++ b/contrib/masmx86/gvmat32.obj
--- a/contrib/masmx86/gvmat32c.c
+++ b/contrib/masmx86/gvmat32c.c
@@ -1,206 +1,62 @@
-/* gvmat32.c -- C portion of the optimized longest_match for 32 bits x86
+/* gvmat32.c -- C portion of the optimized longest_match for 32 bits x86
- * Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant.
+ * Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant.
- * File written by Gilles Vollant, by modifiying the longest_match
+ * File written by Gilles Vollant, by modifiying the longest_match
- *  from Jean-loup Gailly in deflate.c
+ *  from Jean-loup Gailly in deflate.c
- *  it prepare all parameters and call the assembly longest_match_gvasm
+ *  it prepare all parameters and call the assembly longest_match_gvasm
- *  longest_match execute standard C code is wmask != 0x7fff
+ *  longest_match execute standard C code is wmask != 0x7fff
- *     (assembly code is faster with a fixed wmask)
+ *     (assembly code is faster with a fixed wmask)
- *
+ *
- */
+ * Read comment at beginning of gvmat32.asm for more information
-
+ */
-#include "deflate.h"
+
-
+#if defined(ASMV) && (!defined(NOOLDPENTIUMCODE))
-#ifdef ASMV
+#include "deflate.h"
-#define NIL 0
+
-
+/* if your C compiler don't add underline before function name,
-#define UNALIGNED_OK
+        define ADD_UNDERLINE_ASMFUNC */
-
+#ifdef ADD_UNDERLINE_ASMFUNC
-
+#define longest_match_7fff _longest_match_7fff
-/* if your C compiler don't add underline before function name,
+#define longest_match_686  _longest_match_686
-        define ADD_UNDERLINE_ASMFUNC */
+#define cpudetect32        _cpudetect32
-#ifdef ADD_UNDERLINE_ASMFUNC
+#endif
-#define longest_match_7fff _longest_match_7fff
+
-#define longest_match_686  _longest_match_686
+
-#define cpudetect32        _cpudetect32
+unsigned long cpudetect32();
-#endif
+
-
+uInt longest_match_c(
-
+    deflate_state *s,
-
+    IPos cur_match);                             /* current match */
-void match_init()
+
-{
+
-}
+uInt longest_match_7fff(
-
+    deflate_state *s,
-unsigned long cpudetect32();
+    IPos cur_match);                             /* current match */
-
+
-uInt longest_match_c(
+uInt longest_match_686(
-    deflate_state *s,
+    deflate_state *s,
-    IPos cur_match);                             /* current match */
+    IPos cur_match);                             /* current match */
-
+
-
+
-uInt longest_match_7fff(
+static uInt iIsPPro=2;
-    deflate_state *s,
+
-    IPos cur_match);                             /* current match */
+void match_init ()
-
+{
-uInt longest_match_686(
+    iIsPPro = (((cpudetect32()/0x100)&0xf)>=6) ? 1 : 0;
-    deflate_state *s,
+}
-    IPos cur_match);                             /* current match */
+
-
+uInt longest_match(
-uInt longest_match(
+    deflate_state *s,
-    deflate_state *s,
+    IPos cur_match)                             /* current match */
-    IPos cur_match)                             /* current match */
+{
-{
+    if (iIsPPro!=0)
-    static uInt iIsPPro=2;
+        return longest_match_686(s,cur_match);
-
+
-    if ((s->w_mask == 0x7fff) && (iIsPPro==0))
+    if (s->w_mask != 0x7fff)
-        return longest_match_7fff(s,cur_match);
+        return longest_match_686(s,cur_match);
-
+
-    if (iIsPPro==1)
+    /* now ((s->w_mask == 0x7fff) && (iIsPPro==0)) */
-        return longest_match_686(s,cur_match);
+        return longest_match_7fff(s,cur_match);
-
+}
-    if (iIsPPro==2)
+
-        iIsPPro = (((cpudetect32()/0x100)&0xf)>=6) ? 1 : 0;
+
-
+#endif /* defined(ASMV) && (!defined(NOOLDPENTIUMCODE)) */
    return longest_match_c(s,cur_match);
 }
 uInt longest_match_c(s, cur_match)
    deflate_state *s;
    IPos cur_match;                             /* current match */
 {
    unsigned chain_length = s->max_chain_length;/* max hash chain length */
    register Bytef *scan = s->window + s->strstart; /* current string */
    register Bytef *match;                       /* matched string */
    register int len;                           /* length of current match */
    int best_len = s->prev_length;              /* best match length so far */
    int nice_match = s->nice_match;             /* stop if match long enough */
    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
        s->strstart - (IPos)MAX_DIST(s) : NIL;
    /* Stop when cur_match becomes <= limit. To simplify the code,
     * we prevent matches with the string of window index 0.
     */
    Posf *prev = s->prev;
    uInt wmask = s->w_mask;
 #ifdef UNALIGNED_OK
    /* Compare two bytes at a time. Note: this is not always beneficial.
     * Try with and without -DUNALIGNED_OK to check.
     */
    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
    register ush scan_start = *(ushf*)scan;
    register ush scan_end   = *(ushf*)(scan+best_len-1);
 #else
    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
    register Byte scan_end1  = scan[best_len-1];
    register Byte scan_end   = scan[best_len];
 #endif
    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
     * It is easy to get rid of this optimization if necessary.
     */
    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
    /* Do not waste too much time if we already have a good match: */
    if (s->prev_length >= s->good_match) {
        chain_length >>= 2;
    }
    /* Do not look for matches beyond the end of the input. This is necessary
     * to make deflate deterministic.
     */
    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
    do {
        Assert(cur_match < s->strstart, "no future");
        match = s->window + cur_match;
        /* Skip to next match if the match length cannot increase
         * or if the match length is less than 2:
         */
 #if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
        /* This code assumes sizeof(unsigned short) == 2. Do not use
         * UNALIGNED_OK if your compiler uses a different size.
         */
        if (*(ushf*)(match+best_len-1) != scan_end ||
            *(ushf*)match != scan_start) continue;
        /* It is not necessary to compare scan[2] and match[2] since they are
         * always equal when the other bytes match, given that the hash keys
         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
         * strstart+3, +5, ... up to strstart+257. We check for insufficient
         * lookahead only every 4th comparison; the 128th check will be made
         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
         * necessary to put more guard bytes at the end of the window, or
         * to check more often for insufficient lookahead.
         */
        Assert(scan[2] == match[2], "scan[2]?");
        scan++, match++;
        do {
        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
                 scan < strend);
        /* The funny "do {}" generates better code on most compilers */
        /* Here, scan <= window+strstart+257 */
        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
        if (*scan == *match) scan++;
        len = (MAX_MATCH - 1) - (int)(strend-scan);
        scan = strend - (MAX_MATCH-1);
 #else /* UNALIGNED_OK */
        if (match[best_len]   != scan_end  ||
            match[best_len-1] != scan_end1 ||
            *match            != *scan     ||
            *++match          != scan[1])      continue;
        /* The check at best_len-1 can be removed because it will be made
         * again later. (This heuristic is not always a win.)
         * It is not necessary to compare scan[2] and match[2] since they
         * are always equal when the other bytes match, given that
         * the hash keys are equal and that HASH_BITS >= 8.
         */
        scan += 2, match++;
        Assert(*scan == *match, "match[2]?");
        /* We check for insufficient lookahead only every 8th comparison;
         * the 256th check will be made at strstart+258.
         */
        do {
        } while (*++scan == *++match && *++scan == *++match &&
                 *++scan == *++match && *++scan == *++match &&
                 *++scan == *++match && *++scan == *++match &&
                 *++scan == *++match && *++scan == *++match &&
                 scan < strend);
        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
        len = MAX_MATCH - (int)(strend - scan);
        scan = strend - MAX_MATCH;
 #endif /* UNALIGNED_OK */
        if (len > best_len) {
            s->match_start = cur_match;
            best_len = len;
            if (len >= nice_match) break;
 #ifdef UNALIGNED_OK
            scan_end = *(ushf*)(scan+best_len-1);
 #else
            scan_end1  = scan[best_len-1];
            scan_end   = scan[best_len];
 #endif
        }
    } while ((cur_match = prev[cur_match & wmask]) > limit
             && --chain_length != 0);
    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
    return s->lookahead;
 }
 #endif /* ASMV */
--- a/contrib/masmx86/inffas32.asm
+++ b/contrib/masmx86/inffas32.asm
--- a/contrib/vstudio/vc7/inffas32.obj
+++ b/contrib/vstudio/vc7/inffas32.obj
--- a/contrib/masmx86/mkasm.bat
+++ b/contrib/masmx86/mkasm.bat
@@ -1,3 +1,3 @@
-cl /I..\.. /O2 /c gvmat32c.c
+cl /DASMV /I..\.. /O2 /c gvmat32c.c
 ml /coff /Zi /c /Flgvmat32.lst gvmat32.asm
 ml /coff /Zi /c /Flinffas32.lst inffas32.asm
--- a/contrib/minizip/ChangeLogUnzip
+++ b/contrib/minizip/ChangeLogUnzip
@@ -1,55 +0,0 @@
 Change in 1.00: (10 sept 03)
 - rename to 1.00
 - cosmetic code change
 Change in 0.22: (19 May 03)
 - crypting support (unless you define NOCRYPT)
 - append file in existing zipfile
 Change in 0.21: (10 Mar 03)
 - bug fixes
 Change in 0.17: (27 Jan 02)
 - bug fixes
 Change in 0.16: (19 Jan 02)
 - Support of ioapi for virtualize zip file access
 Change in 0.15: (19 Mar 98)
 - fix memory leak in minizip.c
 Change in 0.14: (10 Mar 98)
 - fix bugs in minizip.c sample for zipping big file
 - fix problem in month in date handling
 - fix bug in unzlocal_GetCurrentFileInfoInternal in unzip.c for
    comment handling
 Change in 0.13: (6 Mar 98)
 - fix bugs in zip.c
 - add real minizip sample
 Change in 0.12: (4 Mar 98)
 - add zip.c and zip.h for creates .zip file
 - fix change_file_date in miniunz.c for Unix (Jean-loup Gailly)
 - fix miniunz.c for file without specific record for directory
 Change in 0.11: (3 Mar 98)
 - fix bug in unzGetCurrentFileInfo for get extra field and comment
 - enhance miniunz sample, remove the bad unztst.c sample
 Change in 0.10: (2 Mar 98)
 - fix bug in unzReadCurrentFile
 - rename unzip* to unz* function and structure
 - remove Windows-like hungary notation variable name
 - modify some structure in unzip.h
 - add somes comment in source
 - remove unzipGetcCurrentFile function
 - replace ZUNZEXPORT by ZEXPORT
 - add unzGetLocalExtrafield for get the local extrafield info
 - add a new sample, miniunz.c
 Change in 0.4: (25 Feb 98)
 - suppress the type unzipFileInZip.
  Only on file in the zipfile can be open at the same time
 - fix somes typo in code
 - added tm_unz structure in unzip_file_info (date/time in readable format)
--- a/contrib/minizip/Makefile
+++ b/contrib/minizip/Makefile
@@ -1,25 +1,25 @@
-CC=cc
+CC=cc
-CFLAGS=-O -I../..
+CFLAGS=-O -I../..
-
+
-UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
+UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
-ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a
+ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a
-
+
-.c.o:
+.c.o:
-	$(CC) -c $(CFLAGS) $*.c
+	$(CC) -c $(CFLAGS) $*.c
-
+
-all: miniunz minizip
+all: miniunz minizip
-
+
-miniunz:  $(UNZ_OBJS)
+miniunz:  $(UNZ_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
-
+
-minizip:  $(ZIP_OBJS)
+minizip:  $(ZIP_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
-
+
-test:	miniunz minizip
+test:	miniunz minizip
-	./minizip test readme.txt
+	./minizip test readme.txt
-	./miniunz -l test.zip
+	./miniunz -l test.zip
-	mv readme.txt readme.old
+	mv readme.txt readme.old
-	./miniunz test.zip
+	./miniunz test.zip
-
+
-clean:
+clean:
-	/bin/rm -f *.o *~ minizip miniunz
+	/bin/rm -f *.o *~ minizip miniunz
--- a/contrib/minizip/MiniZip64_Changes.txt
+++ b/contrib/minizip/MiniZip64_Changes.txt
@@ -0,0 +1,7 @@
 MiniZip64 was derrived from MiniZip at version 1.01f
 Change in 1.0 (Okt 2009)
 - **TODO - Add history**
--- a/contrib/minizip/MiniZip64_info.txt
+++ b/contrib/minizip/MiniZip64_info.txt
@@ -0,0 +1,79 @@
 MiniZip64 - Copyright (c) 2009-2010 - Mathias Svensson - Built from MiniZip by Gilles Vollant
 Introduction
 ---------------------
 MiniZip64 is built from MiniZip by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html )
 When adding ZIP64 support into minizip it would result into breaking compatibility with current minizip.
 And since breaking compatibility in minizip is not wanted. I decided to create a fork of minizip 
 and create minizip64.
 Even though MiniZip64 is build from MiniZip, all functions and struct's have changed name so that it 
 would not collide with each other.
 Background
 ---------------------
 When adding ZIP64 support I found that Even Rouault have added ZIP64 support for unzip.c into minizip 
 for a open source project called gdal ( http://www.gdal.org/ )
 That was used as a starting point. And after that ZIP64 support was added to zip.c
 some refactoring and code cleanup was also done.
 Changed from MiniZip to MiniZip64
 -------------------------------------
 * Filenames has got a '64' at the end of them . eg unzip.c is now called unzip64.c
 * Added ZIP64 support for unzip ( by Even Rouault )
 * Added ZIP64 support for zip ( by Mathias Svensson )
 * Reverted some changed that Even Rouault did.
 * Bunch of patches received from Gulles Vollant that he received for MiniZip from various users.
 * Added unzip patch for BZIP Compression method (patch create by Daniel Borca)
 * Added BZIP Compress method for zip
 * Did some refactoring and code cleanup
 Credits 
 Gilles Vollant    - Original MiniZip author
 Even Rouault      - ZIP64 unzip Support
 Daniel Borca      - BZip Compression method support in unzip
 Mathias Svensson  - ZIP64 zip support
 Mathias Svensson  - BZip Compression method support in zip
 Resources 
 ZipLayout   http://result42.com/projects/ZipFileLayout
             Command line tool for Windows that shows the layout and information of the headers in a zip archive.
             Used when debugging and validating the creation of zip files using MiniZip64
 ZIP App Note  http://www.pkware.com/documents/casestudies/APPNOTE.TXT
               Zip File specification
 Notes.
 * To be able to use BZip compression method in zip64.c or unzip64.c the BZIP2 lib is needed and HAVE_BZIP2 need to be defined.
 License
 ----------------------------------------------------------
   Condition of use and distribution are the same than zlib :
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
  arising from the use of this software.
  Permission is granted to anyone to use this software for any purpose,
  including commercial applications, and to alter it and redistribute it
  freely, subject to the following restrictions:
  1. The origin of this software must not be misrepresented; you must not
     claim that you wrote the original software. If you use this software
     in a product, an acknowledgment in the product documentation would be
     appreciated but is not required.
  2. Altered source versions must be plainly marked as such, and must not be
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
 ----------------------------------------------------------
--- a/contrib/minizip/crypt.h
+++ b/contrib/minizip/crypt.h
@@ -1,9 +1,9 @@
 /* crypt.h -- base code for crypt/uncrypt ZIPfile
-   Version 1.00, September 10th, 2003
+   Version 1.01e, February 12th, 2005
-   Copyright (C) 1998-2003 Gilles Vollant
+   Copyright (C) 1998-2005 Gilles Vollant
   This code is a modified version of crypting code in Infozip distribution
@@ -87,13 +87,12 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned lon
 #    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
 #  endif
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
+static int crypthead(const char* passwd,      /* password string */
-    const char *passwd;         /* password string */
+                     unsigned char* buf,      /* where to write header */
-    unsigned char *buf;         /* where to write header */
+                     int bufSize,
-    int bufSize;
+                     unsigned long* pkeys,
-    unsigned long* pkeys;
+                     const unsigned long* pcrc_32_tab, 
-    const unsigned long* pcrc_32_tab;
+                     unsigned long crcForCrypting)
    unsigned long crcForCrypting;
 {
    int n;                       /* index in random header */
    int t;                       /* temporary */
@@ -124,8 +123,8 @@ static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
    {
        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
    }
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
    return n;
 }
--- a/contrib/minizip/ioapi.c
+++ b/contrib/minizip/ioapi.c
@@ -1,74 +1,86 @@
-/* ioapi.c -- IO base function header for compress/uncompress .zip
+/* ioapi.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-   Version 1.00, September 10th, 2003
+	 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 	 Modifications for Zip64 support 
 	 Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 	 For more info read MiniZip_info.txt
   Copyright (C) 1998-2003 Gilles Vollant
 */
-#include <stdio.h>
+#if (defined(_WIN32))
-#include <stdlib.h>
+	#define _CRT_SECURE_NO_WARNINGS
-#include <string.h>
+#endif
 #include "zlib.h"
 #include "ioapi.h"
 voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
 {
    if (pfilefunc->zfile_func64.zopen64_file != NULL)
        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
    else
    {
        return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
    }
 }
 long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
 {
    if (pfilefunc->zfile_func64.zseek64_file != NULL)
        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
    else
    {
        uLong offsetTruncated = (uLong)offset;
        if (offsetTruncated != offset)
            return -1;
        else
            return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
    }
 }
 ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
 {
    if (pfilefunc->zfile_func64.zseek64_file != NULL)
        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
    else
    {
        uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
        if ((tell_uLong) == ((uLong)-1))
            return (ZPOS64_T)-1;
        else
            return tell_uLong;
    }
 }
 void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
 {
    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
 }
 /* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-#ifndef SEEK_CUR
+static voidpf  ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
-#define SEEK_CUR    1
+static uLong   ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-#endif
+static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
 static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
 static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
 static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
 static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
-#ifndef SEEK_END
+static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
 #define SEEK_END    2
 #endif
 #ifndef SEEK_SET
 #define SEEK_SET    0
 #endif
 voidpf ZCALLBACK fopen_file_func OF((
   voidpf opaque,
   const char* filename,
   int mode));
 uLong ZCALLBACK fread_file_func OF((
   voidpf opaque,
   voidpf stream,
   void* buf,
   uLong size));
 uLong ZCALLBACK fwrite_file_func OF((
   voidpf opaque,
   voidpf stream,
   const void* buf,
   uLong size));
 long ZCALLBACK ftell_file_func OF((
   voidpf opaque,
   voidpf stream));
 long ZCALLBACK fseek_file_func OF((
   voidpf opaque,
   voidpf stream,
   uLong offset,
   int origin));
 int ZCALLBACK fclose_file_func OF((
   voidpf opaque,
   voidpf stream));
 int ZCALLBACK ferror_file_func OF((
   voidpf opaque,
   voidpf stream));
 voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
   voidpf opaque;
   const char* filename;
   int mode;
 {
    FILE* file = NULL;
    const char* mode_fopen = NULL;
@@ -86,44 +98,55 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
    return file;
 }
-
+static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
 uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
   voidpf opaque;
   voidpf stream;
   void* buf;
   uLong size;
 {
-    uLong ret;
+    FILE* file = NULL;
-    ret = fread(buf, 1, (size_t)size, (FILE *)stream);
+    const char* mode_fopen = NULL;
-    return ret;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
        mode_fopen = "rb";
    else
    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
        mode_fopen = "r+b";
    else
    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
        mode_fopen = "wb";
    if ((filename!=NULL) && (mode_fopen != NULL))
        file = fopen64((const char*)filename, mode_fopen);
    return file;
 }
-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
+static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
   voidpf opaque;
   voidpf stream;
   const void* buf;
   uLong size;
 {
    uLong ret;
-    ret = fwrite(buf, 1, (size_t)size, (FILE *)stream);
+    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
    return ret;
 }
-long ZCALLBACK ftell_file_func (opaque, stream)
+static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
-   voidpf opaque;
+{
-   voidpf stream;
+    uLong ret;
    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
    return ret;
 }
 static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
 {
    long ret;
    ret = ftell((FILE *)stream);
    return ret;
 }
-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
+
-   voidpf opaque;
+static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
-   voidpf stream;
+{
-   uLong offset;
+    ZPOS64_T ret;
-   int origin;
+    ret = ftello64((FILE *)stream);
    return ret;
 }
 static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
 {
    int fseek_origin=0;
    long ret;
@@ -141,22 +164,45 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
    default: return -1;
    }
    ret = 0;
-    fseek((FILE *)stream, offset, fseek_origin);
+    if (fseek((FILE *)stream, offset, fseek_origin) != 0)
        ret = -1;
    return ret;
 }
-int ZCALLBACK fclose_file_func (opaque, stream)
+static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
-   voidpf opaque;
+{
-   voidpf stream;
+    int fseek_origin=0;
    long ret;
    switch (origin)
    {
    case ZLIB_FILEFUNC_SEEK_CUR :
        fseek_origin = SEEK_CUR;
        break;
    case ZLIB_FILEFUNC_SEEK_END :
        fseek_origin = SEEK_END;
        break;
    case ZLIB_FILEFUNC_SEEK_SET :
        fseek_origin = SEEK_SET;
        break;
    default: return -1;
    }
    ret = 0;
    if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)
 			ret = -1;
    return ret;
 }
 static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
 {
    int ret;
    ret = fclose((FILE *)stream);
    return ret;
 }
-int ZCALLBACK ferror_file_func (opaque, stream)
+static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
   voidpf opaque;
   voidpf stream;
 {
    int ret;
    ret = ferror((FILE *)stream);
@@ -175,3 +221,15 @@ void fill_fopen_filefunc (pzlib_filefunc_def)
    pzlib_filefunc_def->zerror_file = ferror_file_func;
    pzlib_filefunc_def->opaque = NULL;
 }
 void fill_fopen64_filefunc (zlib_filefunc64_def*  pzlib_filefunc_def)
 {
    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
    pzlib_filefunc_def->zread_file = fread_file_func;
    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
    pzlib_filefunc_def->zclose_file = fclose_file_func;
    pzlib_filefunc_def->zerror_file = ferror_file_func;
    pzlib_filefunc_def->opaque = NULL;
 }
--- a/contrib/minizip/ioapi.h
+++ b/contrib/minizip/ioapi.h
@@ -1,13 +1,98 @@
 /* ioapi.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-   Version 1.00, September 10th, 2003
+	 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 	 Modifications for Zip64 support 
 	 Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 	 For more info read MiniZip_info.txt
 	 Changes
    Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
    Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
               More if/def section may be needed to support other platforms
    Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows. 
 		          (but you should use iowin32.c for windows instead)
   Copyright (C) 1998-2003 Gilles Vollant
 */
-#ifndef _ZLIBIOAPI_H
+#ifndef _ZLIBIOAPI64_H
-#define _ZLIBIOAPI_H
+#define _ZLIBIOAPI64_H
 #ifndef _WIN32 
  // Linux needs this to support file operation on files larger then 4+GB
  // But might need better if/def to select just the platforms that needs them.
 	#ifndef __USE_FILE_OFFSET64
 		#define __USE_FILE_OFFSET64
 	#endif
 	#ifndef __USE_LARGEFILE64
 		#define __USE_LARGEFILE64
 	#endif
 	#ifndef _LARGEFILE64_SOURCE
 		#define _LARGEFILE64_SOURCE
 	#endif
 	#ifndef _FILE_OFFSET_BIT
 		#define _FILE_OFFSET_BIT 64
 	#endif
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include "zlib.h"
 #ifdef _MSC_VER
 #define fopen64 fopen
 #if _MSC_VER >= 1400
  #define ftello64 _ftelli64
  #define fseeko64 _fseeki64
 #else // old MSC
  #define ftello64 ftell
  #define fseeko64 fseek
 #endif
 #endif
 /*
 #ifndef ZPOS64_T
  #ifdef _WIN32
 		#define ZPOS64_T fpos_t
  #else
    #include <stdint.h>       	
    #define ZPOS64_T uint64_t
  #endif
 #endif
 */
 #ifdef HAVE_MINIZIP64_CONF_H
 #include "mz64conf.h"
 #endif
 /* a type choosen by DEFINE */
 #ifdef HAVE_64BIT_INT_CUSTOM
 typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
 #else
 #ifdef HAS_STDINT_H
 #include "stdint.h"
 typedef uint64_t ZPOS64_T;
 #else
 #if defined(_MSC_VER) || defined(__BORLANDC__)
 typedef unsigned __int64 ZPOS64_T;
 #else
 typedef unsigned long long int ZPOS64_T;
 #endif
 #endif
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif
 #define ZLIB_FILEFUNC_SEEK_CUR (1)
@@ -23,26 +108,27 @@
 #ifndef ZCALLBACK
-
+ #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+   #define ZCALLBACK CALLBACK
-#define ZCALLBACK CALLBACK
+ #else
-#else
+   #define ZCALLBACK
-#define ZCALLBACK
+ #endif
 #endif
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif
 typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
 typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
 typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
 typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
 typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
 typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
 typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
 typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
 typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
 typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
 typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
 typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
 typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
 typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
 /* here is the "old" 32 bits structure structure */
 typedef struct zlib_filefunc_def_s
 {
    open_file_func      zopen_file;
@@ -55,21 +141,54 @@ typedef struct zlib_filefunc_def_s
    voidpf              opaque;
 } zlib_filefunc_def;
 typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
 typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
 typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
 typedef struct zlib_filefunc64_def_s
 {
    open64_file_func    zopen64_file;
    read_file_func      zread_file;
    write_file_func     zwrite_file;
    tell64_file_func    ztell64_file;
    seek64_file_func    zseek64_file;
    close_file_func     zclose_file;
    testerror_file_func zerror_file;
    voidpf              opaque;
 } zlib_filefunc64_def;
 void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
 void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
+/* now internal definition, only for zip.c and unzip.h */
-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
+typedef struct zlib_filefunc64_32_def_s
-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
+{
-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
+    zlib_filefunc64_def zfile_func64;
-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
+    open_file_func      zopen32_file;
-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
+    tell_file_func      ztell32_file;
    seek_file_func      zseek32_file;
 } zlib_filefunc64_32_def;
 #define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
 #define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
 //#define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
 //#define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
 #define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
 #define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
 voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
 long    call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
 ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
 void    fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
 #define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
 #define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
 #define ZSEEK64(filefunc,filestream,pos,mode)   (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
 #ifdef __cplusplus
 }
 #endif
 #endif
--- a/contrib/minizip/iowin32.c
+++ b/contrib/minizip/iowin32.c
@@ -1,10 +1,14 @@
 /* iowin32.c -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
+     Version 1.1, January 7th, 2010
-   This IO API version uses the Win32 API (for Microsoft Windows)
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-   Version 1.00, September 10th, 2003
+	 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 	 Modifications for Zip64 support 
 	 Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
     For more info read MiniZip_info.txt
   Copyright (C) 1998-2003 Gilles Vollant
 */
 #include <stdlib.h>
@@ -21,40 +25,13 @@
 #define INVALID_SET_FILE_POINTER ((DWORD)-1)
 #endif
-voidpf ZCALLBACK win32_open_file_func OF((
+voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
-   voidpf opaque,
+uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-   const char* filename,
+uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-   int mode));
+ZPOS64_T ZCALLBACK win32_tell64_file_func  OF((voidpf opaque, voidpf stream));
-
+long    ZCALLBACK win32_seek64_file_func  OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-uLong ZCALLBACK win32_read_file_func OF((
+int     ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream));
-   voidpf opaque,
+int     ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream));
   voidpf stream,
   void* buf,
   uLong size));
 uLong ZCALLBACK win32_write_file_func OF((
   voidpf opaque,
   voidpf stream,
   const void* buf,
   uLong size));
 long ZCALLBACK win32_tell_file_func OF((
   voidpf opaque,
   voidpf stream));
 long ZCALLBACK win32_seek_file_func OF((
   voidpf opaque,
   voidpf stream,
   uLong offset,
   int origin));
 int ZCALLBACK win32_close_file_func OF((
   voidpf opaque,
   voidpf stream));
 int ZCALLBACK win32_error_file_func OF((
   voidpf opaque,
   voidpf stream));
 typedef struct
 {
@@ -62,69 +39,121 @@ typedef struct
    int error;
 } WIN32FILE_IOWIN;
 voidpf ZCALLBACK win32_open_file_func (opaque, filename, mode)
   voidpf opaque;
   const char* filename;
   int mode;
 {
    const char* mode_fopen = NULL;
    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
    HANDLE hFile = 0;
    voidpf ret=NULL;
-    dwDesiredAccess = dwShareMode = dwFlagsAndAttributes = 0;
+static void win32_translate_open_mode(int mode,
                                      DWORD* lpdwDesiredAccess,
                                      DWORD* lpdwCreationDisposition,
                                      DWORD* lpdwShareMode,
                                      DWORD* lpdwFlagsAndAttributes)
 {
    *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0;
    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
    {
-        dwDesiredAccess = GENERIC_READ;
+        *lpdwDesiredAccess = GENERIC_READ;
-        dwCreationDisposition = OPEN_EXISTING;
+        *lpdwCreationDisposition = OPEN_EXISTING;
-        dwShareMode = FILE_SHARE_READ;
+        *lpdwShareMode = FILE_SHARE_READ;
    }
-    else
+    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
    {
-        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        dwCreationDisposition = OPEN_EXISTING;
+        *lpdwCreationDisposition = OPEN_EXISTING;
    }
-    else
+    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
    {
-        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        dwCreationDisposition = CREATE_ALWAYS;
+        *lpdwCreationDisposition = CREATE_ALWAYS;
    }
 }
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
+static voidpf win32_build_iowin(HANDLE hFile)
-        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL,
+{
-                      dwCreationDisposition, dwFlagsAndAttributes, NULL);
+    voidpf ret=NULL;
-    if (hFile == INVALID_HANDLE_VALUE)
+    if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE))
        hFile = NULL;
    if (hFile != NULL)
    {
        WIN32FILE_IOWIN w32fiow;
        w32fiow.hf = hFile;
        w32fiow.error = 0;
        ret = malloc(sizeof(WIN32FILE_IOWIN));
        if (ret==NULL)
            CloseHandle(hFile);
-        else *((WIN32FILE_IOWIN*)ret) = w32fiow;
+        else
            *((WIN32FILE_IOWIN*)ret) = w32fiow;
    }
    return ret;
 }
 voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode)
 {
    const char* mode_fopen = NULL;
    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
    HANDLE hFile = NULL;
-uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
-   voidpf opaque;
+
-   voidpf stream;
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
-   void* buf;
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-   uLong size;
+
    return win32_build_iowin(hFile);
 }
 voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode)
 {
    const char* mode_fopen = NULL;
    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
    HANDLE hFile = NULL;
    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
    if ((filename!=NULL) && (dwDesiredAccess != 0))
        hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
    return win32_build_iowin(hFile);
 }
 voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode)
 {
    const char* mode_fopen = NULL;
    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
    HANDLE hFile = NULL;
    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
    if ((filename!=NULL) && (dwDesiredAccess != 0))
        hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
    return win32_build_iowin(hFile);
 }
 voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode)
 {
    const char* mode_fopen = NULL;
    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
    HANDLE hFile = NULL;
    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
    if ((filename!=NULL) && (dwDesiredAccess != 0))
        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
    return win32_build_iowin(hFile);
 }
 uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size)
 {
    uLong ret=0;
    HANDLE hFile = NULL;
    if (stream!=NULL)
        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
    if (hFile != NULL)
    {
        if (!ReadFile(hFile, buf, size, &ret, NULL))
        {
            DWORD dwErr = GetLastError();
@@ -132,23 +161,21 @@ uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
                dwErr = 0;
            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
        }
    }
    return ret;
 }
-uLong ZCALLBACK win32_write_file_func (opaque, stream, buf, size)
+uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
   voidpf opaque;
   voidpf stream;
   const void* buf;
   uLong size;
 {
    uLong ret=0;
    HANDLE hFile = NULL;
    if (stream!=NULL)
        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    if (hFile !=NULL)
+    if (hFile != NULL)
    {
        if (!WriteFile(hFile, buf, size, &ret, NULL))
        {
            DWORD dwErr = GetLastError();
@@ -156,13 +183,12 @@ uLong ZCALLBACK win32_write_file_func (opaque, stream, buf, size)
                dwErr = 0;
            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
        }
    }
    return ret;
 }
-long ZCALLBACK win32_tell_file_func (opaque, stream)
+long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
   voidpf opaque;
   voidpf stream;
 {
    long ret=-1;
    HANDLE hFile = NULL;
@@ -183,11 +209,32 @@ long ZCALLBACK win32_tell_file_func (opaque, stream)
    return ret;
 }
-long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
+ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
-   voidpf opaque;
+{
-   voidpf stream;
+    ZPOS64_T ret= (ZPOS64_T)-1;
-   uLong offset;
+    HANDLE hFile = NULL;
-   int origin;
+    if (stream!=NULL)
        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
    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))
        {
            DWORD dwErr = GetLastError();
            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
            ret = (ZPOS64_T)-1;
        }
        else
            ret=li.QuadPart;
    }
    return ret;
 }
 long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin)
 {
    DWORD dwMoveMethod=0xFFFFFFFF;
    HANDLE hFile = NULL;
@@ -224,9 +271,46 @@ long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
    return ret;
 }
-int ZCALLBACK win32_close_file_func (opaque, stream)
+long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin)
-   voidpf opaque;
+{
-   voidpf stream;
+    DWORD dwMoveMethod=0xFFFFFFFF;
    HANDLE hFile = NULL;
    long ret=-1;
    if (stream!=NULL)
        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
    switch (origin)
    {
        case ZLIB_FILEFUNC_SEEK_CUR :
            dwMoveMethod = FILE_CURRENT;
            break;
        case ZLIB_FILEFUNC_SEEK_END :
            dwMoveMethod = FILE_END;
            break;
        case ZLIB_FILEFUNC_SEEK_SET :
            dwMoveMethod = FILE_BEGIN;
            break;
        default: return -1;
    }
    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)
        {
            DWORD dwErr = GetLastError();
            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
            ret = -1;
        }
        else
            ret=0;
    }
    return ret;
 }
 int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream)
 {
    int ret=-1;
@@ -244,9 +328,7 @@ int ZCALLBACK win32_close_file_func (opaque, stream)
    return ret;
 }
-int ZCALLBACK win32_error_file_func (opaque, stream)
+int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream)
   voidpf opaque;
   voidpf stream;
 {
    int ret=-1;
    if (stream!=NULL)
@@ -256,8 +338,7 @@ int ZCALLBACK win32_error_file_func (opaque, stream)
    return ret;
 }
-void fill_win32_filefunc (pzlib_filefunc_def)
+void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
  zlib_filefunc_def* pzlib_filefunc_def;
 {
    pzlib_filefunc_def->zopen_file = win32_open_file_func;
    pzlib_filefunc_def->zread_file = win32_read_file_func;
@@ -266,5 +347,43 @@ void fill_win32_filefunc (pzlib_filefunc_def)
    pzlib_filefunc_def->zseek_file = win32_seek_file_func;
    pzlib_filefunc_def->zclose_file = win32_close_file_func;
    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque=NULL;
+    pzlib_filefunc_def->opaque = NULL;
 }
 void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def)
 {
    pzlib_filefunc_def->zopen64_file = win32_open64_file_func;
    pzlib_filefunc_def->zread_file = win32_read_file_func;
    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
    pzlib_filefunc_def->zclose_file = win32_close_file_func;
    pzlib_filefunc_def->zerror_file = win32_error_file_func;
    pzlib_filefunc_def->opaque = NULL;
 }
 void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def)
 {
    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA;
    pzlib_filefunc_def->zread_file = win32_read_file_func;
    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
    pzlib_filefunc_def->zclose_file = win32_close_file_func;
    pzlib_filefunc_def->zerror_file = win32_error_file_func;
    pzlib_filefunc_def->opaque = NULL;
 }
 void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def)
 {
    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW;
    pzlib_filefunc_def->zread_file = win32_read_file_func;
    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
    pzlib_filefunc_def->zclose_file = win32_close_file_func;
    pzlib_filefunc_def->zerror_file = win32_error_file_func;
    pzlib_filefunc_def->opaque = NULL;
 }
--- a/contrib/minizip/iowin32.h
+++ b/contrib/minizip/iowin32.h
@@ -1,10 +1,14 @@
 /* iowin32.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
+     Version 1.1, January 7th, 2010
-   This IO API version uses the Win32 API (for Microsoft Windows)
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-   Version 1.00, September 10th, 2003
+	 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 	 Modifications for Zip64 support 
 	 Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 	 For more info read MiniZip_info.txt
   Copyright (C) 1998-2003 Gilles Vollant
 */
 #include <windows.h>
@@ -15,6 +19,9 @@ extern "C" {
 #endif
 void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
 void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def));
 void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def));
 void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def));
 #ifdef __cplusplus
 }
--- a/contrib/minizip/miniunz.c
+++ b/contrib/minizip/miniunz.c
@@ -1,3 +1,32 @@
 /*
   miniunz.c
   Version 1.1, January 7th, 2010
   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 	 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 	 Modifications of Unzip for Zip64
 	 Copyright (C) 2007-2008 Even Rouault
 	 Modifications for Zip64 support on both zip and unzip
 	 Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 */
 #ifndef _WIN32 
 	#ifndef __USE_FILE_OFFSET64
 		#define __USE_FILE_OFFSET64
 	#endif
 	#ifndef __USE_LARGEFILE64
 		#define __USE_LARGEFILE64
 	#endif
 	#ifndef _LARGEFILE64_SOURCE
 		#define _LARGEFILE64_SOURCE
 	#endif
 	#ifndef _FILE_OFFSET_BIT
 		#define _FILE_OFFSET_BIT 64
 	#endif
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -19,7 +48,7 @@
 #define WRITEBUFFERSIZE (8192)
 #define MAXFILENAME (256)
-#ifdef WIN32
+#ifdef _WIN32
 #define USEWIN32IOAPI
 #include "iowin32.h"
 #endif
@@ -27,7 +56,7 @@
  mini unzip, demo of unzip package
  usage :
-  Usage : miniunz [-exvlo] file.zip [file_to_extract]
+  Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir]
  list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT
    if it exists
@@ -43,11 +72,11 @@ void change_file_date(filename,dosdate,tmu_date)
    uLong dosdate;
    tm_unz tmu_date;
 {
-#ifdef WIN32
+#ifdef _WIN32
  HANDLE hFile;
  FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
-  hFile = CreateFile(filename,GENERIC_READ | GENERIC_WRITE,
+  hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE,
                      0,NULL,OPEN_EXISTING,0,NULL);
  GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite);
  DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal);
@@ -83,8 +112,8 @@ int mymkdir(dirname)
    const char* dirname;
 {
    int ret=0;
-#ifdef WIN32
+#ifdef _WIN32
-    ret = mkdir(dirname);
+    ret = _mkdir(dirname);
 #else
 #ifdef unix
    ret = mkdir (dirname,0775);
@@ -104,6 +133,11 @@ int makedir (newdir)
    return 0;
  buffer = (char*)malloc(len+1);
 	if (buffer==NULL)
 	{
 		printf("Error allocating memory\n");
 		return UNZ_INTERNALERROR;
 	}
  strcpy(buffer,newdir);
  if (buffer[len-1] == '/') {
@@ -140,49 +174,77 @@ int makedir (newdir)
 void do_banner()
 {
-    printf("MiniUnz 1.00, demo of zLib + Unz package written by Gilles Vollant\n");
+    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
 }
 void do_help()
 {
-    printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.]\n\n" \
+    printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
           "  -e  Extract without pathname (junk paths)\n" \
           "  -x  Extract with pathname\n" \
           "  -v  list files\n" \
           "  -l  list files\n" \
           "  -d  directory to extract into\n" \
           "  -o  overwrite files without prompting\n" \
           "  -p  extract crypted file using password\n\n");
 }
 void Display64BitsSize(ZPOS64_T n, int size_char)
 {
  /* to avoid compatibility problem , we do here the conversion */
  char number[21];
  int offset=19;
  int pos_string = 19;
  number[20]=0;
  for (;;) {
      number[offset]=(char)((n%10)+'0');
      if (number[offset] != '0')
          pos_string=offset;
      n/=10;
      if (offset==0)
          break;
      offset--;
  }
  {
      int size_display_string = 19-pos_string;
      while (size_char > size_display_string)
      {
          size_char--;
          printf(" ");
      }
  }
  printf("%s",&number[pos_string]);
 }
 int do_list(uf)
    unzFile uf;
 {
    uLong i;
-    unz_global_info gi;
+    unz_global_info64 gi;
    int err;
-    err = unzGetGlobalInfo (uf,&gi);
+    err = unzGetGlobalInfo64(uf,&gi);
    if (err!=UNZ_OK)
        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
-    printf(" Length  Method   Size  Ratio   Date    Time   CRC-32     Name\n");
+    printf("  Length  Method     Size Ratio   Date    Time   CRC-32     Name\n");
-    printf(" ------  ------   ----  -----   ----    ----   ------     ----\n");
+    printf("  ------  ------     ---- -----   ----    ----   ------     ----\n");
    for (i=0;i<gi.number_entry;i++)
    {
        char filename_inzip[256];
-        unz_file_info file_info;
+        unz_file_info64 file_info;
        uLong ratio=0;
        const char *string_method;
        char charCrypt=' ';
-        err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+        err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
        if (err!=UNZ_OK)
        {
            printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
            break;
        }
        if (file_info.uncompressed_size>0)
-            ratio = (file_info.compressed_size*100)/file_info.uncompressed_size;
+            ratio = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size);
        /* display a '*' if the file is crypted */
        if ((file_info.flag & 1) != 0)
@@ -201,13 +263,18 @@ int do_list(uf)
            else if ((iLevel==2) || (iLevel==3))
              string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
        }
        else
        if (file_info.compression_method==Z_BZIP2ED)
        {
              string_method="BZip2 ";
        }
        else
            string_method="Unkn. ";
-        printf("%7lu  %6s%c%7lu %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
+        Display64BitsSize(file_info.uncompressed_size,7);
-                file_info.uncompressed_size,string_method,
+        printf("  %6s%c",string_method,charCrypt);
-                charCrypt,
+        Display64BitsSize(file_info.compressed_size,7);
-                file_info.compressed_size,
+        printf(" %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
                ratio,
                (uLong)file_info.tmu_date.tm_mon + 1,
                (uLong)file_info.tmu_date.tm_mday,
@@ -243,9 +310,9 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
    void* buf;
    uInt size_buf;
-    unz_file_info file_info;
+    unz_file_info64 file_info;
    uLong ratio=0;
-    err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+    err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
    if (err!=UNZ_OK)
    {
@@ -297,15 +364,21 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
        {
            char rep=0;
            FILE* ftestexist;
-            ftestexist = fopen(write_filename,"rb");
+            ftestexist = fopen64(write_filename,"rb");
            if (ftestexist!=NULL)
            {
                fclose(ftestexist);
                do
                {
                    char answer[128];
-                    printf("The file %s exist. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
+                    int ret;
-                    scanf("%1s",answer);
+
                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
                    ret = scanf("%1s",answer);
                    if (ret != 1) 
                    {
                       exit(EXIT_FAILURE);
                    }
                    rep = answer[0] ;
                    if ((rep>='a') && (rep<='z'))
                        rep -= 0x20;
@@ -322,7 +395,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
        if ((skip==0) && (err==UNZ_OK))
        {
-            fout=fopen(write_filename,"wb");
+            fout=fopen64(write_filename,"wb");
            /* some zipfile don't contain directory alone before file */
            if ((fout==NULL) && ((*popt_extract_without_path)==0) &&
@@ -332,7 +405,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
                *(filename_withoutpath-1)='\0';
                makedir(write_filename);
                *(filename_withoutpath-1)=c;
-                fout=fopen(write_filename,"wb");
+                fout=fopen64(write_filename,"wb");
            }
            if (fout==NULL)
@@ -394,11 +467,11 @@ int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
    const char* password;
 {
    uLong i;
-    unz_global_info gi;
+    unz_global_info64 gi;
    int err;
    FILE* fout=NULL;
-    err = unzGetGlobalInfo (uf,&gi);
+    err = unzGetGlobalInfo64(uf,&gi);
    if (err!=UNZ_OK)
        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
@@ -455,10 +528,13 @@ int main(argc,argv)
    const char *password=NULL;
    char filename_try[MAXFILENAME+16] = "";
    int i;
    int ret_value=0;
    int opt_do_list=0;
    int opt_do_extract=1;
    int opt_do_extract_withoutpath=0;
    int opt_overwrite=0;
    int opt_extractdir=0;
    const char *dirname=NULL;
    unzFile uf=NULL;
    do_banner();
@@ -488,6 +564,12 @@ int main(argc,argv)
                        opt_do_extract = opt_do_extract_withoutpath = 1;
                    if ((c=='o') || (c=='O'))
                        opt_overwrite=1;
                    if ((c=='d') || (c=='D'))
                    {
                        opt_extractdir=1;
                        dirname=argv[i+1];
                    }
                    if (((c=='p') || (c=='P')) && (i+1<argc))
                    {
                        password=argv[i+1];
@@ -499,7 +581,7 @@ int main(argc,argv)
            {
                if (zipfilename == NULL)
                    zipfilename = argv[i];
-                else if (filename_to_extract==NULL)
+                else if ((filename_to_extract==NULL) && (!opt_extractdir))
                        filename_to_extract = argv[i] ;
            }
        }
@@ -509,7 +591,7 @@ int main(argc,argv)
    {
 #        ifdef USEWIN32IOAPI
-        zlib_filefunc_def ffunc;
+        zlib_filefunc64_def ffunc;
 #        endif
        strncpy(filename_try, zipfilename,MAXFILENAME-1);
@@ -517,18 +599,18 @@ int main(argc,argv)
        filename_try[ MAXFILENAME ] = '\0';
 #        ifdef USEWIN32IOAPI
-        fill_win32_filefunc(&ffunc);
+        fill_win32_filefunc64A(&ffunc);
-        uf = unzOpen2(zipfilename,&ffunc);
+        uf = unzOpen2_64(zipfilename,&ffunc);
 #        else
-        uf = unzOpen(zipfilename);
+        uf = unzOpen64(zipfilename);
 #        endif
        if (uf==NULL)
        {
            strcat(filename_try,".zip");
 #            ifdef USEWIN32IOAPI
-            uf = unzOpen2(filename_try,&ffunc);
+            uf = unzOpen2_64(filename_try,&ffunc);
 #            else
-            uf = unzOpen(filename_try);
+            uf = unzOpen64(filename_try);
 #            endif
        }
    }
@@ -541,16 +623,26 @@ int main(argc,argv)
    printf("%s opened\n",filename_try);
    if (opt_do_list==1)
-        return do_list(uf);
+        ret_value = do_list(uf);
    else if (opt_do_extract==1)
    {
-        if (filename_to_extract == NULL)
+#ifdef _WIN32
-            return do_extract(uf,opt_do_extract_withoutpath,opt_overwrite,password);
+        if (opt_extractdir && _chdir(dirname)) 
-        else
+#else
-            return do_extract_onefile(uf,filename_to_extract,
+        if (opt_extractdir && chdir(dirname)) 
-                                      opt_do_extract_withoutpath,opt_overwrite,password);
+#endif
-    }
+        {
-    unzCloseCurrentFile(uf);
+          printf("Error changing into %s, aborting\n", dirname);
          exit(-1);
        }
-    return 0;
+        if (filename_to_extract == NULL)
            ret_value = do_extract(uf, opt_do_extract_withoutpath, opt_overwrite, password);
        else
            ret_value = do_extract_onefile(uf, filename_to_extract, opt_do_extract_withoutpath, opt_overwrite, password);
    }
    unzClose(uf);
    return ret_value;
 }
--- a/contrib/minizip/minizip.c
+++ b/contrib/minizip/minizip.c
@@ -1,3 +1,33 @@
 /*
   minizip.c
   Version 1.1, January 7th, 2010
   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 	 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 	 Modifications of Unzip for Zip64
 	 Copyright (C) 2007-2008 Even Rouault
 	 Modifications for Zip64 support on both zip and unzip
 	 Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 */
 #ifndef _WIN32 
 	#ifndef __USE_FILE_OFFSET64
 		#define __USE_FILE_OFFSET64
 	#endif
 	#ifndef __USE_LARGEFILE64
 		#define __USE_LARGEFILE64
 	#endif
 	#ifndef _LARGEFILE64_SOURCE
 		#define _LARGEFILE64_SOURCE
 	#endif
 	#ifndef _FILE_OFFSET_BIT
 		#define _FILE_OFFSET_BIT 64
 	#endif
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,9 +47,9 @@
 #include "zip.h"
-#ifdef WIN32
+#ifdef _WIN32
-#define USEWIN32IOAPI
+	#define USEWIN32IOAPI
-#include "iowin32.h"
+	#include "iowin32.h"
 #endif
@@ -27,7 +57,7 @@
 #define WRITEBUFFERSIZE (16384)
 #define MAXFILENAME (256)
-#ifdef WIN32
+#ifdef _WIN32
 uLong filetime(f, tmzip, dt)
    char *f;                /* name of file to get info on */
    tm_zip *tmzip;             /* return value: access, modific. and creation times */
@@ -37,9 +67,9 @@ uLong filetime(f, tmzip, dt)
  {
      FILETIME ftLocal;
      HANDLE hFind;
-      WIN32_FIND_DATA  ff32;
+      WIN32_FIND_DATAA ff32;
-      hFind = FindFirstFile(f,&ff32);
+      hFind = FindFirstFileA(f,&ff32);
      if (hFind != INVALID_HANDLE_VALUE)
      {
        FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
@@ -53,8 +83,8 @@ uLong filetime(f, tmzip, dt)
 #else
 #ifdef unix
 uLong filetime(f, tmzip, dt)
-    char *f;                /* name of file to get info on */
+    char *f;               /* name of file to get info on */
-    tm_zip *tmzip;             /* return value: access, modific. and creation times */
+    tm_zip *tmzip;         /* return value: access, modific. and creation times */
    uLong *dt;             /* dostime */
 {
  int ret=0;
@@ -66,6 +96,8 @@ uLong filetime(f, tmzip, dt)
  {
    char name[MAXFILENAME+1];
    int len = strlen(f);
    if (len > MAXFILENAME)
      len = MAXFILENAME;
    strncpy(name, f,MAXFILENAME-1);
    /* strncpy doesnt append the trailing NULL, of the string is too long. */
@@ -110,7 +142,7 @@ int check_exist_file(filename)
 {
    FILE* ftestexist;
    int ret = 1;
-    ftestexist = fopen(filename,"rb");
+    ftestexist = fopen64(filename,"rb");
    if (ftestexist==NULL)
        ret = 0;
    else
@@ -120,18 +152,20 @@ int check_exist_file(filename)
 void do_banner()
 {
-    printf("MiniZip 1.00, demo of zLib + Zip package written by Gilles Vollant\n");
+    printf("MiniZip64 1.0, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
-    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
+    printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n");
    printf("more info on MiniZip64 at http://result42.com/projects/MiniZip64\n\n");
 }
 void do_help()
 {
-    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] file.zip [files_to_add]\n\n" \
+    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
           "  -o  Overwrite existing file.zip\n" \
           "  -a  Append to existing file.zip\n" \
           "  -0  Store only\n" \
           "  -1  Compress faster\n" \
-           "  -9  Compress better\n\n");
+           "  -9  Compress better\n\n" \
           "  -j  exclude path. store only the file name.\n\n");
 }
 /* calculate the CRC32 of a file,
@@ -140,7 +174,7 @@ int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigne
 {
   unsigned long calculate_crc=0;
   int err=ZIP_OK;
-   FILE * fin = fopen(filenameinzip,"rb");
+   FILE * fin = fopen64(filenameinzip,"rb");
   unsigned long size_read = 0;
   unsigned long total_read = 0;
   if (fin==NULL)
@@ -170,10 +204,33 @@ int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigne
        fclose(fin);
    *result_crc=calculate_crc;
-    printf("file %s crc %x\n",filenameinzip,calculate_crc);
+    printf("file %s crc %lx\n", filenameinzip, calculate_crc);
    return err;
 }
 int isLargeFile(const char* filename)
 {
  int largeFile = 0;
  ZPOS64_T pos = 0;
  FILE* pFile = fopen64(filename, "rb");
  if(pFile != NULL)
  {
    int n = fseeko64(pFile, 0, SEEK_END);
    pos = ftello64(pFile);
 		printf("File : %s is %lld bytes\n", filename, pos);
    if(pos >= 0xffffffff)
     largeFile = 1;
 		fclose(pFile);
  }
 return largeFile;
 }
 int main(argc,argv)
    int argc;
    char *argv[];
@@ -181,6 +238,7 @@ int main(argc,argv)
    int i;
    int opt_overwrite=0;
    int opt_compress_level=Z_DEFAULT_COMPRESSION;
    int opt_exclude_path=0;
    int zipfilenamearg = 0;
    char filename_try[MAXFILENAME+16];
    int zipok;
@@ -213,6 +271,8 @@ int main(argc,argv)
                        opt_overwrite = 2;
                    if ((c>='0') && (c<='9'))
                        opt_compress_level = c-'0';
                    if ((c=='j') || (c=='J'))
                        opt_exclude_path = 1;
                    if (((c=='p') || (c=='P')) && (i+1<argc))
                    {
@@ -222,8 +282,12 @@ int main(argc,argv)
                }
            }
            else
            {
                if (zipfilenamearg == 0)
                {
                    zipfilenamearg = i ;
                }
            }
        }
    }
@@ -236,7 +300,9 @@ int main(argc,argv)
    }
    if (zipfilenamearg==0)
    {
        zipok=0;
    }
    else
    {
        int i,len;
@@ -269,8 +335,13 @@ int main(argc,argv)
                do
                {
                    char answer[128];
-                    printf("The file %s exist. Overwrite ? [y]es, [n]o, [a]ppend : ",filename_try);
+                    int ret;
-                    scanf("%1s",answer);
+                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [a]ppend : ",filename_try);
                    ret = scanf("%1s",answer);
                    if (ret != 1)
                    {
                       exit(EXIT_FAILURE);
                    }
                    rep = answer[0] ;
                    if ((rep>='a') && (rep<='z'))
                        rep -= 0x20;
@@ -288,11 +359,11 @@ int main(argc,argv)
        zipFile zf;
        int errclose;
 #        ifdef USEWIN32IOAPI
-        zlib_filefunc_def ffunc;
+        zlib_filefunc64_def ffunc;
-        fill_win32_filefunc(&ffunc);
+        fill_win32_filefunc64A(&ffunc);
-        zf = zipOpen2(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
+        zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
 #        else
-        zf = zipOpen(filename_try,(opt_overwrite==2) ? 2 : 0);
+        zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0);
 #        endif
        if (zf == NULL)
@@ -305,13 +376,20 @@ int main(argc,argv)
        for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++)
        {
-            if (((*(argv[i]))!='-') && ((*(argv[i]))!='/'))
+            if (!((((*(argv[i]))=='-') || ((*(argv[i]))=='/')) &&
                  ((argv[i][1]=='o') || (argv[i][1]=='O') ||
                   (argv[i][1]=='a') || (argv[i][1]=='A') ||
                   (argv[i][1]=='p') || (argv[i][1]=='P') ||
                   ((argv[i][1]>='0') || (argv[i][1]<='9'))) &&
                  (strlen(argv[i]) == 2)))
            {
                FILE * fin;
                int size_read;
                const char* filenameinzip = argv[i];
                const char *savefilenameinzip;
                zip_fileinfo zi;
                unsigned long crcFile=0;
                int zip64 = 0;
                zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
                zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0;
@@ -328,20 +406,49 @@ int main(argc,argv)
 */
                if ((password != NULL) && (err==ZIP_OK))
                    err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
                zip64 = isLargeFile(filenameinzip);
-                err = zipOpenNewFileInZip3(zf,filenameinzip,&zi,
+							 /* The path name saved, should not include a leading slash. */
               /*if it did, windows/xp and dynazip couldn't read the zip file. */
                 savefilenameinzip = filenameinzip;
                 while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' )
                 {
                     savefilenameinzip++;
                 }
                 /*should the zip file contain any path at all?*/
                 if( opt_exclude_path )
                 {
                     const char *tmpptr;
                     const char *lastslash = 0;
                     for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++)
                     {
                         if( *tmpptr == '\\' || *tmpptr == '/')
                         {
                             lastslash = tmpptr;
                         }
                     }
                     if( lastslash != NULL )
                     {
                         savefilenameinzip = lastslash+1; // base filename follows last slash.
                     }
                 }
                 /**/
                err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi,
                                 NULL,0,NULL,0,NULL /* comment*/,
                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
                                 opt_compress_level,0,
                                 /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 password,crcFile);
+                                 password,crcFile, zip64);
                if (err != ZIP_OK)
                    printf("error in opening %s in zipfile\n",filenameinzip);
                else
                {
-                    fin = fopen(filenameinzip,"rb");
+                    fin = fopen64(filenameinzip,"rb");
                    if (fin==NULL)
                    {
                        err=ZIP_ERRNO;
@@ -390,7 +497,11 @@ int main(argc,argv)
        errclose = zipClose(zf,NULL);
        if (errclose != ZIP_OK)
            printf("error in closing %s\n",filename_try);
-   }
+    }
    else
    {
       do_help();
    }
    free(buf);
    return 0;
--- a/contrib/minizip/mztools.c
+++ b/contrib/minizip/mztools.c
@@ -0,0 +1,281 @@
 /*
  Additional tools for Minizip
  Code: Xavier Roche '2004
  License: Same as ZLIB (www.gzip.org)
 */
 /* Code */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "zlib.h"
 #include "unzip.h"
 #define READ_8(adr)  ((unsigned char)*(adr))
 #define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
 #define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
 #define WRITE_8(buff, n) do { \
  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
 } while(0)
 #define WRITE_16(buff, n) do { \
  WRITE_8((unsigned char*)(buff), n); \
  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
 } while(0)
 #define WRITE_32(buff, n) do { \
  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
 } while(0)
 extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
 const char* file;
 const char* fileOut;
 const char* fileOutTmp;
 uLong* nRecovered;
 uLong* bytesRecovered;
 {
  int err = Z_OK;
  FILE* fpZip = fopen(file, "rb");
  FILE* fpOut = fopen(fileOut, "wb");
  FILE* fpOutCD = fopen(fileOutTmp, "wb");
  if (fpZip != NULL &&  fpOut != NULL) {
    int entries = 0;
    uLong totalBytes = 0;
    char header[30];
    char filename[256];
    char extra[1024];
    int offset = 0;
    int offsetCD = 0;
    while ( fread(header, 1, 30, fpZip) == 30 ) {
      int currentOffset = offset;
      /* File entry */
      if (READ_32(header) == 0x04034b50) {
        unsigned int version = READ_16(header + 4);
        unsigned int gpflag = READ_16(header + 6);
        unsigned int method = READ_16(header + 8);
        unsigned int filetime = READ_16(header + 10);
        unsigned int filedate = READ_16(header + 12);
        unsigned int crc = READ_32(header + 14); /* crc */
        unsigned int cpsize = READ_32(header + 18); /* compressed size */
        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
        unsigned int fnsize = READ_16(header + 26); /* file name length */
        unsigned int extsize = READ_16(header + 28); /* extra field length */
        filename[0] = extra[0] = '\0';
        /* Header */
        if (fwrite(header, 1, 30, fpOut) == 30) {
          offset += 30;
        } else {
          err = Z_ERRNO;
          break;
        }
        /* Filename */
        if (fnsize > 0) {
          if (fread(filename, 1, fnsize, fpZip) == fnsize) {
            if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
              offset += fnsize;
            } else {
              err = Z_ERRNO;
              break;
            }
          } else {
            err = Z_ERRNO;
            break;
          }
        } else {
          err = Z_STREAM_ERROR;
          break;
        }
        /* Extra field */
        if (extsize > 0) {
          if (fread(extra, 1, extsize, fpZip) == extsize) {
            if (fwrite(extra, 1, extsize, fpOut) == extsize) {
              offset += extsize;
            } else {
              err = Z_ERRNO;
              break;
            }
          } else {
            err = Z_ERRNO;
            break;
          }
        }
        /* Data */
        {
          int dataSize = cpsize;
          if (dataSize == 0) {
            dataSize = uncpsize;
          }
          if (dataSize > 0) {
            char* data = malloc(dataSize);
            if (data != NULL) {
              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
                  offset += dataSize;
                  totalBytes += dataSize;
                } else {
                  err = Z_ERRNO;
                }
              } else {
                err = Z_ERRNO;
              }
              free(data);
              if (err != Z_OK) {
                break;
              }
            } else {
              err = Z_MEM_ERROR;
              break;
            }
          }
        }
        /* Central directory entry */
        {
          char header[46];
          char* comment = "";
          int comsize = (int) strlen(comment);
          WRITE_32(header, 0x02014b50);
          WRITE_16(header + 4, version);
          WRITE_16(header + 6, version);
          WRITE_16(header + 8, gpflag);
          WRITE_16(header + 10, method);
          WRITE_16(header + 12, filetime);
          WRITE_16(header + 14, filedate);
          WRITE_32(header + 16, crc);
          WRITE_32(header + 20, cpsize);
          WRITE_32(header + 24, uncpsize);
          WRITE_16(header + 28, fnsize);
          WRITE_16(header + 30, extsize);
          WRITE_16(header + 32, comsize);
          WRITE_16(header + 34, 0);     /* disk # */
          WRITE_16(header + 36, 0);     /* int attrb */
          WRITE_32(header + 38, 0);     /* ext attrb */
          WRITE_32(header + 42, currentOffset);
          /* Header */
          if (fwrite(header, 1, 46, fpOutCD) == 46) {
            offsetCD += 46;
            /* Filename */
            if (fnsize > 0) {
              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
                offsetCD += fnsize;
              } else {
                err = Z_ERRNO;
                break;
              }
            } else {
              err = Z_STREAM_ERROR;
              break;
            }
            /* Extra field */
            if (extsize > 0) {
              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
                offsetCD += extsize;
              } else {
                err = Z_ERRNO;
                break;
              }
            }
            /* Comment field */
            if (comsize > 0) {
              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
                offsetCD += comsize;
              } else {
                err = Z_ERRNO;
                break;
              }
            }
          } else {
            err = Z_ERRNO;
            break;
          }
        }
        /* Success */
        entries++;
      } else {
        break;
      }
    }
    /* Final central directory  */
    {
      int entriesZip = entries;
      char header[22];
      char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
      int comsize = (int) strlen(comment);
      if (entriesZip > 0xffff) {
        entriesZip = 0xffff;
      }
      WRITE_32(header, 0x06054b50);
      WRITE_16(header + 4, 0);    /* disk # */
      WRITE_16(header + 6, 0);    /* disk # */
      WRITE_16(header + 8, entriesZip);   /* hack */
      WRITE_16(header + 10, entriesZip);  /* hack */
      WRITE_32(header + 12, offsetCD);    /* size of CD */
      WRITE_32(header + 16, offset);      /* offset to CD */
      WRITE_16(header + 20, comsize);     /* comment */
      /* Header */
      if (fwrite(header, 1, 22, fpOutCD) == 22) {
        /* Comment field */
        if (comsize > 0) {
          if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
            err = Z_ERRNO;
          }
        }
      } else {
        err = Z_ERRNO;
      }
    }
    /* Final merge (file + central directory) */
    fclose(fpOutCD);
    if (err == Z_OK) {
      fpOutCD = fopen(fileOutTmp, "rb");
      if (fpOutCD != NULL) {
        int nRead;
        char buffer[8192];
        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
            err = Z_ERRNO;
            break;
          }
        }
        fclose(fpOutCD);
      }
    }
    /* Close */
    fclose(fpZip);
    fclose(fpOut);
    /* Wipe temporary file */
    (void)remove(fileOutTmp);
    /* Number of recovered entries */
    if (err == Z_OK) {
      if (nRecovered != NULL) {
        *nRecovered = entries;
      }
      if (bytesRecovered != NULL) {
        *bytesRecovered = totalBytes;
      }
    }
  } else {
    err = Z_STREAM_ERROR;
  }
  return err;
 }
--- a/contrib/minizip/mztools.h
+++ b/contrib/minizip/mztools.h
@@ -0,0 +1,31 @@
 /*
  Additional tools for Minizip
  Code: Xavier Roche '2004
  License: Same as ZLIB (www.gzip.org)
 */
 #ifndef _zip_tools_H
 #define _zip_tools_H
 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifndef _ZLIB_H
 #include "zlib.h"
 #endif
 #include "unzip.h"
 /* Repair a ZIP file (missing central directory) 
   file: file to recover
   fileOut: output file after recovery
   fileOutTmp: temporary file name used for recovery
 */
 extern int ZEXPORT unzRepair(const char* file, 
                             const char* fileOut, 
                             const char* fileOutTmp, 
                             uLong* nRecovered,
                             uLong* bytesRecovered);
 #endif
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
--- a/contrib/minizip/unzip.h
+++ b/contrib/minizip/unzip.h
@@ -1,18 +1,20 @@
 /* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.00, September 10th, 2003
+   Version 1.1, January 7th, 2010
   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-   Copyright (C) 1998-2003 Gilles Vollant
+	 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
+	 Modifications of Unzip for Zip64
-     WinZip, InfoZip tools and compatible.
+	 Copyright (C) 2007-2008 Even Rouault
   Encryption and multi volume ZipFile (span) are not supported.
   Old compressions used by old PKZip 1.x are not supported
 	 Modifications for Zip64 support on both zip and unzip
 	 Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-   I WAIT FEEDBACK at mail info@winimage.com
+	 For more info read MiniZip_info.txt
   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-   Condition of use and distribution are the same than zlib :
+	 ---------------------------------------------------------------------------------
 	Condition of use and distribution are the same than zlib :
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@@ -30,18 +32,16 @@
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
  ---------------------------------------------------------------------------------
 	Changes
 	See header of unzip64.c 
 */
-/* for more info about .ZIP format, see
+#ifndef _unz64_H
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
+#define _unz64_H
      http://www.info-zip.org/pub/infozip/doc/
   PkWare has also a specification at :
      ftp://ftp.pkware.com/probdesc.zip
 */
 #ifndef _unz_H
 #define _unz_H
 #ifdef __cplusplus
 extern "C" {
@@ -51,10 +51,16 @@ extern "C" {
 #include "zlib.h"
 #endif
-#ifndef _ZLIBIOAPI_H
+#ifndef  _ZLIBIOAPI_H
 #include "ioapi.h"
 #endif
 #ifdef HAVE_BZIP2
 #include "bzlib.h"
 #endif
 #define Z_BZIP2ED 12
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
    from (void*) without cast */
@@ -87,15 +93,42 @@ typedef struct tm_unz_s
 /* unz_global_info structure contain global data about the ZIPfile
   These data comes from the end of central dir */
 typedef struct unz_global_info64_s
 {
    ZPOS64_T number_entry;         /* total number of entries in
                                     the central dir on this disk */
    uLong size_comment;         /* size of the global comment of the zipfile */
 } unz_global_info64;
 typedef struct unz_global_info_s
 {
    uLong number_entry;         /* total number of entries in
-                       the central dir on this disk */
+                                     the central dir on this disk */
    uLong size_comment;         /* size of the global comment of the zipfile */
 } unz_global_info;
 /* unz_file_info contain information about a file in the zipfile */
 typedef struct unz_file_info64_s
 {
    uLong version;              /* version made by                 2 bytes */
    uLong version_needed;       /* version needed to extract       2 bytes */
    uLong flag;                 /* general purpose bit flag        2 bytes */
    uLong compression_method;   /* compression method              2 bytes */
    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
    uLong crc;                  /* crc-32                          4 bytes */
    ZPOS64_T compressed_size;   /* compressed size                 8 bytes */
    ZPOS64_T uncompressed_size; /* uncompressed size               8 bytes */
    uLong size_filename;        /* filename length                 2 bytes */
    uLong size_file_extra;      /* extra field length              2 bytes */
    uLong size_file_comment;    /* file comment length             2 bytes */
    uLong disk_num_start;       /* disk number start               2 bytes */
    uLong internal_fa;          /* internal file attributes        2 bytes */
    uLong external_fa;          /* external file attributes        4 bytes */
    tm_unz tmu_date;
 } unz_file_info64;
 typedef struct unz_file_info_s
 {
    uLong version;              /* version made by                 2 bytes */
@@ -131,6 +164,7 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
 extern unzFile ZEXPORT unzOpen OF((const char *path));
 extern unzFile ZEXPORT unzOpen64 OF((const void *path));
 /*
  Open a Zip file. path contain the full pathname (by example,
     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
@@ -139,8 +173,14 @@ extern unzFile ZEXPORT unzOpen OF((const char *path));
       return value is NULL.
     Else, the return value is a unzFile Handle, usable with other function
       of this unzip package.
     the "64" function take a const void* pointer, because the path is just the
       value passed to the open64_file_func callback.
     Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
       is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
       does not describe the reality
 */
 extern unzFile ZEXPORT unzOpen2 OF((const char *path,
                                    zlib_filefunc_def* pzlib_filefunc_def));
 /*
@@ -148,6 +188,13 @@ extern unzFile ZEXPORT unzOpen2 OF((const char *path,
      for read/write the zip file (see ioapi.h)
 */
 extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
                                    zlib_filefunc64_def* pzlib_filefunc_def));
 /*
   Open a Zip file, like unz64Open, but provide a set of file low level API
      for read/write the zip file (see ioapi.h)
 */
 extern int ZEXPORT unzClose OF((unzFile file));
 /*
  Close a ZipFile opened with unzipOpen.
@@ -157,6 +204,9 @@ extern int ZEXPORT unzClose OF((unzFile file));
 extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
                                        unz_global_info *pglobal_info));
 extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
                                        unz_global_info64 *pglobal_info));
 /*
  Write info about the ZipFile in the *pglobal_info structure.
  No preparation of the structure is needed
@@ -219,8 +269,31 @@ extern int ZEXPORT unzGoToFilePos(
    unzFile file,
    unz_file_pos* file_pos);
 typedef struct unz64_file_pos_s
 {
    ZPOS64_T pos_in_zip_directory;   /* offset in zip file directory */
    ZPOS64_T num_of_file;            /* # of file */
 } unz64_file_pos;
 extern int ZEXPORT unzGetFilePos64(
    unzFile file,
    unz64_file_pos* file_pos);
 extern int ZEXPORT unzGoToFilePos64(
    unzFile file,
    const unz64_file_pos* file_pos);
 /* ****************************************** */
 extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
                         unz_file_info64 *pfile_info,
                         char *szFileName,
                         uLong fileNameBufferSize,
                         void *extraField,
                         uLong extraFieldBufferSize,
                         char *szComment,
                         uLong commentBufferSize));
 extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
                         unz_file_info *pfile_info,
                         char *szFileName,
@@ -242,6 +315,14 @@ extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
            (commentBufferSize is the size of the buffer)
 */
 /** Addition for GDAL : START */
 extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
 /** Addition for GDAL : END */
 /***************************************************************************/
 /* for reading the content of the current zipfile, you can open it, read data
   from it, and close it (you can close it before reading all the file)
@@ -310,6 +391,8 @@ extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
 */
 extern z_off_t ZEXPORT unztell OF((unzFile file));
 extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
 /*
  Give the current position in uncompressed data
 */
@@ -335,8 +418,20 @@ extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
    the error code
 */
 /***************************************************************************/
 /* Get the current file offset */
 extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
 extern uLong ZEXPORT unzGetOffset (unzFile file);
 /* Set the current file offset */
 extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
 extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
 #ifdef __cplusplus
 }
 #endif
-#endif /* _unz_H */
+#endif /* _unz64_H */
--- a/contrib/minizip/zconf.h
+++ b/contrib/minizip/zconf.h
@@ -0,0 +1,332 @@
 /* zconf.h -- configuration of the zlib compression library
 * Copyright (C) 1995-2005 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
 /* @(#) $Id$ */
 #ifndef ZCONF_H
 #define ZCONF_H
 /*
 * If you *really* need a unique prefix for all types and library functions,
 * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
 */
 #ifdef Z_PREFIX
 #  define deflateInit_          z_deflateInit_
 #  define deflate               z_deflate
 #  define deflateEnd            z_deflateEnd
 #  define inflateInit_          z_inflateInit_
 #  define inflate               z_inflate
 #  define inflateEnd            z_inflateEnd
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateSetDictionary  z_deflateSetDictionary
 #  define deflateCopy           z_deflateCopy
 #  define deflateReset          z_deflateReset
 #  define deflateParams         z_deflateParams
 #  define deflateBound          z_deflateBound
 #  define deflatePrime          z_deflatePrime
 #  define inflateInit2_         z_inflateInit2_
 #  define inflateSetDictionary  z_inflateSetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateCopy           z_inflateCopy
 #  define inflateReset          z_inflateReset
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
 #  define compress              z_compress
 #  define compress2             z_compress2
 #  define compressBound         z_compressBound
 #  define uncompress            z_uncompress
 #  define adler32               z_adler32
 #  define crc32                 z_crc32
 #  define get_crc_table         z_get_crc_table
 #  define zError                z_zError
 #  define alloc_func            z_alloc_func
 #  define free_func             z_free_func
 #  define in_func               z_in_func
 #  define out_func              z_out_func
 #  define Byte                  z_Byte
 #  define uInt                  z_uInt
 #  define uLong                 z_uLong
 #  define Bytef                 z_Bytef
 #  define charf                 z_charf
 #  define intf                  z_intf
 #  define uIntf                 z_uIntf
 #  define uLongf                z_uLongf
 #  define voidpf                z_voidpf
 #  define voidp                 z_voidp
 #endif
 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
 #endif
 #if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
 #  define OS2
 #endif
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif
 #if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
 #  ifndef WIN32
 #    define WIN32
 #  endif
 #endif
 #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
 #  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
 #    ifndef SYS16BIT
 #      define SYS16BIT
 #    endif
 #  endif
 #endif
 /*
 * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
 * than 64k bytes at a time (needed on systems with 16-bit int).
 */
 #ifdef SYS16BIT
 #  define MAXSEG_64K
 #endif
 #ifdef MSDOS
 #  define UNALIGNED_OK
 #endif
 #ifdef __STDC_VERSION__
 #  ifndef STDC
 #    define STDC
 #  endif
 #  if __STDC_VERSION__ >= 199901L
 #    ifndef STDC99
 #      define STDC99
 #    endif
 #  endif
 #endif
 #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
 #  define STDC
 #endif
 #if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
 #  define STDC
 #endif
 #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
 #  define STDC
 #endif
 #if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
 #  define STDC
 #endif
 #if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
 #  define STDC
 #endif
 #ifndef STDC
 #  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
 #    define const       /* note: need a more gentle solution here */
 #  endif
 #endif
 /* Some Mac compilers merge all .h files incorrectly: */
 #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
 #  define NO_DUMMY_DECL
 #endif
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
 #  ifdef MAXSEG_64K
 #    define MAX_MEM_LEVEL 8
 #  else
 #    define MAX_MEM_LEVEL 9
 #  endif
 #endif
 /* Maximum value for windowBits in deflateInit2 and inflateInit2.
 * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
 * created by gzip. (Files created by minigzip can still be extracted by
 * gzip.)
 */
 #ifndef MAX_WBITS
 #  define MAX_WBITS   15 /* 32K LZ77 window */
 #endif
 /* The memory requirements for deflate are (in bytes):
            (1 << (windowBits+2)) +  (1 << (memLevel+9))
 that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
 plus a few kilobytes for small objects. For example, if you want to reduce
 the default memory requirements from 256K to 128K, compile with
     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
 Of course this will generally degrade compression (there's no free lunch).
   The memory requirements for inflate are (in bytes) 1 << windowBits
 that is, 32K for windowBits=15 (default value) plus a few kilobytes
 for small objects.
 */
                        /* Type declarations */
 #ifndef OF /* function prototypes */
 #  ifdef STDC
 #    define OF(args)  args
 #  else
 #    define OF(args)  ()
 #  endif
 #endif
 /* The following definitions for FAR are needed only for MSDOS mixed
 * model programming (small or medium model with some far allocations).
 * This was tested only with MSC; for other MSDOS compilers you may have
 * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
 * just define FAR to be empty.
 */
 #ifdef SYS16BIT
 #  if defined(M_I86SM) || defined(M_I86MM)
     /* MSC small or medium model */
 #    define SMALL_MEDIUM
 #    ifdef _MSC_VER
 #      define FAR _far
 #    else
 #      define FAR far
 #    endif
 #  endif
 #  if (defined(__SMALL__) || defined(__MEDIUM__))
     /* Turbo C small or medium model */
 #    define SMALL_MEDIUM
 #    ifdef __BORLANDC__
 #      define FAR _far
 #    else
 #      define FAR far
 #    endif
 #  endif
 #endif
 #if defined(WINDOWS) || defined(WIN32)
   /* If building or using zlib as a DLL, define ZLIB_DLL.
    * This is not mandatory, but it offers a little performance increase.
    */
 #  ifdef ZLIB_DLL
 #    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
 #      ifdef ZLIB_INTERNAL
 #        define ZEXTERN extern __declspec(dllexport)
 #      else
 #        define ZEXTERN extern __declspec(dllimport)
 #      endif
 #    endif
 #  endif  /* ZLIB_DLL */
   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
    * define ZLIB_WINAPI.
    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
    */
 #  ifdef ZLIB_WINAPI
 #    ifdef FAR
 #      undef FAR
 #    endif
 #    include <windows.h>
     /* No need for _export, use ZLIB.DEF instead. */
     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
 #    define ZEXPORT WINAPI
 #    ifdef WIN32
 #      define ZEXPORTVA WINAPIV
 #    else
 #      define ZEXPORTVA FAR CDECL
 #    endif
 #  endif
 #endif
 #if defined (__BEOS__)
 #  ifdef ZLIB_DLL
 #    ifdef ZLIB_INTERNAL
 #      define ZEXPORT   __declspec(dllexport)
 #      define ZEXPORTVA __declspec(dllexport)
 #    else
 #      define ZEXPORT   __declspec(dllimport)
 #      define ZEXPORTVA __declspec(dllimport)
 #    endif
 #  endif
 #endif
 #ifndef ZEXTERN
 #  define ZEXTERN extern
 #endif
 #ifndef ZEXPORT
 #  define ZEXPORT
 #endif
 #ifndef ZEXPORTVA
 #  define ZEXPORTVA
 #endif
 #ifndef FAR
 #  define FAR
 #endif
 #if !defined(__MACTYPES__)
 typedef unsigned char  Byte;  /* 8 bits */
 #endif
 typedef unsigned int   uInt;  /* 16 bits or more */
 typedef unsigned long  uLong; /* 32 bits or more */
 #ifdef SMALL_MEDIUM
   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
 #  define Bytef Byte FAR
 #else
   typedef Byte  FAR Bytef;
 #endif
 typedef char  FAR charf;
 typedef int   FAR intf;
 typedef uInt  FAR uIntf;
 typedef uLong FAR uLongf;
 #ifdef STDC
   typedef void const *voidpc;
   typedef void FAR   *voidpf;
   typedef void       *voidp;
 #else
   typedef Byte const *voidpc;
   typedef Byte FAR   *voidpf;
   typedef Byte       *voidp;
 #endif
 #if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
 #  include <sys/types.h> /* for off_t */
 #  include <unistd.h>    /* for SEEK_* and off_t */
 #  ifdef VMS
 #    include <unixio.h>   /* for off_t */
 #  endif
 #  define z_off_t off_t
 #endif
 #ifndef SEEK_SET
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 #endif
 #ifndef z_off_t
 #  define z_off_t long
 #endif
 #if defined(__OS400__)
 #  define NO_vsnprintf
 #endif
 #if defined(__MVS__)
 #  define NO_vsnprintf
 #  ifdef FAR
 #    undef FAR
 #  endif
 #endif
 /* MVS linker does not support external names larger than 8 bytes */
 #if defined(__MVS__)
 #   pragma map(deflateInit_,"DEIN")
 #   pragma map(deflateInit2_,"DEIN2")
 #   pragma map(deflateEnd,"DEEND")
 #   pragma map(deflateBound,"DEBND")
 #   pragma map(inflateInit_,"ININ")
 #   pragma map(inflateInit2_,"ININ2")
 #   pragma map(inflateEnd,"INEND")
 #   pragma map(inflateSync,"INSY")
 #   pragma map(inflateSetDictionary,"INSEDI")
 #   pragma map(compressBound,"CMBND")
 #   pragma map(inflate_table,"INTABL")
 #   pragma map(inflate_fast,"INFA")
 #   pragma map(inflate_copyright,"INCOPY")
 #endif
 #endif /* ZCONF_H */
--- a/contrib/minizip/zconf.in.h
+++ b/contrib/minizip/zconf.in.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@@ -13,43 +13,50 @@
 * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
 */
 #ifdef Z_PREFIX
-#  define deflateInit_  z_deflateInit_
+#  define deflateInit_          z_deflateInit_
-#  define deflate       z_deflate
+#  define deflate               z_deflate
-#  define deflateEnd    z_deflateEnd
+#  define deflateEnd            z_deflateEnd
-#  define inflateInit_  z_inflateInit_
+#  define inflateInit_          z_inflateInit_
-#  define inflate       z_inflate
+#  define inflate               z_inflate
-#  define inflateEnd    z_inflateEnd
+#  define inflateEnd            z_inflateEnd
-#  define deflateInit2_ z_deflateInit2_
+#  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary z_deflateSetDictionary
+#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy   z_deflateCopy
+#  define deflateCopy           z_deflateCopy
-#  define deflateReset  z_deflateReset
+#  define deflateReset          z_deflateReset
-#  define deflatePrime  z_deflatePrime
+#  define deflateParams         z_deflateParams
-#  define deflateParams z_deflateParams
+#  define deflateBound          z_deflateBound
-#  define deflateBound  z_deflateBound
+#  define deflatePrime          z_deflatePrime
-#  define inflateInit2_ z_inflateInit2_
+#  define inflateInit2_         z_inflateInit2_
-#  define inflateSetDictionary z_inflateSetDictionary
+#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync   z_inflateSync
+#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint z_inflateSyncPoint
+#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy   z_inflateCopy
+#  define inflateCopy           z_inflateCopy
-#  define inflateReset  z_inflateReset
+#  define inflateReset          z_inflateReset
-#  define compress      z_compress
+#  define inflateBack           z_inflateBack
-#  define compress2     z_compress2
+#  define inflateBackEnd        z_inflateBackEnd
-#  define compressBound z_compressBound
+#  define compress              z_compress
-#  define uncompress    z_uncompress
+#  define compress2             z_compress2
-#  define adler32       z_adler32
+#  define compressBound         z_compressBound
-#  define crc32         z_crc32
+#  define uncompress            z_uncompress
-#  define get_crc_table z_get_crc_table
+#  define adler32               z_adler32
 #  define crc32                 z_crc32
 #  define get_crc_table         z_get_crc_table
 #  define zError                z_zError
-#  define Byte          z_Byte
+#  define alloc_func            z_alloc_func
-#  define uInt          z_uInt
+#  define free_func             z_free_func
-#  define uLong         z_uLong
+#  define in_func               z_in_func
-#  define Bytef         z_Bytef
+#  define out_func              z_out_func
-#  define charf         z_charf
+#  define Byte                  z_Byte
-#  define intf          z_intf
+#  define uInt                  z_uInt
-#  define uIntf         z_uIntf
+#  define uLong                 z_uLong
-#  define uLongf        z_uLongf
+#  define Bytef                 z_Bytef
-#  define voidpf        z_voidpf
+#  define charf                 z_charf
-#  define voidp         z_voidp
+#  define intf                  z_intf
 #  define uIntf                 z_uIntf
 #  define uLongf                z_uLongf
 #  define voidpf                z_voidpf
 #  define voidp                 z_voidp
 #endif
 #if defined(__MSDOS__) && !defined(MSDOS)
@@ -61,8 +68,10 @@
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  define WIN32
+#  ifndef WIN32
 #    define WIN32
 #  endif
 #endif
 #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
 #  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
@@ -281,7 +290,7 @@ typedef uLong FAR uLongf;
 #  ifdef VMS
 #    include <unixio.h>   /* for off_t */
 #  endif
-#  define z_off_t  off_t
+#  define z_off_t off_t
 #endif
 #ifndef SEEK_SET
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
@@ -289,11 +298,11 @@ typedef uLong FAR uLongf;
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 #endif
 #ifndef z_off_t
-#  define  z_off_t long
+#  define z_off_t long
 #endif
 #if defined(__OS400__)
-#define NO_vsnprintf
+#  define NO_vsnprintf
 #endif
 #if defined(__MVS__)
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
--- a/contrib/minizip/zip.h
+++ b/contrib/minizip/zip.h
@@ -1,18 +1,15 @@
-/* zip.h -- IO for compress .zip files using zlib
+/* zip.h -- IO on .zip files using zlib
-   Version 1.00, September 10th, 2003
+   Version 1.1, January 7th, 2010
   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-   Copyright (C) 1998-2003 Gilles Vollant
+	 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-   This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
+	 Modifications for Zip64 support
-     WinZip, InfoZip tools and compatible.
+	 Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
   Encryption and multi volume ZipFile (span) are not supported.
   Old compressions used by old PKZip 1.x are not supported
-  For uncompress .zip file, look at unzip.h
+	 For more info read MiniZip_info.txt
-
+	 ---------------------------------------------------------------------------
   I WAIT FEEDBACK at mail info@winimage.com
   Visit also http://www.winimage.com/zLibDll/unzip.html for evolution
   Condition of use and distribution are the same than zlib :
@@ -32,23 +29,23 @@
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
 	---------------------------------------------------------------------------
 	Changes 
 	See header of zip.h
 */
-/* for more info about .ZIP format, see
+#ifndef _zip12_H
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
+#define _zip12_H
      http://www.info-zip.org/pub/infozip/doc/
   PkWare has also a specification at :
      ftp://ftp.pkware.com/probdesc.zip
 */
 #ifndef _zip_H
 #define _zip_H
 #ifdef __cplusplus
 extern "C" {
 #endif
 //#define HAVE_BZIP2
 #ifndef _ZLIB_H
 #include "zlib.h"
 #endif
@@ -57,6 +54,12 @@ extern "C" {
 #include "ioapi.h"
 #endif
 #ifdef HAVE_BZIP2
 #include "bzlib.h"
 #endif
 #define Z_BZIP2ED 12
 #if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
    from (void*) without cast */
@@ -111,6 +114,7 @@ typedef const char* zipcharpc;
 #define APPEND_STATUS_ADDINZIP      (2)
 extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
 extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
 /*
  Create a zipfile.
     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
@@ -135,6 +139,11 @@ extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
                                   zipcharpc* globalcomment,
                                   zlib_filefunc_def* pzlib_filefunc_def));
 extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
                                   int append,
                                   zipcharpc* globalcomment,
                                   zlib_filefunc64_def* pzlib_filefunc_def));
 extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
                       const char* filename,
                       const zip_fileinfo* zipfi,
@@ -145,6 +154,19 @@ extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
                       const char* comment,
                       int method,
                       int level));
 extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
                       const char* filename,
                       const zip_fileinfo* zipfi,
                       const void* extrafield_local,
                       uInt size_extrafield_local,
                       const void* extrafield_global,
                       uInt size_extrafield_global,
                       const char* comment,
                       int method,
                       int level,
                       int zip64));
 /*
  Open a file in the ZIP for writing.
  filename : the filename in zip (if NULL, '-' without quote will be used
@@ -156,6 +178,9 @@ extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
  if comment != NULL, comment contain the comment string
  method contain the compression method (0 for store, Z_DEFLATED for deflate)
  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
  zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
                    this MUST be '1' if the uncompressed size is >= 0xffffffff.
 */
@@ -171,6 +196,19 @@ extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
                                            int level,
                                            int raw));
 extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
                                            const char* filename,
                                            const zip_fileinfo* zipfi,
                                            const void* extrafield_local,
                                            uInt size_extrafield_local,
                                            const void* extrafield_global,
                                            uInt size_extrafield_global,
                                            const char* comment,
                                            int method,
                                            int level,
                                            int raw,
                                            int zip64));
 /*
  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
 */
@@ -190,13 +228,79 @@ extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
                                            int memLevel,
                                            int strategy,
                                            const char* password,
-                                            uLong crcForCtypting));
+                                            uLong crcForCrypting));
 extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
                                            const char* filename,
                                            const zip_fileinfo* zipfi,
                                            const void* extrafield_local,
                                            uInt size_extrafield_local,
                                            const void* extrafield_global,
                                            uInt size_extrafield_global,
                                            const char* comment,
                                            int method,
                                            int level,
                                            int raw,
                                            int windowBits,
                                            int memLevel,
                                            int strategy,
                                            const char* password,
                                            uLong crcForCrypting,
                                            int zip64
                                            ));
 /*
  Same than zipOpenNewFileInZip2, except
    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
    password : crypting password (NULL for no crypting)
-    crcForCtypting : crc of file to compress (needed for crypting)
+    crcForCrypting : crc of file to compress (needed for crypting)
 */
 extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
                                            const char* filename,
                                            const zip_fileinfo* zipfi,
                                            const void* extrafield_local,
                                            uInt size_extrafield_local,
                                            const void* extrafield_global,
                                            uInt size_extrafield_global,
                                            const char* comment,
                                            int method,
                                            int level,
                                            int raw,
                                            int windowBits,
                                            int memLevel,
                                            int strategy,
                                            const char* password,
                                            uLong crcForCrypting,
                                            uLong versionMadeBy,
                                            uLong flagBase
                                            ));
 extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
                                            const char* filename,
                                            const zip_fileinfo* zipfi,
                                            const void* extrafield_local,
                                            uInt size_extrafield_local,
                                            const void* extrafield_global,
                                            uInt size_extrafield_global,
                                            const char* comment,
                                            int method,
                                            int level,
                                            int raw,
                                            int windowBits,
                                            int memLevel,
                                            int strategy,
                                            const char* password,
                                            uLong crcForCrypting,
                                            uLong versionMadeBy,
                                            uLong flagBase,
                                            int zip64
                                            ));
 /*
  Same than zipOpenNewFileInZip4, except
    versionMadeBy : value for Version made by field
    flag : value for flag field (compression level info will be added)
 */
@@ -212,12 +316,16 @@ extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
  Close the current file in the zipfile
 */
 extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
                                            uLong uncompressed_size,
                                            uLong crc32));
 extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
                                            ZPOS64_T uncompressed_size,
                                            uLong crc32));
 /*
-  Close the current file in the zipfile, for fiel opened with
+  Close the current file in the zipfile, for file opened with
    parameter raw=1 in zipOpenNewFileInZip2
  uncompressed_size and crc32 are value for the uncompressed size
 */
@@ -228,8 +336,27 @@ extern int ZEXPORT zipClose OF((zipFile file,
  Close the zipfile
 */
 extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
 /* 
  zipRemoveExtraInfoBlock -  Added by Mathias Svensson 
  Remove extra information block from a extra information data for the local file header or central directory header
  It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
  0x0001 is the signature header for the ZIP64 extra information blocks
  usage.
 			Remove ZIP64 Extra information from a central director extra field data
 	      zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
 			Remove ZIP64 Extra information from a Local File Header extra field data
        zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
 */
 #ifdef __cplusplus
 }
 #endif
-#endif /* _zip_H */
+#endif /* _zip64_H */
--- a/contrib/pascal/zlibd32.mak
+++ b/contrib/pascal/zlibd32.mak
@@ -18,10 +18,10 @@ LDFLAGS =
 # variables
 ZLIB_LIB = zlib.lib
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj
-OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzio.obj+gzlib.obj+gzread.obj
-OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
 # targets
@@ -38,8 +38,16 @@ crc32.obj: crc32.c zlib.h zconf.h crc32.h
 deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
 gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
 gzio.obj: gzio.c zutil.h zlib.h zconf.h
 gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
 gzread.obj: gzread.c zlib.h zconf.h gzguts.h
 gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
 infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
 inffast.h inffixed.h
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
 interface
 const
-  ZLIB_VERSION = '1.2.1';
+  ZLIB_VERSION = '1.2.3';
 type
  alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
@@ -166,6 +166,7 @@ function deflateEnd; external;
 function deflateInit_; external;
 function deflateInit2_; external;
 function deflateParams; external;
 function deflatePrime; external;
 function deflateReset; external;
 function deflateSetDictionary; external;
 function inflate; external;
--- a/contrib/puff/puff
+++ b/contrib/puff/puff
--- a/contrib/puff/puff.c
+++ b/contrib/puff/puff.c
@@ -1,8 +1,8 @@
 /*
 * puff.c
- * Copyright (C) 2002, 2003 Mark Adler
+ * Copyright (C) 2002-2008 Mark Adler
 * For conditions of distribution and use, see copyright notice in puff.h
- * version 1.7, 3 Mar 2003
+ * version 2.0, 25 Jul 2008
 *
 * 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
@@ -60,6 +60,13 @@
 * 1.6   7 Aug 2002     - Minor format changes
 * 1.7   3 Mar 2003     - Added test code for distribution
 *                      - Added zlib-like license
 * 1.8   9 Jan 2004     - Added some comments on no distance codes case
 * 1.9  21 Feb 2008     - Fix bug on 16-bit integer architectures [Pohland]
 *                      - Catch missing end-of-block symbol error
 * 2.0  25 Jul 2008     - Add #define to permit distance too far back
 *                      - Add option in TEST code for puff to write the data
 *                      - Add option in TEST code to skip input bytes
 *                      - Allow TEST code to read from piped stdin
 */
 #include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
@@ -193,7 +200,7 @@ struct huffman {
 * Decode a code from the stream s using huffman table h.  Return the symbol or
 * a negative value if there is an error.  If all of the lengths are zero, i.e.
 * an empty code, or if the code is incomplete and an invalid code is received,
- * then -9 is returned after reading MAXBITS bits.
+ * then -10 is returned after reading MAXBITS bits.
 *
 * Format notes:
 *
@@ -225,14 +232,14 @@ local int decode(struct state *s, struct huffman *h)
    for (len = 1; len <= MAXBITS; len++) {
        code |= bits(s, 1);             /* get next bit */
        count = h->count[len];
-        if (code < first + count)       /* if length len, return symbol */
+        if (code - count < first)       /* if length len, return symbol */
            return h->symbol[index + (code - first)];
        index += count;                 /* else update for next length */
        first += count;
        first <<= 1;
        code <<= 1;
    }
-    return -9;                          /* ran out of codes */
+    return -10;                         /* ran out of codes */
 }
 /*
@@ -262,7 +269,7 @@ local int decode(struct state *s, struct huffman *h)
            code |= bitbuf & 1;
            bitbuf >>= 1;
            count = *next++;
-            if (code < first + count) { /* if length len, return symbol */
+            if (code - count < first) { /* if length len, return symbol */
                s->bitbuf = bitbuf;
                s->bitcnt = (s->bitcnt - len) & 7;
                return h->symbol[index + (code - first)];
@@ -279,7 +286,7 @@ local int decode(struct state *s, struct huffman *h)
        bitbuf = s->in[s->incnt++];
        if (left > 8) left = 8;
    }
-    return -9;                          /* ran out of codes */
+    return -10;                         /* ran out of codes */
 }
 #endif /* SLOW */
@@ -447,21 +454,27 @@ local int codes(struct state *s,
        else if (symbol > 256) {        /* length */
            /* get and compute length */
            symbol -= 257;
-            if (symbol >= 29) return -9;        /* invalid fixed code */
+            if (symbol >= 29) return -10;       /* invalid fixed code */
            len = lens[symbol] + bits(s, lext[symbol]);
            /* get and check distance */
            symbol = decode(s, distcode);
            if (symbol < 0) return symbol;      /* invalid symbol */
            dist = dists[symbol] + bits(s, dext[symbol]);
 #ifndef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
            if (dist > s->outcnt)
-                return -10;     /* distance too far back */
+                return -11;     /* distance too far back */
 #endif
            /* copy length bytes from distance bytes back */
            if (s->out != NIL) {
                if (s->outcnt + len > s->outlen) return 1;
                while (len--) {
-                    s->out[s->outcnt] = s->out[s->outcnt - dist];
+                    s->out[s->outcnt] =
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
                        dist > s->outcnt ? 0 :
 #endif
                        s->out[s->outcnt - dist];
                    s->outcnt++;
                }
            }
@@ -577,6 +590,9 @@ local int fixed(struct state *s)
 *   block is fewer bits), but it is allowed by the format.  So incomplete
 *   literal/length codes of one symbol should also be permitted.
 *
 * - If there are only literal codes and no lengths, then there are no distance
 *   codes.  This is represented by one distance code with zero bits.
 *
 * - The list of up to 286 length/literal lengths and up to 30 distance lengths
 *   are themselves compressed using Huffman codes and run-length encoding.  In
 *   the list of code lengths, a 0 symbol means no code, a 1..15 symbol means
@@ -676,6 +692,10 @@ local int dynamic(struct state *s)
        }
    }
    /* check for end-of-block code -- there better be one! */
    if (lengths[256] == 0)
        return -9;
    /* build huffman table for literal/length codes */
    err = construct(&lencode, lengths, nlen);
    if (err < 0 || (err > 0 && nlen - lencode.count[0] != 1))
@@ -720,8 +740,9 @@ local int dynamic(struct state *s)
 *  -6:  dynamic block code description: repeat more than specified lengths
 *  -7:  dynamic block code description: invalid literal/length code lengths
 *  -8:  dynamic block code description: invalid distance code lengths
- *  -9:  invalid literal/length or distance code in fixed or dynamic block
+ *  -9:  dynamic block code description: missing end-of-block code
- * -10:  distance is too far back in fixed or dynamic block
+ * -10:  invalid literal/length or distance code in fixed or dynamic block
 * -11:  distance is too far back in fixed or dynamic block
 *
 * Format notes:
 *
@@ -779,54 +800,142 @@ int puff(unsigned char *dest,           /* pointer to destination pointer */
 }
 #ifdef TEST
-/* Example of how to use puff() */
+/* Examples of how to use puff().
   Usage: puff [-w] [-nnn] file
          ... | puff [-w] [-nnn]
   where file is the input file with deflate data, nnn is the number of bytes
   of input to skip before inflating (e.g. to skip a zlib or gzip header), and
   -w is used to write the decompressed data to stdout */
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-local unsigned char *yank(char *name, unsigned long *len)
+/* Return size times approximately the cube root of 2, keeping the result as 1,
   3, or 5 times a power of 2 -- the result is always > size, until the result
   is the maximum value of an unsigned long, where it remains.  This is useful
   to keep reallocations less than ~33% over the actual data. */
 local size_t bythirds(size_t size)
 {
-    unsigned long size;
+    int n;
-    unsigned char *buf;
+    size_t m;
    m = size;
    for (n = 0; m; n++)
        m >>= 1;
    if (n < 3)
        return size + 1;
    n -= 3;
    m = size >> n;
    m += m == 6 ? 2 : 1;
    m <<= n;
    return m > size ? m : (size_t)(-1);
 }
 /* Read the input file *name, or stdin if name is NULL, into allocated memory.
   Reallocate to larger buffers until the entire file is read in.  Return a
   pointer to the allocated data, or NULL if there was a memory allocation
   failure.  *len is the number of bytes of data read from the input file (even
   if load() returns NULL).  If the input file was empty or could not be opened
   or read, *len is zero. */
 local void *load(char *name, size_t *len)
 {
    size_t size;
    void *buf, *swap;
    FILE *in;
    struct stat s;
    *len = 0;
-    if (stat(name, &s)) return NULL;
+    buf = malloc(size = 4096);
-    if ((s.st_mode & S_IFMT) != S_IFREG) return NULL;
+    if (buf == NULL)
-    size = (unsigned long)(s.st_size);
+        return NULL;
-    if (size == 0 || (off_t)size != s.st_size) return NULL;
+    in = name == NULL ? stdin : fopen(name, "rb");
-    in = fopen(name, "r");
+    if (in != NULL) {
-    if (in == NULL) return NULL;
+        for (;;) {
-    buf = malloc(size);
+            *len += fread((char *)buf + *len, 1, size - *len, in);
-    if (buf != NULL && fread(buf, 1, size, in) != size) {
+            if (*len < size) break;
-        free(buf);
+            size = bythirds(size);
-        buf = NULL;
+            if (size == *len || (swap = realloc(buf, size)) == NULL) {
                free(buf);
                buf = NULL;
                break;
            }
            buf = swap;
        }
        fclose(in);
    }
    fclose(in);
    *len = size;
    return buf;
 }
 int main(int argc, char **argv)
 {
-    int ret;
+    int ret, skip = 0, put = 0;
-    unsigned char *source;
+    char *arg, *name = NULL;
-    unsigned long len, sourcelen, destlen;
+    unsigned char *source = NULL, *dest;
    size_t len = 0;
    unsigned long sourcelen, destlen;
-    if (argc < 2) return 2;
+    /* process arguments */
-    source = yank(argv[1], &len);
+    while (arg = *++argv, --argc)
-    if (source == NULL) return 2;
+        if (arg[0] == '-') {
-    sourcelen = len;
+            if (arg[1] == 'w' && arg[2] == 0)
-    ret = puff(NIL, &destlen, source, &sourcelen);
+                put = 1;
-    if (ret)
+            else if (arg[1] >= '0' && arg[1] <= '9')
-        printf("puff() failed with return code %d\n", ret);
+                skip = atoi(arg + 1);
-    else {
+            else {
-        printf("puff() succeeded uncompressing %lu bytes\n", destlen);
+                fprintf(stderr, "invalid option %s\n", arg);
-        if (sourcelen < len) printf("%lu compressed bytes unused\n",
+                return 3;
-                                    len - sourcelen);
+            }
        }
        else if (name != NULL) {
            fprintf(stderr, "only one file name allowed\n");
            return 3;
        }
        else
            name = arg;
    source = load(name, &len);
    if (source == NULL) {
        fprintf(stderr, "memory allocation failure\n");
        return 4;
    }
    if (len == 0) {
        fprintf(stderr, "could not read %s, or it was empty\n",
                name == NULL ? "<stdin>" : name);
        free(source);
        return 3;
    }
    if (skip >= len) {
        fprintf(stderr, "skip request of %d leaves no input\n", skip);
        free(source);
        return 3;
    }
    /* test inflate data with offset skip */
    len -= skip;
    sourcelen = (unsigned long)len;
    ret = puff(NIL, &destlen, source + skip, &sourcelen);
    if (ret)
        fprintf(stderr, "puff() failed with return code %d\n", ret);
    else {
        fprintf(stderr, "puff() succeeded uncompressing %lu bytes\n", destlen);
        if (sourcelen < len) fprintf(stderr, "%lu compressed bytes unused\n",
                                     len - sourcelen);
    }
    /* if requested, inflate again and write decompressd data to stdout */
    if (put) {
        dest = malloc(destlen);
        if (dest == NULL) {
            fprintf(stderr, "memory allocation failure\n");
            free(source);
            return 4;
        }
        puff(dest, &destlen, source + skip, &sourcelen);
        fwrite(dest, 1, destlen, stdout);
        free(dest);
    }
    /* clean up */
    free(source);
    return ret;
 }
--- a/contrib/puff/puff.h
+++ b/contrib/puff/puff.h
@@ -1,6 +1,6 @@
 /* puff.h
-  Copyright (C) 2002, 2003 Mark Adler, all rights reserved
+  Copyright (C) 2002-2008 Mark Adler, all rights reserved
-  version 1.7, 3 Mar 2002
+  version 1.9, 10 Jan 2008
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the author be held liable for any damages
--- a/contrib/testzlib/testzlib.c
+++ b/contrib/testzlib/testzlib.c
@@ -1,149 +1,275 @@
-
+#include <stdio.h>
-#include <stdio.h>
+#include <stdlib.h>
-#include <stdlib.h>
+#include <windows.h>
-#include <windows.h>
+
-#include "zlib.h"
+#include "zlib.h"
-
+
-int ReadFileMemory(const char* filename,long* plFileSize,void** pFilePtr)
+
-{
+void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B)
-    FILE* stream;
+{
-    void* ptr;
+    R->HighPart = A.HighPart - B.HighPart;
-    int retVal=1;
+    if (A.LowPart >= B.LowPart)
-    stream=fopen(filename, "rb");
+        R->LowPart = A.LowPart - B.LowPart;
-    if (stream==NULL)
+    else
-        return 0;
+    {
-
+        R->LowPart = A.LowPart - B.LowPart;
-    fseek(stream,0,SEEK_END);
+        R->HighPart --;
-
+    }
-    *plFileSize=ftell(stream);
+}
-    fseek(stream,0,SEEK_SET);
+
-    ptr=malloc((*plFileSize)+1);
+#ifdef _M_X64
-    if (ptr==NULL)
+// see http://msdn2.microsoft.com/library/twchhe95(en-us,vs.80).aspx for __rdtsc
-        retVal=0;
+unsigned __int64 __rdtsc(void);
-    else
+void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
-    {
+{
-        if (fread(ptr, 1, *plFileSize,stream) != (*plFileSize))
+ //   printf("rdtsc = %I64x\n",__rdtsc());
-            retVal=0;
+   pbeginTime64->QuadPart=__rdtsc();
-    }
+}
-    fclose(stream);
+
-    *pFilePtr=ptr;
+LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
-    return retVal;
+{
-}
+    LARGE_INTEGER LIres;
-
+    unsigned _int64 res=__rdtsc()-((unsigned _int64)(beginTime64.QuadPart));
-int main(int argc, char *argv[])
+    LIres.QuadPart=res;
-{
+   // printf("rdtsc = %I64x\n",__rdtsc());
-    int BlockSizeCompress=0x8000;
+    return LIres;
-    int BlockSizeUncompress=0x8000;
+}
-    int cprLevel=Z_DEFAULT_COMPRESSION ;
+#else
-    long lFileSize;
+#ifdef _M_IX86
-    unsigned char* FilePtr;
+void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)
-    long lBufferSizeCpr;
+{
-    long lBufferSizeUncpr;
+    DWORD dwEdx,dwEax;
-    long lCompressedSize=0;
+    _asm
-    unsigned char* CprPtr;
+    {
-    unsigned char* UncprPtr;
+        rdtsc
-    long lSizeCpr,lSizeUncpr;
+        mov dwEax,eax
-    DWORD dwGetTick;
+        mov dwEdx,edx
-
+    }
-    if (argc<=1)
+    pbeginTime64->LowPart=dwEax;
-    {
+    pbeginTime64->HighPart=dwEdx;
-        printf("run TestZlib <File> [BlockSizeCompress] [BlockSizeUncompress] [compres. level]\n");
+}
-        return 0;
+
-    }
+void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
-
+{
-    if (ReadFileMemory(argv[1],&lFileSize,&FilePtr)==0)
+    myGetRDTSC32(pbeginTime64);
-    {
+}
-        printf("error reading %s\n",argv[1]);
+
-        return 1;
+LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
-    }
+{
-    else printf("file %s read, %u bytes\n",argv[1],lFileSize);
+    LARGE_INTEGER LIres,endTime64;
-
+    myGetRDTSC32(&endTime64);
-    if (argc>=3)
+
-        BlockSizeCompress=atol(argv[2]);
+    LIres.LowPart=LIres.HighPart=0;
-
+    MyDoMinus64(&LIres,endTime64,beginTime64);
-    if (argc>=4)
+    return LIres;
-        BlockSizeUncompress=atol(argv[3]);
+}
-
+#else
-    if (argc>=5)
+void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)
-        cprLevel=(int)atol(argv[4]);
+{
-
+}
-    lBufferSizeCpr = lFileSize + (lFileSize/0x10) + 0x200;
+
-    lBufferSizeUncpr = lBufferSizeCpr;
+void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
-
+{
-    CprPtr=(unsigned char*)malloc(lBufferSizeCpr + BlockSizeCompress);
+}
-    UncprPtr=(unsigned char*)malloc(lBufferSizeUncpr + BlockSizeUncompress);
+
-
+LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
-    dwGetTick=GetTickCount();
+{
-    {
+    LARGE_INTEGER lr;
-        z_stream zcpr;
+    lr.QuadPart=0;
-        int ret=Z_OK;
+    return lr;
-        long lOrigToDo = lFileSize;
+}
-        long lOrigDone = 0;
+#endif
-        int step=0;
+#endif
-        memset(&zcpr,0,sizeof(z_stream));
+
-        deflateInit(&zcpr,cprLevel);
+void BeginCountPerfCounter(LARGE_INTEGER * pbeginTime64,BOOL fComputeTimeQueryPerf)
-
+{
-        zcpr.next_in = FilePtr;
+    if ((!fComputeTimeQueryPerf) || (!QueryPerformanceCounter(pbeginTime64)))
-        zcpr.next_out = CprPtr;
+    {
-
+        pbeginTime64->LowPart = GetTickCount();
-
+        pbeginTime64->HighPart = 0;
-        do
+    }
-        {
+}
-            long all_read_before = zcpr.total_in;
+
-            zcpr.avail_in = min(lOrigToDo,BlockSizeCompress);
+DWORD GetMsecSincePerfCounter(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
-            zcpr.avail_out = BlockSizeCompress;
+{
-            ret=deflate(&zcpr,(zcpr.avail_in==lOrigToDo) ? Z_FINISH : Z_SYNC_FLUSH);
+    LARGE_INTEGER endTime64,ticksPerSecond,ticks;
-            lOrigDone += (zcpr.total_in-all_read_before);
+    DWORDLONG ticksShifted,tickSecShifted;
-            lOrigToDo -= (zcpr.total_in-all_read_before);
+    DWORD dwLog=16+0;
-            step++;
+    DWORD dwRet;
-        } while (ret==Z_OK);
+    if ((!fComputeTimeQueryPerf) || (!QueryPerformanceCounter(&endTime64)))
-
+        dwRet = (GetTickCount() - beginTime64.LowPart)*1;
-        lSizeCpr=zcpr.total_out;
+    else
-        deflateEnd(&zcpr);
+    {
-        dwGetTick=GetTickCount()-dwGetTick;
+        MyDoMinus64(&ticks,endTime64,beginTime64);
-        printf("total compress size = %u, in %u step\n",lSizeCpr,step);
+        QueryPerformanceFrequency(&ticksPerSecond);
-        printf("time = %u msec = %f sec\n\n",dwGetTick,dwGetTick/(double)1000.);
+
-    }
+    
-
+        {
-    dwGetTick=GetTickCount();
+            ticksShifted = Int64ShrlMod32(*(DWORDLONG*)&ticks,dwLog);
-    {
+            tickSecShifted = Int64ShrlMod32(*(DWORDLONG*)&ticksPerSecond,dwLog);
-        z_stream zcpr;
+        
-        int ret=Z_OK;
+        } 
-        long lOrigToDo = lSizeCpr;
+
-        long lOrigDone = 0;
+        dwRet = (DWORD)((((DWORD)ticksShifted)*1000)/(DWORD)(tickSecShifted));
-        int step=0;
+        dwRet *=1;
-        memset(&zcpr,0,sizeof(z_stream));
+    }
-        inflateInit(&zcpr);
+    return dwRet;
-
+}
-        zcpr.next_in = CprPtr;
+
-        zcpr.next_out = UncprPtr;
+int ReadFileMemory(const char* filename,long* plFileSize,void** pFilePtr)
-
+{
-
+    FILE* stream;
-        do
+    void* ptr;
-        {
+    int retVal=1;
-            long all_read_before = zcpr.total_in;
+    stream=fopen(filename, "rb");
-            zcpr.avail_in = min(lOrigToDo,BlockSizeUncompress);
+    if (stream==NULL)
-            zcpr.avail_out = BlockSizeUncompress;
+        return 0;
-            ret=inflate(&zcpr,Z_SYNC_FLUSH);
+
-            lOrigDone += (zcpr.total_in-all_read_before);
+    fseek(stream,0,SEEK_END);
-            lOrigToDo -= (zcpr.total_in-all_read_before);
+
-            step++;
+    *plFileSize=ftell(stream);
-        } while (ret==Z_OK);
+    fseek(stream,0,SEEK_SET);
-
+    ptr=malloc((*plFileSize)+1);
-        lSizeUncpr=zcpr.total_out;
+    if (ptr==NULL)
-        inflateEnd(&zcpr);
+        retVal=0;
-        dwGetTick=GetTickCount()-dwGetTick;
+    else
-        printf("total uncompress size = %u, in %u step\n",lSizeUncpr,step);
+    {
-        printf("time = %u msec = %f sec\n\n",dwGetTick,dwGetTick/(double)1000.);
+        if (fread(ptr, 1, *plFileSize,stream) != (*plFileSize))
-    }
+            retVal=0;
-
+    }
-    if (lSizeUncpr==lFileSize)
+    fclose(stream);
-    {
+    *pFilePtr=ptr;
-        if (memcmp(FilePtr,UncprPtr,lFileSize)==0)
+    return retVal;
-            printf("compare ok\n");
+}
-
+
-    }
+int main(int argc, char *argv[])
-
+{
-    return 0;
+    int BlockSizeCompress=0x8000;
-
+    int BlockSizeUncompress=0x8000;
-}
+    int cprLevel=Z_DEFAULT_COMPRESSION ;
    long lFileSize;
    unsigned char* FilePtr;
    long lBufferSizeCpr;
    long lBufferSizeUncpr;
    long lCompressedSize=0;
    unsigned char* CprPtr;
    unsigned char* UncprPtr;
    long lSizeCpr,lSizeUncpr;
    DWORD dwGetTick,dwMsecQP;
    LARGE_INTEGER li_qp,li_rdtsc,dwResRdtsc;
    if (argc<=1)
    {
        printf("run TestZlib <File> [BlockSizeCompress] [BlockSizeUncompress] [compres. level]\n");
        return 0;
    }
    if (ReadFileMemory(argv[1],&lFileSize,&FilePtr)==0)
    {
        printf("error reading %s\n",argv[1]);
        return 1;
    }
    else printf("file %s read, %u bytes\n",argv[1],lFileSize);
    if (argc>=3)
        BlockSizeCompress=atol(argv[2]);
    if (argc>=4)
        BlockSizeUncompress=atol(argv[3]);
    if (argc>=5)
        cprLevel=(int)atol(argv[4]);
    lBufferSizeCpr = lFileSize + (lFileSize/0x10) + 0x200;
    lBufferSizeUncpr = lBufferSizeCpr;
    CprPtr=(unsigned char*)malloc(lBufferSizeCpr + BlockSizeCompress);
    BeginCountPerfCounter(&li_qp,TRUE);
    dwGetTick=GetTickCount();
    BeginCountRdtsc(&li_rdtsc);
    {
        z_stream zcpr;
        int ret=Z_OK;
        long lOrigToDo = lFileSize;
        long lOrigDone = 0;
        int step=0;
        memset(&zcpr,0,sizeof(z_stream));
        deflateInit(&zcpr,cprLevel);
        zcpr.next_in = FilePtr;
        zcpr.next_out = CprPtr;
        do
        {
            long all_read_before = zcpr.total_in;
            zcpr.avail_in = min(lOrigToDo,BlockSizeCompress);
            zcpr.avail_out = BlockSizeCompress;
            ret=deflate(&zcpr,(zcpr.avail_in==lOrigToDo) ? Z_FINISH : Z_SYNC_FLUSH);
            lOrigDone += (zcpr.total_in-all_read_before);
            lOrigToDo -= (zcpr.total_in-all_read_before);
            step++;
        } while (ret==Z_OK);
        lSizeCpr=zcpr.total_out;
        deflateEnd(&zcpr);
        dwGetTick=GetTickCount()-dwGetTick;
        dwMsecQP=GetMsecSincePerfCounter(li_qp,TRUE);
        dwResRdtsc=GetResRdtsc(li_rdtsc,TRUE);
        printf("total compress size = %u, in %u step\n",lSizeCpr,step);
        printf("time = %u msec = %f sec\n",dwGetTick,dwGetTick/(double)1000.);
        printf("defcpr time QP = %u msec = %f sec\n",dwMsecQP,dwMsecQP/(double)1000.);
        printf("defcpr result rdtsc = %I64x\n\n",dwResRdtsc.QuadPart);
    }
    CprPtr=(unsigned char*)realloc(CprPtr,lSizeCpr);
    UncprPtr=(unsigned char*)malloc(lBufferSizeUncpr + BlockSizeUncompress);
    BeginCountPerfCounter(&li_qp,TRUE);
    dwGetTick=GetTickCount();
    BeginCountRdtsc(&li_rdtsc);
    {
        z_stream zcpr;
        int ret=Z_OK;
        long lOrigToDo = lSizeCpr;
        long lOrigDone = 0;
        int step=0;
        memset(&zcpr,0,sizeof(z_stream));
        inflateInit(&zcpr);
        zcpr.next_in = CprPtr;
        zcpr.next_out = UncprPtr;
        do
        {
            long all_read_before = zcpr.total_in;
            zcpr.avail_in = min(lOrigToDo,BlockSizeUncompress);
            zcpr.avail_out = BlockSizeUncompress;
            ret=inflate(&zcpr,Z_SYNC_FLUSH);
            lOrigDone += (zcpr.total_in-all_read_before);
            lOrigToDo -= (zcpr.total_in-all_read_before);
            step++;
        } while (ret==Z_OK);
        lSizeUncpr=zcpr.total_out;
        inflateEnd(&zcpr);
        dwGetTick=GetTickCount()-dwGetTick;
        dwMsecQP=GetMsecSincePerfCounter(li_qp,TRUE);
        dwResRdtsc=GetResRdtsc(li_rdtsc,TRUE);
        printf("total uncompress size = %u, in %u step\n",lSizeUncpr,step);
        printf("time = %u msec = %f sec\n",dwGetTick,dwGetTick/(double)1000.);
        printf("uncpr  time QP = %u msec = %f sec\n",dwMsecQP,dwMsecQP/(double)1000.);
        printf("uncpr  result rdtsc = %I64x\n\n",dwResRdtsc.QuadPart);
    }
    if (lSizeUncpr==lFileSize)
    {
        if (memcmp(FilePtr,UncprPtr,lFileSize)==0)
            printf("compare ok\n");
    }
    return 0;
 }
--- a/contrib/testzlib/testzlib.sln
+++ b/contrib/testzlib/testzlib.sln
@@ -1,21 +0,0 @@
 Microsoft Visual Studio Solution File, Format Version 7.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Debug
 		ConfigName.1 = Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug.ActiveCfg = Debug|Win32
 		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug.Build.0 = Debug|Win32
 		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release.ActiveCfg = Release|Win32
 		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
 	GlobalSection(ExtensibilityAddIns) = postSolution
 	EndGlobalSection
 EndGlobal
--- a/contrib/testzlib/testzlib.txt
+++ b/contrib/testzlib/testzlib.txt
@@ -0,0 +1,10 @@
 To build testzLib with Visual Studio 2005:
 copy to a directory file from :
 - root of zLib tree
 - contrib/testzlib
 - contrib/masmx86
 - contrib/masmx64
 - contrib/vstudio/vc7
 and open testzlib8.sln
--- a/contrib/untgz/untgz.c
+++ b/contrib/untgz/untgz.c
@@ -1,7 +1,7 @@
 /*
 * untgz.c -- Display contents and extract files from a gzip'd TAR file
 *
- * written by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+ * written by Pedro A. Aranda Gutierrez <paag@tid.es>
 * adaptation to Unix by Jean-loup Gailly <jloup@gzip.org>
 * various fixes by Cosmin Truta <cosmint@cs.ubbcluj.ro>
 */
@@ -15,10 +15,10 @@
 #include "zlib.h"
 #ifdef unix
-# include <unistd.h>
+#  include <unistd.h>
 #else
-# include <direct.h>
+#  include <direct.h>
-# include <io.h>
+#  include <io.h>
 #endif
 #ifdef WIN32
@@ -28,8 +28,9 @@
 #  endif
 #  define mkdir(dirname,mode)   _mkdir(dirname)
 #  ifdef _MSC_VER
 #    define strdup(str)         _strdup(str)
 #    define access(path,mode)   _access(path,mode)
 #    define chmod(path,mode)    _chmod(path,mode)
 #    define strdup(str)         _strdup(str)
 #  endif
 #else
 #  include <utime.h>
@@ -48,7 +49,21 @@
 #define FIFOTYPE '6'            /* FIFO special */
 #define CONTTYPE '7'            /* reserved */
-#define BLOCKSIZE 512
+/* GNU tar extensions */
 #define GNUTYPE_DUMPDIR  'D'    /* file names from dumped directory */
 #define GNUTYPE_LONGLINK 'K'    /* long link name */
 #define GNUTYPE_LONGNAME 'L'    /* long file name */
 #define GNUTYPE_MULTIVOL 'M'    /* continuation of file from another volume */
 #define GNUTYPE_NAMES    'N'    /* file name that does not fit into main hdr */
 #define GNUTYPE_SPARSE   'S'    /* sparse file */
 #define GNUTYPE_VOLHDR   'V'    /* tape/volume header */
 /* tar header */
 #define BLOCKSIZE     512
 #define SHORTNAMESIZE 100
 struct tar_header
 {                               /* byte offset */
@@ -71,11 +86,20 @@ struct tar_header
                                /* 500 */
 };
-union tar_buffer {
+union tar_buffer
 {
  char               buffer[BLOCKSIZE];
  struct tar_header  header;
 };
 struct attr_item
 {
  struct attr_item  *next;
  char              *fname;
  int                mode;
  time_t             time;
 };
 enum { TGZ_EXTRACT, TGZ_LIST, TGZ_INVALID };
 char *TGZfname          OF((const char *));
@@ -84,6 +108,9 @@ void TGZnotfound        OF((const char *));
 int getoct              OF((char *, int));
 char *strtime           OF((time_t *));
 int setfiletime         OF((char *, time_t));
 void push_attr          OF((struct attr_item **, char *, int, time_t));
 void restore_attr       OF((struct attr_item **));
 int ExprMatch           OF((char *, char *));
 int makedir             OF((char *));
@@ -221,7 +248,42 @@ int setfiletime (char *fname,time_t ftime)
 }
-/* regular expression matching */
+/* push file attributes */
 void push_attr(struct attr_item **list,char *fname,int mode,time_t time)
 {
  struct attr_item *item;
  item = (struct attr_item *)malloc(sizeof(struct attr_item));
  if (item == NULL)
    error("Out of memory");
  item->fname = strdup(fname);
  item->mode  = mode;
  item->time  = time;
  item->next  = *list;
  *list       = item;
 }
 /* restore file attributes */
 void restore_attr(struct attr_item **list)
 {
  struct attr_item *item, *prev;
  for (item = *list; item != NULL; )
    {
      setfiletime(item->fname,item->time);
      chmod(item->fname,item->mode);
      prev = item;
      item = item->next;
      free(prev);
    }
  *list = NULL;
 }
 /* match regular expression */
 #define ISSPECIAL(c) (((c) == '*') || ((c) == '/'))
@@ -332,6 +394,7 @@ int tar (gzFile in,int action,int arg,int argc,char **argv)
  char   fname[BLOCKSIZE];
  int    tarmode;
  time_t tartime;
  struct attr_item *attributes = NULL;
  if (action == TGZ_LIST)
    printf("    date      time     size                       file\n"
@@ -354,14 +417,15 @@ int tar (gzFile in,int action,int arg,int argc,char **argv)
      /*
       * If we have to get a tar header
       */
-      if (getheader == 1)
+      if (getheader >= 1)
        {
          /*
           * if we met the end of the tar
           * or the end-of-tar block,
           * we are done
           */
-          if ((len == 0) || (buffer.header.name[0] == 0)) break;
+          if (len == 0 || buffer.header.name[0] == 0)
            break;
          tarmode = getoct(buffer.header.mode,8);
          tartime = (time_t)getoct(buffer.header.mtime,12);
@@ -371,8 +435,25 @@ int tar (gzFile in,int action,int arg,int argc,char **argv)
              action = TGZ_INVALID;
            }
-          strcpy(fname,buffer.header.name);
+          if (getheader == 1)
            {
              strncpy(fname,buffer.header.name,SHORTNAMESIZE);
              if (fname[SHORTNAMESIZE-1] != 0)
                  fname[SHORTNAMESIZE] = 0;
            }
          else
            {
              /*
               * The file name is longer than SHORTNAMESIZE
               */
              if (strncmp(fname,buffer.header.name,SHORTNAMESIZE-1) != 0)
                  error("bad long name");
              getheader = 1;
            }
          /*
           * Act according to the type flag
           */
          switch (buffer.header.typeflag)
            {
            case DIRTYPE:
@@ -381,7 +462,7 @@ int tar (gzFile in,int action,int arg,int argc,char **argv)
              if (action == TGZ_EXTRACT)
                {
                  makedir(fname);
-                  setfiletime(fname,tartime);
+                  push_attr(&attributes,fname,tarmode,tartime);
                }
              break;
            case REGTYPE:
@@ -419,6 +500,24 @@ int tar (gzFile in,int action,int arg,int argc,char **argv)
                }
              getheader = 0;
              break;
            case GNUTYPE_LONGLINK:
            case GNUTYPE_LONGNAME:
              remaining = getoct(buffer.header.size,12);
              if (remaining < 0 || remaining >= BLOCKSIZE)
                {
                  action = TGZ_INVALID;
                  break;
                }
              len = gzread(in, fname, BLOCKSIZE);
              if (len < 0)
                error(gzerror(in, &err));
              if (fname[BLOCKSIZE-1] != 0 || (int)strlen(fname) > remaining)
                {
                  action = TGZ_INVALID;
                  break;
                }
              getheader = 2;
              break;
            default:
              if (action == TGZ_LIST)
                printf(" %s     <---> %s\n",strtime(&tartime),fname);
@@ -433,7 +532,8 @@ int tar (gzFile in,int action,int arg,int argc,char **argv)
            {
              if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes)
                {
-                  fprintf(stderr,"%s: Error writing %s -- skipping\n",prog,fname);
+                  fprintf(stderr,
                    "%s: Error writing %s -- skipping\n",prog,fname);
                  fclose(outfile);
                  outfile = NULL;
                  remove(fname);
@@ -450,7 +550,7 @@ int tar (gzFile in,int action,int arg,int argc,char **argv)
              fclose(outfile);
              outfile = NULL;
              if (action != TGZ_INVALID)
-                setfiletime(fname,tartime);
+                push_attr(&attributes,fname,tarmode,tartime);
            }
        }
@@ -464,6 +564,11 @@ int tar (gzFile in,int action,int arg,int argc,char **argv)
        }
    }
  /*
   * Restore file modes and time stamps
   */
  restore_attr(&attributes);
  if (gzclose(in) != Z_OK)
    error("failed gzclose");
@@ -475,7 +580,7 @@ int tar (gzFile in,int action,int arg,int argc,char **argv)
 void help(int exitval)
 {
-  printf("untgz version 0.2\n"
+  printf("untgz version 0.2.1\n"
         "  using zlib version %s\n\n",
         zlibVersion());
  printf("Usage: untgz file.tgz            extract all files\n"
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,8 +1,8 @@
-Building instructions for the DLL versions of Zlib 1.21
+Building instructions for the DLL versions of Zlib 1.2.3
-=======================================================
+========================================================
 This directory contains projects that build zlib and minizip using
-Microsoft Visual C++ 7.0/7.1.
+Microsoft Visual C++ 7.0/7.1, and Visual C++ .
 You don't need to build these projects yourself. You can download the
 binaries from:
@@ -11,18 +11,36 @@ binaries from:
 More information can be found at this site.
-Build instructions
+Build instructions for Visual Studio 7.x (32 bits)
------------------
+--------------------------------------------------
- Unzip zlib*.zip and copy the files from contrib\vstudio\vc7,
+- Uncompress current zlib, including all contrib/* files
  from contrib\vstudio\masmx86 and from contrib\minizip into the same
  directory.
 - Download the crtdll library from
    http://www.winimage.com/zLibDll/crtdll.zip
-  Unzip crtdll.zip to extract crtdll.lib.
+  Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc7.
- If you are using x86, use the Release target.
+- Open contrib\vstudio\vc7\zlibvc.sln with Microsoft Visual C++ 7.x
 - Open zlibvc.sln with Microsoft Visual C++ 7.0 or 7.1
  (Visual Studio .Net 2002 or 2003).
 Build instructions for Visual Studio 2005 (32 bits or 64 bits)
 --------------------------------------------------------------
 - Uncompress current zlib, including all contrib/* files
 - For 32 bits only: download the crtdll library from
    http://www.winimage.com/zLibDll/crtdll.zip
  Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc8.
 - Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 8.0
 Build instructions for Visual Studio 2005 64 bits, PSDK compiler
 ----------------------------------------------------------------
 at the time of writing this text file, Visual Studio 2005 (and 
  Microsoft Visual C++ 8.0) is on the beta 2 stage.
 Using you can get the free 64 bits compiler from Platform SDK, 
  which is NOT a beta, and compile using the Visual studio 2005 IDE
 see http://www.winimage.com/misc/sdk64onvs2005/ for instruction
 - Uncompress current zlib, including all contrib/* files
 - start Visual Studio 2005 from a platform SDK command prompt, using
  the /useenv switch
 - Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 8.0
 Important
 ---------
--- a/contrib/vstudio/vc7/gvmat32.obj
+++ b/contrib/vstudio/vc7/gvmat32.obj
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Adler	d004b04783	zlib 1.2.3.5	2011-09-09 23:26:49 -07:00
Mark Adler	f6194ef39a	zlib 1.2.3.4	2011-09-09 23:26:40 -07:00
Mark Adler	639be99788	zlib 1.2.3.3	2011-09-09 23:26:29 -07:00
Mark Adler	d6231142d2	zlib 1.2.3.2	2011-09-09 23:25:38 -07:00
Mark Adler	b1c19ca6d8	zlib 1.2.3.1	2011-09-09 23:25:27 -07:00
Mark Adler	abf180a067	zlib 1.2.3	2011-09-09 23:25:17 -07:00
Mark Adler	9c3a583021	zlib 1.2.2.4	2011-09-09 23:24:52 -07:00
Mark Adler	6b8233bfe0	zlib 1.2.2.3	2011-09-09 23:24:43 -07:00
Mark Adler	0484693e17	zlib 1.2.2.2	2011-09-09 23:24:33 -07:00
Mark Adler	9811b53dd9	zlib 1.2.2.1	2011-09-09 23:24:24 -07:00
Mark Adler	79fbcdc939	zlib 1.2.2	2011-09-09 23:24:02 -07:00
Mark Adler	7a6955760b	zlib 1.2.1.2	2011-09-09 23:23:45 -07:00
Mark Adler	f0e76a6634	zlib 1.2.1.1	2011-09-09 23:23:38 -07:00
Mark Adler	7a33a861d1	zlib 1.2.1	2011-09-09 23:23:27 -07:00
`@@ -1,4 +1,4 @@`
	`ZLIB version 1.2.0.7 for AS400 installation instructions`	`ZLIB version 1.2.3 for AS400 installation instructions`

	`I) From an AS400 *SAVF file:`	`I) From an AS400 *SAVF file:`
		`@@ -0,0 +1,2 @@`
							`ml64.exe /Flinffasx64 /c /Zi inffasx64.asm`
							`ml64.exe /Flgvmat64 /c /Zi gvmat64.asm`
		`@@ -0,0 +1,2 @@`
							`ml /coff /Zi /c /Flgvmat32.lst gvmat32.asm`
							`ml /coff /Zi /c /Flinffas32.lst inffas32.asm`