zlib 1.2.3.9v1.2.3.9

62 files changed, 3695 insertions, 5665 deletions

diff --git a/contrib/contrib/minizip/ioapi.h b/contrib/contrib/minizip/ioapi.h
deleted file mode 100644
index e0e78ce..0000000
--- a/contrib/contrib/minizip/ioapi.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   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 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)
-
-*/
-
-#ifndef _ZLIBIOAPI64_H
-#define _ZLIBIOAPI64_H
-
-#include "zlib.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>
-
-
-#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)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
-
-#define ZLIB_FILEFUNC_MODE_READ      (1)
-#define ZLIB_FILEFUNC_MODE_WRITE     (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
-
-#define ZLIB_FILEFUNC_MODE_EXISTING (4)
-#define ZLIB_FILEFUNC_MODE_CREATE   (8)
-
-
-#ifndef ZCALLBACK
- #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-   #define ZCALLBACK CALLBACK
- #else
-   #define ZCALLBACK
- #endif
-#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 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;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell_file_func      ztell_file;
-    seek_file_func      zseek_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    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));
-
-/* now internal definition, only for zip.c and unzip.h */
-typedef struct zlib_filefunc64_32_def_s
-{
-    zlib_filefunc64_def zfile_func64;
-    open_file_func      zopen32_file;
-    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
diff --git a/contrib/contrib/minizip/iowin32.c b/contrib/contrib/minizip/iowin32.c
deleted file mode 100644
index 2b69466..0000000
--- a/contrib/contrib/minizip/iowin32.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/* iowin32.c -- IO base function header for compress/uncompress .zip
-     Version 1.1, January 7th, 2010
-     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 for Zip64 support 
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-     For more info read MiniZip_info.txt
-
-*/
-
-#include <stdlib.h>
-
-#include "zlib.h"
-#include "ioapi.h"
-#include "iowin32.h"
-
-#ifndef INVALID_HANDLE_VALUE
-#define INVALID_HANDLE_VALUE (0xFFFFFFFF)
-#endif
-
-#ifndef INVALID_SET_FILE_POINTER
-#define INVALID_SET_FILE_POINTER ((DWORD)-1)
-#endif
-
-voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
-uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-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));
-int     ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream));
-int     ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream));
-
-typedef struct
-{
-    HANDLE hf;
-    int error;
-} WIN32FILE_IOWIN;
-
-
-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)
-    {
-        *lpdwDesiredAccess = GENERIC_READ;
-        *lpdwCreationDisposition = OPEN_EXISTING;
-        *lpdwShareMode = FILE_SHARE_READ;
-    }
-    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-    {
-        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        *lpdwCreationDisposition = OPEN_EXISTING;
-    }
-    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-    {
-        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        *lpdwCreationDisposition = CREATE_ALWAYS;
-    }
-}
-
-static voidpf win32_build_iowin(HANDLE hFile)
-{
-    voidpf ret=NULL;
-
-    if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE))
-    {
-        WIN32FILE_IOWIN w32fiow;
-        w32fiow.hf = hFile;
-        w32fiow.error = 0;
-        ret = malloc(sizeof(WIN32FILE_IOWIN));
-
-        if (ret==NULL)
-            CloseHandle(hFile);
-        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;
-
-    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);
-}
-
-
-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();
-            if (dwErr == ERROR_HANDLE_EOF)
-                dwErr = 0;
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-        }
-    }
-
-    return ret;
-}
-
-
-uLong ZCALLBACK win32_write_file_func (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 (!WriteFile(hFile, buf, size, &ret, NULL))
-        {
-            DWORD dwErr = GetLastError();
-            if (dwErr == ERROR_HANDLE_EOF)
-                dwErr = 0;
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-        }
-    }
-
-    return ret;
-}
-
-long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
-{
-    long ret=-1;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    if (hFile != NULL)
-    {
-        DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
-        if (dwSet == INVALID_SET_FILE_POINTER)
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = -1;
-        }
-        else
-            ret=(long)dwSet;
-    }
-    return ret;
-}
-
-ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
-{
-    ZPOS64_T ret= (ZPOS64_T)-1;
-    HANDLE hFile = NULL;
-    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;
-
-    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 != NULL)
-    {
-        DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod);
-        if (dwSet == INVALID_SET_FILE_POINTER)
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = -1;
-        }
-        else
-            ret=0;
-    }
-    return ret;
-}
-
-long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin)
-{
-    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;
-
-    if (stream!=NULL)
-    {
-        HANDLE hFile;
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-        if (hFile != NULL)
-        {
-            CloseHandle(hFile);
-            ret=0;
-        }
-        free(stream);
-    }
-    return ret;
-}
-
-int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream)
-{
-    int ret=-1;
-    if (stream!=NULL)
-    {
-        ret = ((WIN32FILE_IOWIN*)stream) -> error;
-    }
-    return ret;
-}
-
-extern void ZEXPORT fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen_file = win32_open_file_func;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell_file = win32_tell_file_func;
-    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;
-}
-
-extern void ZEXPORT 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;
-}
-
-
-extern void ZEXPORT 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;
-}
-
-
-extern void ZEXPORT 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;
-}
diff --git a/contrib/contrib/minizip/iowin32.h b/contrib/contrib/minizip/iowin32.h
deleted file mode 100644
index 3d5827f..0000000
--- a/contrib/contrib/minizip/iowin32.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* iowin32.h -- IO base function header for compress/uncompress .zip
-     Version 1.1, January 7th, 2010
-     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 for Zip64 support 
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-*/
-
-#include <windows.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void ZEXPORT fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-extern void ZEXPORT fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def));
-extern void ZEXPORT fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def));
-extern void ZEXPORT fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def));
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/contrib/minizip/miniunz.c b/contrib/contrib/minizip/miniunz.c
deleted file mode 100644
index 6b03e1f..0000000
--- a/contrib/contrib/minizip/miniunz.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
-   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 )
-*/
-
-#include "unzip.h"
-
-#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>
-#include <time.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#ifdef unix
-# include <unistd.h>
-# include <utime.h>
-#else
-# include <direct.h>
-# include <io.h>
-#endif
-
-
-#define CASESENSITIVITY (0)
-#define WRITEBUFFERSIZE (8192)
-#define MAXFILENAME (256)
-
-#ifdef _WIN32
-#define USEWIN32IOAPI
-#include "iowin32.h"
-#endif
-/*
-  mini unzip, demo of unzip package
-
-  usage :
-  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
-*/
-
-
-/* change_file_date : change the date/time of a file
-    filename : the filename of the file where date/time must be modified
-    dosdate : the new date at the MSDos format (4 bytes)
-    tmu_date : the SAME new date at the tm_unz format */
-void change_file_date(filename,dosdate,tmu_date)
-    const char *filename;
-    uLong dosdate;
-    tm_unz tmu_date;
-{
-#ifdef _WIN32
-  HANDLE hFile;
-  FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
-
-  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);
-  LocalFileTimeToFileTime(&ftLocal,&ftm);
-  SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
-  CloseHandle(hFile);
-#else
-#ifdef unix
-  struct utimbuf ut;
-  struct tm newdate;
-  newdate.tm_sec = tmu_date.tm_sec;
-  newdate.tm_min=tmu_date.tm_min;
-  newdate.tm_hour=tmu_date.tm_hour;
-  newdate.tm_mday=tmu_date.tm_mday;
-  newdate.tm_mon=tmu_date.tm_mon;
-  if (tmu_date.tm_year > 1900)
-      newdate.tm_year=tmu_date.tm_year - 1900;
-  else
-      newdate.tm_year=tmu_date.tm_year ;
-  newdate.tm_isdst=-1;
-
-  ut.actime=ut.modtime=mktime(&newdate);
-  utime(filename,&ut);
-#endif
-#endif
-}
-
-
-/* mymkdir and change_file_date are not 100 % portable
-   As I don't know well Unix, I wait feedback for the unix portion */
-
-int mymkdir(dirname)
-    const char* dirname;
-{
-    int ret=0;
-#ifdef _WIN32
-    ret = _mkdir(dirname);
-#else
-#ifdef unix
-    ret = mkdir (dirname,0775);
-#endif
-#endif
-    return ret;
-}
-
-int makedir (newdir)
-    char *newdir;
-{
-  char *buffer ;
-  char *p;
-  int  len = (int)strlen(newdir);
-
-  if (len <= 0)
-    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] == '/') {
-    buffer[len-1] = '\0';
-  }
-  if (mymkdir(buffer) == 0)
-    {
-      free(buffer);
-      return 1;
-    }
-
-  p = buffer+1;
-  while (1)
-    {
-      char hold;
-
-      while(*p && *p != '\\' && *p != '/')
-        p++;
-      hold = *p;
-      *p = 0;
-      if ((mymkdir(buffer) == -1) && (errno == ENOENT))
-        {
-          printf("couldn't create directory %s\n",buffer);
-          free(buffer);
-          return 0;
-        }
-      if (hold == 0)
-        break;
-      *p++ = hold;
-    }
-  free(buffer);
-  return 1;
-}
-
-void do_banner()
-{
-    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.] [-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_info64 gi;
-    int err;
-
-    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("  ------  ------     ---- -----   ----    ----   ------     ----\n");
-    for (i=0;i<gi.number_entry;i++)
-    {
-        char filename_inzip[256];
-        unz_file_info64 file_info;
-        uLong ratio=0;
-        const char *string_method;
-        char charCrypt=' ';
-        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 = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size);
-
-        /* display a '*' if the file is crypted */
-        if ((file_info.flag & 1) != 0)
-            charCrypt='*';
-
-        if (file_info.compression_method==0)
-            string_method="Stored";
-        else
-        if (file_info.compression_method==Z_DEFLATED)
-        {
-            uInt iLevel=(uInt)((file_info.flag & 0x6)/2);
-            if (iLevel==0)
-              string_method="Defl:N";
-            else if (iLevel==1)
-              string_method="Defl:X";
-            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. ";
-
-        Display64BitsSize(file_info.uncompressed_size,7);
-        printf("  %6s%c",string_method,charCrypt);
-        Display64BitsSize(file_info.compressed_size,7);
-        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,
-                (uLong)file_info.tmu_date.tm_year % 100,
-                (uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min,
-                (uLong)file_info.crc,filename_inzip);
-        if ((i+1)<gi.number_entry)
-        {
-            err = unzGoToNextFile(uf);
-            if (err!=UNZ_OK)
-            {
-                printf("error %d with zipfile in unzGoToNextFile\n",err);
-                break;
-            }
-        }
-    }
-
-    return 0;
-}
-
-
-int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
-    unzFile uf;
-    const int* popt_extract_without_path;
-    int* popt_overwrite;
-    const char* password;
-{
-    char filename_inzip[256];
-    char* filename_withoutpath;
-    char* p;
-    int err=UNZ_OK;
-    FILE *fout=NULL;
-    void* buf;
-    uInt size_buf;
-
-    unz_file_info64 file_info;
-    uLong ratio=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);
-        return err;
-    }
-
-    size_buf = WRITEBUFFERSIZE;
-    buf = (void*)malloc(size_buf);
-    if (buf==NULL)
-    {
-        printf("Error allocating memory\n");
-        return UNZ_INTERNALERROR;
-    }
-
-    p = filename_withoutpath = filename_inzip;
-    while ((*p) != '\0')
-    {
-        if (((*p)=='/') || ((*p)=='\\'))
-            filename_withoutpath = p+1;
-        p++;
-    }
-
-    if ((*filename_withoutpath)=='\0')
-    {
-        if ((*popt_extract_without_path)==0)
-        {
-            printf("creating directory: %s\n",filename_inzip);
-            mymkdir(filename_inzip);
-        }
-    }
-    else
-    {
-        const char* write_filename;
-        int skip=0;
-
-        if ((*popt_extract_without_path)==0)
-            write_filename = filename_inzip;
-        else
-            write_filename = filename_withoutpath;
-
-        err = unzOpenCurrentFilePassword(uf,password);
-        if (err!=UNZ_OK)
-        {
-            printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
-        }
-
-        if (((*popt_overwrite)==0) && (err==UNZ_OK))
-        {
-            char rep=0;
-            FILE* ftestexist;
-            ftestexist = fopen64(write_filename,"rb");
-            if (ftestexist!=NULL)
-            {
-                fclose(ftestexist);
-                do
-                {
-                    char answer[128];
-                    int ret;
-
-                    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;
-                }
-                while ((rep!='Y') && (rep!='N') && (rep!='A'));
-            }
-
-            if (rep == 'N')
-                skip = 1;
-
-            if (rep == 'A')
-                *popt_overwrite=1;
-        }
-
-        if ((skip==0) && (err==UNZ_OK))
-        {
-            fout=fopen64(write_filename,"wb");
-
-            /* some zipfile don't contain directory alone before file */
-            if ((fout==NULL) && ((*popt_extract_without_path)==0) &&
-                                (filename_withoutpath!=(char*)filename_inzip))
-            {
-                char c=*(filename_withoutpath-1);
-                *(filename_withoutpath-1)='\0';
-                makedir(write_filename);
-                *(filename_withoutpath-1)=c;
-                fout=fopen64(write_filename,"wb");
-            }
-
-            if (fout==NULL)
-            {
-                printf("error opening %s\n",write_filename);
-            }
-        }
-
-        if (fout!=NULL)
-        {
-            printf(" extracting: %s\n",write_filename);
-
-            do
-            {
-                err = unzReadCurrentFile(uf,buf,size_buf);
-                if (err<0)
-                {
-                    printf("error %d with zipfile in unzReadCurrentFile\n",err);
-                    break;
-                }
-                if (err>0)
-                    if (fwrite(buf,err,1,fout)!=1)
-                    {
-                        printf("error in writing extracted file\n");
-                        err=UNZ_ERRNO;
-                        break;
-                    }
-            }
-            while (err>0);
-            if (fout)
-                    fclose(fout);
-
-            if (err==0)
-                change_file_date(write_filename,file_info.dosDate,
-                                 file_info.tmu_date);
-        }
-
-        if (err==UNZ_OK)
-        {
-            err = unzCloseCurrentFile (uf);
-            if (err!=UNZ_OK)
-            {
-                printf("error %d with zipfile in unzCloseCurrentFile\n",err);
-            }
-        }
-        else
-            unzCloseCurrentFile(uf); /* don't lose the error */
-    }
-
-    free(buf);
-    return err;
-}
-
-
-int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
-    unzFile uf;
-    int opt_extract_without_path;
-    int opt_overwrite;
-    const char* password;
-{
-    uLong i;
-    unz_global_info64 gi;
-    int err;
-    FILE* fout=NULL;
-
-    err = unzGetGlobalInfo64(uf,&gi);
-    if (err!=UNZ_OK)
-        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
-
-    for (i=0;i<gi.number_entry;i++)
-    {
-        if (do_extract_currentfile(uf,&opt_extract_without_path,
-                                      &opt_overwrite,
-                                      password) != UNZ_OK)
-            break;
-
-        if ((i+1)<gi.number_entry)
-        {
-            err = unzGoToNextFile(uf);
-            if (err!=UNZ_OK)
-            {
-                printf("error %d with zipfile in unzGoToNextFile\n",err);
-                break;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
-    unzFile uf;
-    const char* filename;
-    int opt_extract_without_path;
-    int opt_overwrite;
-    const char* password;
-{
-    int err = UNZ_OK;
-    if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
-    {
-        printf("file %s not found in the zipfile\n",filename);
-        return 2;
-    }
-
-    if (do_extract_currentfile(uf,&opt_extract_without_path,
-                                      &opt_overwrite,
-                                      password) == UNZ_OK)
-        return 0;
-    else
-        return 1;
-}
-
-
-int main(argc,argv)
-    int argc;
-    char *argv[];
-{
-    const char *zipfilename=NULL;
-    const char *filename_to_extract=NULL;
-    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();
-    if (argc==1)
-    {
-        do_help();
-        return 0;
-    }
-    else
-    {
-        for (i=1;i<argc;i++)
-        {
-            if ((*argv[i])=='-')
-            {
-                const char *p=argv[i]+1;
-
-                while ((*p)!='\0')
-                {
-                    char c=*(p++);;
-                    if ((c=='l') || (c=='L'))
-                        opt_do_list = 1;
-                    if ((c=='v') || (c=='V'))
-                        opt_do_list = 1;
-                    if ((c=='x') || (c=='X'))
-                        opt_do_extract = 1;
-                    if ((c=='e') || (c=='E'))
-                        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];
-                        i++;
-                    }
-                }
-            }
-            else
-            {
-                if (zipfilename == NULL)
-                    zipfilename = argv[i];
-                else if ((filename_to_extract==NULL) && (!opt_extractdir))
-                        filename_to_extract = argv[i] ;
-            }
-        }
-    }
-
-    if (zipfilename!=NULL)
-    {
-
-#        ifdef USEWIN32IOAPI
-        zlib_filefunc64_def ffunc;
-#        endif
-
-        strncpy(filename_try, zipfilename,MAXFILENAME-1);
-        /* strncpy doesnt append the trailing NULL, of the string is too long. */
-        filename_try[ MAXFILENAME ] = '\0';
-
-#        ifdef USEWIN32IOAPI
-        fill_win32_filefunc64A(&ffunc);
-        uf = unzOpen2_64(zipfilename,&ffunc);
-#        else
-        uf = unzOpen64(zipfilename);
-#        endif
-        if (uf==NULL)
-        {
-            strcat(filename_try,".zip");
-#            ifdef USEWIN32IOAPI
-            uf = unzOpen2_64(filename_try,&ffunc);
-#            else
-            uf = unzOpen64(filename_try);
-#            endif
-        }
-    }
-
-    if (uf==NULL)
-    {
-        printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename);
-        return 1;
-    }
-    printf("%s opened\n",filename_try);
-
-    if (opt_do_list==1)
-        ret_value = do_list(uf);
-    else if (opt_do_extract==1)
-    {
-#ifdef _WIN32
-        if (opt_extractdir && _chdir(dirname)) 
-#else
-        if (opt_extractdir && chdir(dirname)) 
-#endif
-        {
-          printf("Error changing into %s, aborting\n", dirname);
-          exit(-1);
-        }
-
-        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;
-}
diff --git a/contrib/contrib/minizip/minizip.c b/contrib/contrib/minizip/minizip.c
deleted file mode 100644
index 9e310e8..0000000
--- a/contrib/contrib/minizip/minizip.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
-   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 )
-*/
-
-#include "zip.h"
-
-#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>
-#include <time.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#ifdef unix
-# include <unistd.h>
-# include <utime.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-#else
-# include <direct.h>
-# include <io.h>
-#endif
-
-
-#ifdef _WIN32
-        #define USEWIN32IOAPI
-        #include "iowin32.h"
-#endif
-
-
-
-#define WRITEBUFFERSIZE (16384)
-#define MAXFILENAME (256)
-
-#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 */
-    uLong *dt;             /* dostime */
-{
-  int ret = 0;
-  {
-      FILETIME ftLocal;
-      HANDLE hFind;
-      WIN32_FIND_DATAA ff32;
-
-      hFind = FindFirstFileA(f,&ff32);
-      if (hFind != INVALID_HANDLE_VALUE)
-      {
-        FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
-        FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0);
-        FindClose(hFind);
-        ret = 1;
-      }
-  }
-  return ret;
-}
-#else
-#ifdef unix
-uLong filetime(f, tmzip, dt)
-    char *f;               /* name of file to get info on */
-    tm_zip *tmzip;         /* return value: access, modific. and creation times */
-    uLong *dt;             /* dostime */
-{
-  int ret=0;
-  struct stat s;        /* results of stat() */
-  struct tm* filedate;
-  time_t tm_t=0;
-
-  if (strcmp(f,"-")!=0)
-  {
-    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. */
-    name[ MAXFILENAME ] = '\0';
-
-    if (name[len - 1] == '/')
-      name[len - 1] = '\0';
-    /* not all systems allow stat'ing a file with / appended */
-    if (stat(name,&s)==0)
-    {
-      tm_t = s.st_mtime;
-      ret = 1;
-    }
-  }
-  filedate = localtime(&tm_t);
-
-  tmzip->tm_sec  = filedate->tm_sec;
-  tmzip->tm_min  = filedate->tm_min;
-  tmzip->tm_hour = filedate->tm_hour;
-  tmzip->tm_mday = filedate->tm_mday;
-  tmzip->tm_mon  = filedate->tm_mon ;
-  tmzip->tm_year = filedate->tm_year;
-
-  return ret;
-}
-#else
-uLong filetime(f, tmzip, dt)
-    char *f;                /* name of file to get info on */
-    tm_zip *tmzip;             /* return value: access, modific. and creation times */
-    uLong *dt;             /* dostime */
-{
-    return 0;
-}
-#endif
-#endif
-
-
-
-
-int check_exist_file(filename)
-    const char* filename;
-{
-    FILE* ftestexist;
-    int ret = 1;
-    ftestexist = fopen64(filename,"rb");
-    if (ftestexist==NULL)
-        ret = 0;
-    else
-        fclose(ftestexist);
-    return ret;
-}
-
-void do_banner()
-{
-    printf("MiniZip64 1.0, demo of zLib + MiniZip64 package, written by Gilles Vollant\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] [-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" \
-           "  -j  exclude path. store only the file name.\n\n");
-}
-
-/* calculate the CRC32 of a file,
-   because to encrypt a file, we need known the CRC32 of the file before */
-int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
-{
-   unsigned long calculate_crc=0;
-   int err=ZIP_OK;
-   FILE * fin = fopen64(filenameinzip,"rb");
-   unsigned long size_read = 0;
-   unsigned long total_read = 0;
-   if (fin==NULL)
-   {
-       err = ZIP_ERRNO;
-   }
-
-    if (err == ZIP_OK)
-        do
-        {
-            err = ZIP_OK;
-            size_read = (int)fread(buf,1,size_buf,fin);
-            if (size_read < size_buf)
-                if (feof(fin)==0)
-            {
-                printf("error in reading %s\n",filenameinzip);
-                err = ZIP_ERRNO;
-            }
-
-            if (size_read>0)
-                calculate_crc = crc32(calculate_crc,buf,size_read);
-            total_read += size_read;
-
-        } while ((err == ZIP_OK) && (size_read>0));
-
-    if (fin)
-        fclose(fin);
-
-    *result_crc=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[];
-{
-    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;
-    int err=0;
-    int size_buf=0;
-    void* buf=NULL;
-    const char* password=NULL;
-
-
-    do_banner();
-    if (argc==1)
-    {
-        do_help();
-        return 0;
-    }
-    else
-    {
-        for (i=1;i<argc;i++)
-        {
-            if ((*argv[i])=='-')
-            {
-                const char *p=argv[i]+1;
-
-                while ((*p)!='\0')
-                {
-                    char c=*(p++);;
-                    if ((c=='o') || (c=='O'))
-                        opt_overwrite = 1;
-                    if ((c=='a') || (c=='A'))
-                        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))
-                    {
-                        password=argv[i+1];
-                        i++;
-                    }
-                }
-            }
-            else
-            {
-                if (zipfilenamearg == 0)
-                {
-                    zipfilenamearg = i ;
-                }
-            }
-        }
-    }
-
-    size_buf = WRITEBUFFERSIZE;
-    buf = (void*)malloc(size_buf);
-    if (buf==NULL)
-    {
-        printf("Error allocating memory\n");
-        return ZIP_INTERNALERROR;
-    }
-
-    if (zipfilenamearg==0)
-    {
-        zipok=0;
-    }
-    else
-    {
-        int i,len;
-        int dot_found=0;
-
-        zipok = 1 ;
-        strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
-        /* strncpy doesnt append the trailing NULL, of the string is too long. */
-        filename_try[ MAXFILENAME ] = '\0';
-
-        len=(int)strlen(filename_try);
-        for (i=0;i<len;i++)
-            if (filename_try[i]=='.')
-                dot_found=1;
-
-        if (dot_found==0)
-            strcat(filename_try,".zip");
-
-        if (opt_overwrite==2)
-        {
-            /* if the file don't exist, we not append file */
-            if (check_exist_file(filename_try)==0)
-                opt_overwrite=1;
-        }
-        else
-        if (opt_overwrite==0)
-            if (check_exist_file(filename_try)!=0)
-            {
-                char rep=0;
-                do
-                {
-                    char answer[128];
-                    int ret;
-                    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;
-                }
-                while ((rep!='Y') && (rep!='N') && (rep!='A'));
-                if (rep=='N')
-                    zipok = 0;
-                if (rep=='A')
-                    opt_overwrite = 2;
-            }
-    }
-
-    if (zipok==1)
-    {
-        zipFile zf;
-        int errclose;
-#        ifdef USEWIN32IOAPI
-        zlib_filefunc64_def ffunc;
-        fill_win32_filefunc64A(&ffunc);
-        zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
-#        else
-        zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0);
-#        endif
-
-        if (zf == NULL)
-        {
-            printf("error opening %s\n",filename_try);
-            err= ZIP_ERRNO;
-        }
-        else
-            printf("creating %s\n",filename_try);
-
-        for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);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;
-                zi.dosDate = 0;
-                zi.internal_fa = 0;
-                zi.external_fa = 0;
-                filetime(filenameinzip,&zi.tmz_date,&zi.dosDate);
-
-/*
-                err = zipOpenNewFileInZip(zf,filenameinzip,&zi,
-                                 NULL,0,NULL,0,NULL / * comment * /,
-                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
-                                 opt_compress_level);
-*/
-                if ((password != NULL) && (err==ZIP_OK))
-                    err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
- 
-                zip64 = isLargeFile(filenameinzip);
-
-                                                         /* 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, zip64);
-
-                if (err != ZIP_OK)
-                    printf("error in opening %s in zipfile\n",filenameinzip);
-                else
-                {
-                    fin = fopen64(filenameinzip,"rb");
-                    if (fin==NULL)
-                    {
-                        err=ZIP_ERRNO;
-                        printf("error in opening %s for reading\n",filenameinzip);
-                    }
-                }
-
-                if (err == ZIP_OK)
-                    do
-                    {
-                        err = ZIP_OK;
-                        size_read = (int)fread(buf,1,size_buf,fin);
-                        if (size_read < size_buf)
-                            if (feof(fin)==0)
-                        {
-                            printf("error in reading %s\n",filenameinzip);
-                            err = ZIP_ERRNO;
-                        }
-
-                        if (size_read>0)
-                        {
-                            err = zipWriteInFileInZip (zf,buf,size_read);
-                            if (err<0)
-                            {
-                                printf("error in writing %s in the zipfile\n",
-                                                 filenameinzip);
-                            }
-
-                        }
-                    } while ((err == ZIP_OK) && (size_read>0));
-
-                if (fin)
-                    fclose(fin);
-
-                if (err<0)
-                    err=ZIP_ERRNO;
-                else
-                {
-                    err = zipCloseFileInZip(zf);
-                    if (err!=ZIP_OK)
-                        printf("error in closing %s in the zipfile\n",
-                                    filenameinzip);
-                }
-            }
-        }
-        errclose = zipClose(zf,NULL);
-        if (errclose != ZIP_OK)
-            printf("error in closing %s\n",filename_try);
-    }
-    else
-    {
-       do_help();
-    }
-
-    free(buf);
-    return 0;
-}
diff --git a/contrib/contrib/vstudio/vc8/zlibstat.vcproj b/contrib/contrib/vstudio/vc8/zlibstat.vcproj
deleted file mode 100644
index 2763eec..0000000
--- a/contrib/contrib/vstudio/vc8/zlibstat.vcproj
+++ /dev/null
@@ -1,881 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-        ProjectType="Visual C++"

-        Version="8,00"

-        Name="zlibstat"

-        ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"

-        >

-        <Platforms>

-                <Platform

-                        Name="Win32"

-                />

-                <Platform

-                        Name="x64"

-                />

-                <Platform

-                        Name="Itanium"

-                />

-        </Platforms>

-        <ToolFiles>

-        </ToolFiles>

-        <Configurations>

-                <Configuration

-                        Name="Debug|Win32"

-                        OutputDirectory="x86\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"

-                        ConfigurationType="4"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="1"

-                                BufferSecurityCheck="false"

-                                PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                                Detect64BitPortabilityProblems="true"

-                                DebugInformationFormat="1"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

-                                OutputFile="$(OutDir)\zlibstat.lib"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Debug|x64"

-                        OutputDirectory="x64\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"

-                        ConfigurationType="4"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                TargetEnvironment="3"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="3"

-                                BufferSecurityCheck="false"

-                                PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                                Detect64BitPortabilityProblems="true"

-                                DebugInformationFormat="1"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

-                                OutputFile="$(OutDir)\zlibstat.lib"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Debug|Itanium"

-                        OutputDirectory="ia64\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"

-                        ConfigurationType="4"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                TargetEnvironment="2"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="3"

-                                BufferSecurityCheck="false"

-                                PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                                Detect64BitPortabilityProblems="true"

-                                DebugInformationFormat="1"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"

-                                OutputFile="$(OutDir)\zlibstat.lib"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="x86\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"

-                        ConfigurationType="4"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="0"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

-                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "

-                                OutputFile="$(OutDir)\zlibstat.lib"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Release|x64"

-                        OutputDirectory="x64\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"

-                        ConfigurationType="4"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                TargetEnvironment="3"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF;WIN64"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="2"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

-                                AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

-                                OutputFile="$(OutDir)\zlibstat.lib"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Release|Itanium"

-                        OutputDirectory="ia64\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"

-                        ConfigurationType="4"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                TargetEnvironment="2"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="2"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"

-                                OutputFile="$(OutDir)\zlibstat.lib"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="ReleaseWithoutAsm|Win32"

-                        OutputDirectory="x86\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"

-                        ConfigurationType="4"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="0"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

-                                OutputFile="$(OutDir)\zlibstat.lib"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="ReleaseWithoutAsm|x64"

-                        OutputDirectory="x64\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"

-                        ConfigurationType="4"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                TargetEnvironment="3"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="2"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

-                                OutputFile="$(OutDir)\zlibstat.lib"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="ReleaseWithoutAsm|Itanium"

-                        OutputDirectory="ia64\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"

-                        ConfigurationType="4"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                TargetEnvironment="2"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="2"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"

-                                OutputFile="$(OutDir)\zlibstat.lib"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-        </Configurations>

-        <References>

-        </References>

-        <Files>

-                <Filter

-                        Name="Source Files"

-                        >

-                        <File

-                                RelativePath="..\..\..\adler32.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\compress.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\crc32.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\deflate.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\masmx86\gvmat32c.c"

-                                >

-                                <FileConfiguration

-                                        Name="Debug|x64"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Debug|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|x64"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseWithoutAsm|x64"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzclose.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzio.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzlib.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzread.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzwrite.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\infback.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\masmx64\inffas8664.c"

-                                >

-                                <FileConfiguration

-                                        Name="Debug|Win32"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Debug|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|Win32"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Win32"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inffast.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inflate.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inftrees.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\ioapi.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\trees.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\uncompr.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\unzip.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\zip.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\zlib.rc"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\zlibvc.def"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\zutil.c"

-                                >

-                        </File>

-                </Filter>

-        </Files>

-        <Globals>

-        </Globals>

-</VisualStudioProject>

diff --git a/contrib/delphi/zlibd32.mak b/contrib/delphi/zlibd32.mak
index 203a4c9..0d0699a 100644
--- a/contrib/delphi/zlibd32.mak
+++ b/contrib/delphi/zlibd32.mak
@@ -18,9 +18,9 @@ LDFLAGS =
 # variables
 ZLIB_LIB = zlib.lib
 
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.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+gzclose.obj+gzio.obj+gzlib.obj+gzread.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
 OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
 
 
@@ -40,8 +40,6 @@ 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
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index 256c5d5..c2c8af9 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate9_copyright[] =
-   " inflate9 1.2.3.8 Copyright 1995-2010 Mark Adler ";
+   " inflate9 1.2.3.9 Copyright 1995-2010 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
         130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
-        133, 133, 133, 133, 144, 78, 75};
+        133, 133, 133, 133, 144, 193, 201};
     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
         65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/contrib/minizip/MiniZip64_Changes.txt b/contrib/minizip/MiniZip64_Changes.txt
index 436d8b3..13a1bd9 100644
--- a/contrib/minizip/MiniZip64_Changes.txt
+++ b/contrib/minizip/MiniZip64_Changes.txt
@@ -1,5 +1,5 @@
 
-MiniZip64 was derrived from MiniZip at version 1.01f
+MiniZip 1.1 was derrived from MiniZip at version 1.01f
 
 Change in 1.0 (Okt 2009)
  - **TODO - Add history**
diff --git a/contrib/minizip/MiniZip64_info.txt b/contrib/minizip/MiniZip64_info.txt
index 334b0f0..57d7152 100644
--- a/contrib/minizip/MiniZip64_info.txt
+++ b/contrib/minizip/MiniZip64_info.txt
@@ -1,29 +1,24 @@
-MiniZip64 - Copyright (c) 2009-2010 - Mathias Svensson - Built from MiniZip by Gilles Vollant
+MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson
 
 Introduction
 ---------------------
-MiniZip64 is built from MiniZip by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html )
+MiniZip 1.1 is built from MiniZip 1.0 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.
+When adding ZIP64 support into minizip it would result into risk of breaking compatibility with minizip 1.0.
+All possible work was done for compatibility.
 
 
 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/ )
+When adding ZIP64 support Mathias Svensson 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
+Changed from MiniZip 1.0 to MiniZip 1.1
+---------------------------------------
 * Added ZIP64 support for unzip ( by Even Rouault )
 * Added ZIP64 support for zip ( by Mathias Svensson )
 * Reverted some changed that Even Rouault did.
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
index a5f1e0b..49958f6 100644
--- a/contrib/minizip/ioapi.c
+++ b/contrib/minizip/ioapi.c
@@ -1,17 +1,17 @@
 /* ioapi.h -- IO base function header for compress/uncompress .zip
    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 )
+         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 )
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 
-         For more info read MiniZip_info.txt
+         For more info read MiniZip_info.txt
 
 */
 
 #if (defined(_WIN32))
-        #define _CRT_SECURE_NO_WARNINGS
+        #define _CRT_SECURE_NO_WARNINGS
 #endif
 
 #include "ioapi.h"
@@ -189,7 +189,7 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T
     ret = 0;
 
     if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)
-                        ret = -1;
+                        ret = -1;
 
     return ret;
 }
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
index 1c7feb0..8309c4c 100644
--- a/contrib/minizip/ioapi.h
+++ b/contrib/minizip/ioapi.h
@@ -1,52 +1,57 @@
 /* ioapi.h -- IO base function header for compress/uncompress .zip
    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 )
+         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 )
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 
-         For more info read MiniZip_info.txt
+         For more info read MiniZip_info.txt
 
-         Changes
+         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)
+                          (but you should use iowin32.c for windows instead)
 
 */
 
 #ifndef _ZLIBIOAPI64_H
 #define _ZLIBIOAPI64_H
 
-#ifndef _WIN32
+#if (!defined(_WIN32)) && (!defined(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
+        #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"
 
+#if defined(USE_FILE32API)
+#define fopen64 fopen
+#define ftello64 ftell
+#define fseeko64 fseek
+#else
 #ifdef _MSC_VER
  #define fopen64 fopen
- #if _MSC_VER >= 1400
+ #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
   #define ftello64 _ftelli64
   #define fseeko64 _fseeki64
  #else // old MSC
@@ -54,11 +59,12 @@
   #define fseeko64 fseek
  #endif
 #endif
+#endif
 
 /*
 #ifndef ZPOS64_T
   #ifdef _WIN32
-                #define ZPOS64_T fpos_t
+                #define ZPOS64_T fpos_t
   #else
     #include <stdint.h>
     #define ZPOS64_T uint64_t
diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
index 43a5715..6a2a883 100644
--- a/contrib/minizip/iowin32.c
+++ b/contrib/minizip/iowin32.c
@@ -1,11 +1,11 @@
 /* iowin32.c -- IO base function header for compress/uncompress .zip
-     Version 1.1, January 7th, 2010
+     Version 1.1, February 14h, 2010
      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 )
+         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 )
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 
      For more info read MiniZip_info.txt
 
diff --git a/contrib/minizip/iowin32.h b/contrib/minizip/iowin32.h
index 1b6c533..0ca0969 100644
--- a/contrib/minizip/iowin32.h
+++ b/contrib/minizip/iowin32.h
@@ -1,13 +1,13 @@
 /* iowin32.h -- IO base function header for compress/uncompress .zip
-     Version 1.1, January 7th, 2010
+     Version 1.1, February 14h, 2010
      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 )
+         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 )
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 
-         For more info read MiniZip_info.txt
+         For more info read MiniZip_info.txt
 
 */
 
diff --git a/contrib/minizip/make_vms.com b/contrib/minizip/make_vms.com
index 23e1a3a..9ac13a9 100644
--- a/contrib/minizip/make_vms.com
+++ b/contrib/minizip/make_vms.com
@@ -17,9 +17,9 @@ $ cc/include=[--]/prefix=all minizip.c
 $ cc/include=[--]/prefix=all zip.c
 $ link miniunz,unzip,ioapi,[--]libz.olb/lib
 $ link minizip,zip,ioapi,[--]libz.olb/lib
-$ mcr []minizip test minizip64_info.txt
+$ mcr []minizip test minizip_info.txt
 $ mcr []miniunz -l test.zip
-$ rename minizip64_info.txt; minizip64_info.txt_old
+$ rename minizip_info.txt; minizip_info.txt_old
 $ mcr []miniunz test.zip
 $ delete test.zip;*
 $exit
diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
index cad8ae2..9ed009f 100644
--- a/contrib/minizip/miniunz.c
+++ b/contrib/minizip/miniunz.c
@@ -1,30 +1,30 @@
 /*
    miniunz.c
-   Version 1.1, January 7th, 2010
+   Version 1.1, February 14h, 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 )
+         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 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 )
+         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
+        #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>
@@ -133,11 +133,11 @@ int makedir (newdir)
     return 0;
 
   buffer = (char*)malloc(len+1);
-        if (buffer==NULL)
-        {
-                printf("Error allocating memory\n");
-                return UNZ_INTERNALERROR;
-        }
+        if (buffer==NULL)
+        {
+                printf("Error allocating memory\n");
+                return UNZ_INTERNALERROR;
+        }
   strcpy(buffer,newdir);
 
   if (buffer[len-1] == '/') {
diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c
index ca26091..7a4fa5a 100644
--- a/contrib/minizip/minizip.c
+++ b/contrib/minizip/minizip.c
@@ -1,31 +1,31 @@
 /*
    minizip.c
-   Version 1.1, January 7th, 2010
+   Version 1.1, February 14h, 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 )
+         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 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 )
+         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
+        #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>
@@ -48,8 +48,8 @@
 #include "zip.h"
 
 #ifdef _WIN32
-        #define USEWIN32IOAPI
-        #include "iowin32.h"
+        #define USEWIN32IOAPI
+        #include "iowin32.h"
 #endif
 
 
@@ -152,9 +152,8 @@ int check_exist_file(filename)
 
 void do_banner()
 {
-    printf("MiniZip64 1.0, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
+    printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\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()
@@ -220,12 +219,12 @@ int isLargeFile(const char* filename)
 
     pos = ftello64(pFile);
 
-                printf("File : %s is %lld bytes\n", filename, pos);
+                printf("File : %s is %lld bytes\n", filename, pos);
 
     if(pos >= 0xffffffff)
      largeFile = 1;
 
-                fclose(pFile);
+                fclose(pFile);
   }
 
  return largeFile;
@@ -409,7 +408,7 @@ int main(argc,argv)
 
                 zip64 = isLargeFile(filenameinzip);
 
-                                                         /* The path name saved, should not include a leading slash. */
+                                                         /* 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] == '/' )
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index 6a4d104..7617f41 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -1,16 +1,16 @@
 /* unzip.c -- IO for uncompress .zip files using zlib
-   Version 1.1, January 7th, 2010
+   Version 1.1, February 14h, 2010
    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 )
+         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 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 )
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 
-         For more info read MiniZip_info.txt
+         For more info read MiniZip_info.txt
 
 
   ------------------------------------------------------------------------------------
@@ -25,39 +25,41 @@
   If, for some reason, all these files are missing, the Info-ZIP license
   also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
 
-        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
+        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
 
   The encryption/decryption parts of this source code (as opposed to the
   non-echoing password parts) were originally written in Europe.  The
   whole source package can be freely distributed, including from the USA.
   (Prior to January 2000, re-export from the US was a violation of US law.)
 
-        This encryption code is a direct transcription of the algorithm from
+        This encryption code is a direct transcription of the algorithm from
   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
   file (appnote.txt) is distributed with the PKZIP program (even in the
   version without encryption capabilities).
 
-        ------------------------------------------------------------------------------------
+        ------------------------------------------------------------------------------------
 
-        Changes in unzip64.c
+        Changes in unzip.c
 
-        2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
+        2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
   2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
   2007-2008 - Even Rouault - Remove old C style function prototypes
   2007-2008 - Even Rouault - Add unzip support for ZIP64
 
-        Copyright (C) 2007-2008 Even Rouault
+        Copyright (C) 2007-2008 Even Rouault
 
 
-        Okt-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
-  Okt-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
+        Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
+  Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
                                 should only read the compressed/uncompressed size from the Zip64 format if
                                 the size from normal header was 0xFFFFFFFF
-  Okt-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
-        Okt-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
+  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
+        Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
                                 Patch created by Daniel Borca
 
-  Copyright (C) 2009 Mathias Svensson
+  Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+  Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
 
 */
 
@@ -67,7 +69,7 @@
 #include <string.h>
 
 #ifndef NOUNCRYPT
-        #define NOUNCRYPT
+        #define NOUNCRYPT
 #endif
 
 #include "zlib.h"
@@ -482,7 +484,7 @@ local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib
     ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
     ZPOS64_T uPosFound=0;
     uLong uL;
-                ZPOS64_T relativeOffset;
+                ZPOS64_T relativeOffset;
 
     if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
         return 0;
@@ -957,7 +959,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
     if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
         err=UNZ_ERRNO;
 
-                // relative offset of local header
+                // relative offset of local header
     if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
         err=UNZ_ERRNO;
     file_info_internal.offset_curfile = uL;
@@ -1009,7 +1011,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
 
     if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
     {
-                                uLong acc = 0;
+                                uLong acc = 0;
 
         // since lSeek now points to after the extra field we need to move back
         lSeek -= file_info.size_file_extra;
@@ -1025,7 +1027,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
         while(acc < file_info.size_file_extra)
         {
             uLong headerId;
-                                                uLong dataSize;
+                                                uLong dataSize;
 
             if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
                 err=UNZ_ERRNO;
@@ -1036,33 +1038,33 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,
             /* ZIP64 extra fields */
             if (headerId == 0x0001)
             {
-                                                        uLong uL;
-
-                                                                if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1)
-                                                                {
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-                                                                                        err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info.compressed_size == (ZPOS64_T)(unsigned long)-1)
-                                                                {
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-                                                                                  err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1)
-                                                                {
-                                                                        /* Relative Header offset */
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info.disk_num_start == (unsigned long)-1)
-                                                                {
-                                                                        /* Disk Start Number */
-                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
+                                                        uLong uL;
+
+                                                                if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+                                                                                        err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.compressed_size == (ZPOS64_T)(unsigned long)-1)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+                                                                                  err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1)
+                                                                {
+                                                                        /* Relative Header offset */
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.disk_num_start == (unsigned long)-1)
+                                                                {
+                                                                        /* Disk Start Number */
+                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
 
             }
             else
@@ -1608,7 +1610,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
     pfile_in_zip_read_info->stream.avail_in = (uInt)0;
 
     s->pfile_in_zip_read = pfile_in_zip_read_info;
-                s->encrypted = 0;
+                s->encrypted = 0;
 
 #    ifndef NOUNCRYPT
     if (password != NULL)
@@ -2051,7 +2053,7 @@ extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uS
     unz64_s* s;
     uLong uReadThis ;
     if (file==NULL)
-        return (uLong)UNZ_PARAMERROR;
+        return (int)UNZ_PARAMERROR;
     s=(unz64_s*)file;
 
     uReadThis = uSizeBuf;
diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h
index da7fb61..3183968 100644
--- a/contrib/minizip/unzip.h
+++ b/contrib/minizip/unzip.h
@@ -1,20 +1,20 @@
 /* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.1, January 7th, 2010
+   Version 1.1, February 14h, 2010
    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 )
+         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 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 )
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 
-         For more info read MiniZip_info.txt
+         For more info read MiniZip_info.txt
 
-         ---------------------------------------------------------------------------------
+         ---------------------------------------------------------------------------------
 
-        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
@@ -34,9 +34,9 @@
 
   ---------------------------------------------------------------------------------
 
-        Changes
+        Changes
 
-        See header of unzip64.c
+        See header of unzip64.c
 
 */
 
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
index 698dcec..3c34fc8 100644
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
@@ -1,22 +1,23 @@
 /* zip.c -- IO on .zip files using zlib
-   Version 1.1, January 7th, 2010
+   Version 1.1, February 14h, 2010
    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 )
+         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 )
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 
-         For more info read MiniZip_info.txt
+         For more info read MiniZip_info.txt
 
-         Changes
-   Okt-2009 - Mathias Svensson - Remove old C style function prototypes
-   Okt-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
-   Okt-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
-   Okt-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
+         Changes
+   Oct-2009 - Mathias Svensson - Remove old C style function prototypes
+   Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
+   Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
+   Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
                                  It is used when recreting zip archive with RAW when deleting items from a zip.
                                  ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
-   Okt-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
+   Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
+   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
 
 */
 
@@ -1526,22 +1527,22 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_s
     zi->ci.stream.avail_in = 0;
 
     if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-                {
-                        while (err==ZIP_OK)
-                        {
-                                uLong uTotalOutBefore;
-                                if (zi->ci.stream.avail_out == 0)
-                                {
-                                        if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-                                                err = ZIP_ERRNO;
-                                        zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-                                        zi->ci.stream.next_out = zi->ci.buffered_data;
-                                }
-                                uTotalOutBefore = zi->ci.stream.total_out;
-                                err=deflate(&zi->ci.stream,  Z_FINISH);
-                                zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-                        }
-                }
+                {
+                        while (err==ZIP_OK)
+                        {
+                                uLong uTotalOutBefore;
+                                if (zi->ci.stream.avail_out == 0)
+                                {
+                                        if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                                                err = ZIP_ERRNO;
+                                        zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+                                        zi->ci.stream.next_out = zi->ci.buffered_data;
+                                }
+                                uTotalOutBefore = zi->ci.stream.total_out;
+                                err=deflate(&zi->ci.stream,  Z_FINISH);
+                                zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+                        }
+                }
     else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
     {
 #ifdef HAVE_BZIP2
@@ -1573,10 +1574,10 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_s
         err=ZIP_OK; /* this is normal */
 
     if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
-                {
+                {
         if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
             err = ZIP_ERRNO;
-                }
+                }
 
     if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
     {
@@ -1589,9 +1590,9 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_s
     else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
     {
       int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
-                        if (err==ZIP_OK)
-                                err = tmperr;
-                        zi->ci.stream_initialised = 0;
+                        if (err==ZIP_OK)
+                                err = tmperr;
+                        zi->ci.stream_initialised = 0;
     }
 #endif
 
@@ -1851,7 +1852,7 @@ int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir,
       err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
     }
     else
-                  err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
+                  err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
   }
 
    return err;
diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h
index 5e3a46c..8aaebb6 100644
--- a/contrib/minizip/zip.h
+++ b/contrib/minizip/zip.h
@@ -1,15 +1,15 @@
 /* zip.h -- IO on .zip files using zlib
-   Version 1.1, January 7th, 2010
+   Version 1.1, February 14h, 2010
    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 )
+         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 )
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 
-         For more info read MiniZip_info.txt
+         For more info read MiniZip_info.txt
 
-         ---------------------------------------------------------------------------
+         ---------------------------------------------------------------------------
 
    Condition of use and distribution are the same than zlib :
 
@@ -29,11 +29,11 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
-        ---------------------------------------------------------------------------
+        ---------------------------------------------------------------------------
 
-        Changes
+        Changes
 
-        See header of zip.h
+        See header of zip.h
 
 */
 
@@ -348,10 +348,10 @@ extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short
   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 central director extra field data
+              zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
 
-                        Remove ZIP64 Extra information from a Local File Header extra field data
+                        Remove ZIP64 Extra information from a Local File Header extra field data
         zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
 */
 
diff --git a/contrib/pascal/zlibd32.mak b/contrib/pascal/zlibd32.mak
index 203a4c9..0d0699a 100644
--- a/contrib/pascal/zlibd32.mak
+++ b/contrib/pascal/zlibd32.mak
@@ -18,9 +18,9 @@ LDFLAGS =
 # variables
 ZLIB_LIB = zlib.lib
 
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.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+gzclose.obj+gzio.obj+gzlib.obj+gzread.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
 OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
 
 
@@ -40,8 +40,6 @@ 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
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index 416fc49..a7b7247 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -2,7 +2,7 @@ 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, and Visual C++ .

+Microsoft Visual C++ 7.0/7.1/8.0/9.0/10.0, and Visual C++ .

 

 You don't need to build these projects yourself. You can download the

 binaries from:

@@ -10,6 +10,10 @@ binaries from:
 

 More information can be found at this site.

 

+first compile assembly code by running

+bld_ml64.bat in contrib\masmx64

+bld_ml32.bat in contrib\masmx86

+

 

 Build instructions for Visual Studio 7.x (32 bits)

 --------------------------------------------------

@@ -26,7 +30,7 @@ Build instructions for Visual Studio 2005 (32 bits or 64 bits)
 - 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

+- Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 2005

 

 Build instructions for Visual Studio 2005 64 bits, PSDK compiler

 ----------------------------------------------------------------

@@ -39,7 +43,24 @@ 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

+- Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 2005

+

+

+Build instructions for Visual Studio 2008 (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\vc9.

+- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0

+

+Build instructions for Visual Studio 2010 (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\vc10.

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

 

 

 Important

diff --git a/contrib/vstudio/vc10/miniunz.vcxproj b/contrib/vstudio/vc10/miniunz.vcxproj
new file mode 100644
index 0000000..74e15c9
--- /dev/null
+++ b/contrib/vstudio/vc10/miniunz.vcxproj
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Itanium">

+      <Configuration>Debug</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Itanium">

+      <Configuration>Release</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

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

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

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

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+  </PropertyGroup>

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

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

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

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="zlibvc.vcxproj">

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

+    </ProjectReference>

+  </ItemGroup>

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

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

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

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

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{0844199a-966b-4f19-81db-1e0125e141b9}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

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

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

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

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

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Itanium">

+      <Configuration>Debug</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Itanium">

+      <Configuration>Release</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

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

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

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

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+  </PropertyGroup>

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

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

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

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="zlibvc.vcxproj">

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

+    </ProjectReference>

+  </ItemGroup>

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

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

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

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

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{f46ab6a6-548f-43cb-ae96-681abb5bd5db}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

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

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

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

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

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Itanium">

+      <Configuration>Debug</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

+      <Configuration>ReleaseWithoutAsm</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

+      <Configuration>ReleaseWithoutAsm</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

+      <Configuration>ReleaseWithoutAsm</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Itanium">

+      <Configuration>Release</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

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

+    <RootNamespace>testzlib</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

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

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+  </PropertyGroup>

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

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

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

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

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

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

+    </ClCompile>

+    <Link>

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

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

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

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

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

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

+    </ClCompile>

+    <Link>

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

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

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

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

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

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

+    </ClCompile>

+    <Link>

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

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

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

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

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

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

+    <ClCompile Include="..\..\masmx86\gvmat32c.c">

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

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

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

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

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

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

+    </ClCompile>

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

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

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

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

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

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

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

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

+    </ClCompile>

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

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

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

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

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

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

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

+  </ItemGroup>

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

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

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

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

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{c274fe07-05f2-461c-964b-f6341e4e7eb5}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\masmx86\gvmat32c.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

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

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

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

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

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Itanium">

+      <Configuration>Debug</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Itanium">

+      <Configuration>Release</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

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

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

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

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+  </PropertyGroup>

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

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <SubSystem>Console</SubSystem>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <OmitFramePointers>true</OmitFramePointers>

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

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

+      <StringPooling>true</StringPooling>

+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

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

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <Link>

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

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

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

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="zlibvc.vcxproj">

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

+    </ProjectReference>

+  </ItemGroup>

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

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

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

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

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{e573e075-00bd-4a7d-bd67-a8cc9bfc5aca}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

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

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

+</Project>
\ No newline at end of file
diff --git a/contrib/vstudio/vc8/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 72cb8b4..72cb8b4 100644
--- a/contrib/vstudio/vc8/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj b/contrib/vstudio/vc10/zlibstat.vcxproj
new file mode 100644
index 0000000..fbf6c1b
--- /dev/null
+++ b/contrib/vstudio/vc10/zlibstat.vcxproj
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Itanium">

+      <Configuration>Debug</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

+      <Configuration>ReleaseWithoutAsm</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

+      <Configuration>ReleaseWithoutAsm</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

+      <Configuration>ReleaseWithoutAsm</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Itanium">

+      <Configuration>Release</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

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

+  </PropertyGroup>

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

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+  </PropertyGroup>

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

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

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

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

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

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

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>OldStyle</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Lib>

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

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

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

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

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

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

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

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Lib>

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

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

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

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

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

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

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

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

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Lib>

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

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

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

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

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

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

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

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>OldStyle</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Lib>

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

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

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

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

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

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

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

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

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

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>OldStyle</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Lib>

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

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

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

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

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

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

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

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Lib>

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

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

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

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

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

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

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

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

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Lib>

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

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

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>X64</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

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

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

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

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

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Lib>

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

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

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

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

+    <Midl>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

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

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

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

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

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Lib>

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

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

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Lib>

+  </ItemDefinitionGroup>

+  <ItemGroup>

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

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

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

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

+    <ClCompile Include="..\..\masmx86\gvmat32c.c">

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

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

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

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

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

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

+    </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

+    </ClCompile>

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

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

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

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

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

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

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

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

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

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="zlib.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="zlibvc.def" />

+  </ItemGroup>

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

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

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

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

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{174213f6-7f66-4ae8-a3a8-a1e0a1e6ffdd}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\masmx86\gvmat32c.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzclose.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzio.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzlib.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzread.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzwrite.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="zlib.rc">

+      <Filter>Source Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="zlibvc.def">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

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

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

+</Project>
\ No newline at end of file
diff --git a/contrib/contrib/vstudio/vc7/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index de70122..0b6a9e9 100644
--- a/contrib/contrib/vstudio/vc7/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -93,3 +93,22 @@ EXPORTS
         fill_win32_filefunc64                    @111

         fill_win32_filefunc64A                   @112

         fill_win32_filefunc64W                   @113

+

+; quick hack by hkuno@microhouse.co.jp

+        unzOpen64                         @120

+        unzOpen2_64                       @121

+        unzGetGlobalInfo64                @122

+        unzGetCurrentFileInfo64           @124

+        unzGetCurrentFileZStreamPos64     @125

+        unztell64                         @126

+        unzGetFilePos64                   @127

+        unzGoToFilePos64                  @128

+

+        zipOpen64                         @130

+        zipOpen2_64                       @131

+        zipOpenNewFileInZip64             @132

+        zipOpenNewFileInZip2_64           @133

+        zipOpenNewFileInZip3_64           @134

+        zipOpenNewFileInZip4_64           @135

+        zipCloseFileInZipRaw64            @136

+; end hack

diff --git a/contrib/vstudio/vc10/zlibvc.sln b/contrib/vstudio/vc10/zlibvc.sln
new file mode 100644
index 0000000..6d2ef64
--- /dev/null
+++ b/contrib/vstudio/vc10/zlibvc.sln
@@ -0,0 +1,135 @@
+

+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

+EndProject

+Global

+        GlobalSection(SolutionConfigurationPlatforms) = preSolution

+                Debug|Itanium = Debug|Itanium

+                Debug|Win32 = Debug|Win32

+                Debug|x64 = Debug|x64

+                Release|Itanium = Release|Itanium

+                Release|Win32 = Release|Win32

+                Release|x64 = Release|x64

+                ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium

+                ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32

+                ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64

+        EndGlobalSection

+        GlobalSection(ProjectConfigurationPlatforms) = postSolution

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = ReleaseWithoutAsm|x64

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

+                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64

+                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium

+                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium

+                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium

+        EndGlobalSection

+        GlobalSection(SolutionProperties) = preSolution

+                HideSolutionNode = FALSE

+        EndGlobalSection

+EndGlobal

diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj
new file mode 100644
index 0000000..e1067fa
--- /dev/null
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -0,0 +1,669 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Itanium">

+      <Configuration>Debug</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">

+      <Configuration>ReleaseWithoutAsm</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">

+      <Configuration>ReleaseWithoutAsm</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">

+      <Configuration>ReleaseWithoutAsm</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Itanium">

+      <Configuration>Release</Configuration>

+      <Platform>Itanium</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>

+  </PropertyGroup>

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

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

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

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

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+      <GenerateMapFile>true</GenerateMapFile>

+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+      <SubSystem>Windows</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

+      <AssemblerOutput>All</AssemblerOutput>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+      <GenerateMapFile>true</GenerateMapFile>

+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+      <SubSystem>Windows</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

+      <AssemblerOutput>All</AssemblerOutput>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+      <GenerateMapFile>true</GenerateMapFile>

+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+      <SubSystem>Windows</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+      <GenerateMapFile>true</GenerateMapFile>

+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">

+    <Midl>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Link>

+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+      <GenerateMapFile>true</GenerateMapFile>

+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

+      <AssemblerOutput>All</AssemblerOutput>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Link>

+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+      <GenerateMapFile>true</GenerateMapFile>

+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

+      <AssemblerOutput>All</AssemblerOutput>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Link>

+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+      <GenerateMapFile>true</GenerateMapFile>

+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>X64</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

+      <AssemblerOutput>All</AssemblerOutput>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+      <GenerateMapFile>true</GenerateMapFile>

+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Itanium</TargetEnvironment>

+      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>

+    </Midl>

+    <ClCompile>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>

+      <AssemblerOutput>All</AssemblerOutput>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x040c</Culture>

+    </ResourceCompile>

+    <Link>

+      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

+      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>

+      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>

+      <GenerateMapFile>true</GenerateMapFile>

+      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>

+      <SubSystem>Windows</SubSystem>

+      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>

+      <TargetMachine>MachineIA64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\adler32.c" />

+    <ClCompile Include="..\..\..\compress.c" />

+    <ClCompile Include="..\..\..\crc32.c" />

+    <ClCompile Include="..\..\..\deflate.c" />

+    <ClCompile Include="..\..\masmx86\gvmat32c.c">

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzclose.c" />

+    <ClCompile Include="..\..\..\gzio.c" />

+    <ClCompile Include="..\..\..\gzlib.c" />

+    <ClCompile Include="..\..\..\gzread.c" />

+    <ClCompile Include="..\..\..\gzwrite.c" />

+    <ClCompile Include="..\..\..\infback.c" />

+    <ClCompile Include="..\..\masmx64\inffas8664.c">

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>

+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

+    </ClCompile>

+    <ClCompile Include="..\..\..\inffast.c" />

+    <ClCompile Include="..\..\..\inflate.c" />

+    <ClCompile Include="..\..\..\inftrees.c" />

+    <ClCompile Include="..\..\minizip\ioapi.c" />

+    <ClCompile Include="..\..\minizip\iowin32.c" />

+    <ClCompile Include="..\..\..\trees.c" />

+    <ClCompile Include="..\..\..\uncompr.c" />

+    <ClCompile Include="..\..\minizip\unzip.c">

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="..\..\minizip\zip.c">

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="..\..\..\zutil.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="zlib.rc" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="zlibvc.def" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\deflate.h" />

+    <ClInclude Include="..\..\..\infblock.h" />

+    <ClInclude Include="..\..\..\infcodes.h" />

+    <ClInclude Include="..\..\..\inffast.h" />

+    <ClInclude Include="..\..\..\inftrees.h" />

+    <ClInclude Include="..\..\..\infutil.h" />

+    <ClInclude Include="..\..\..\zconf.h" />

+    <ClInclude Include="..\..\..\zlib.h" />

+    <ClInclude Include="..\..\..\zutil.h" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/contrib/vstudio/vc10/zlibvc.vcxproj.filters
new file mode 100644
index 0000000..7b595c4
--- /dev/null
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj.filters
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{07934a85-8b61-443d-a0ee-b2eedb74f3cd}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{1d99675b-433d-4a21-9e50-ed4ab8b19762}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{431c0958-fa71-44d0-9084-2d19d100c0cc}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\..\adler32.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\compress.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\crc32.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\deflate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\masmx86\gvmat32c.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzclose.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzio.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzlib.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzread.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\gzwrite.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\infback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\masmx64\inffas8664.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\inffast.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\inflate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\inftrees.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\minizip\ioapi.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\minizip\iowin32.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\trees.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\uncompr.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\minizip\unzip.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\minizip\zip.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\..\zutil.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="zlib.rc">

+      <Filter>Source Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="zlibvc.def">

+      <Filter>Source Files</Filter>

+    </None>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\..\deflate.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\infblock.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\infcodes.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\inffast.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\inftrees.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\infutil.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\zconf.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\zlib.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\zutil.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj.user b/contrib/vstudio/vc10/zlibvc.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+</Project>
\ No newline at end of file
diff --git a/contrib/vstudio/vc7/miniunz.vcproj b/contrib/vstudio/vc7/miniunz.vcproj
deleted file mode 100644
index ad5117c..0000000
--- a/contrib/vstudio/vc7/miniunz.vcproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>

-<VisualStudioProject

-        ProjectType="Visual C++"

-        Version="7.00"

-        Name="miniunz"

-        ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

-        Keyword="Win32Proj">

-        <Platforms>

-                <Platform

-                        Name="Win32"/>

-        </Platforms>

-        <Configurations>

-                <Configuration

-                        Name="Debug|Win32"

-                        OutputDirectory="Debug"

-                        IntermediateDirectory="Debug"

-                        ConfigurationType="1"

-                        CharacterSet="2">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"

-                                MinimalRebuild="TRUE"

-                                BasicRuntimeChecks="3"

-                                RuntimeLibrary="5"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

-                                DebugInformationFormat="4"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                OutputFile="$(OutDir)/miniunz.exe"

-                                LinkIncremental="2"

-                                GenerateDebugInformation="TRUE"

-                                ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

-                                SubSystem="1"

-                                TargetMachine="1"/>

-                        <Tool

-                                Name="VCMIDLTool"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-                <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="Release"

-                        IntermediateDirectory="Release"

-                        ConfigurationType="1"

-                        CharacterSet="2">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="2"

-                                InlineFunctionExpansion="1"

-                                OmitFramePointers="TRUE"

-                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"

-                                StringPooling="TRUE"

-                                RuntimeLibrary="4"

-                                EnableFunctionLevelLinking="TRUE"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

-                                DebugInformationFormat="3"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                OutputFile="$(OutDir)/miniunz.exe"

-                                LinkIncremental="1"

-                                GenerateDebugInformation="TRUE"

-                                SubSystem="1"

-                                OptimizeReferences="2"

-                                EnableCOMDATFolding="2"

-                                OptimizeForWindows98="1"

-                                TargetMachine="1"/>

-                        <Tool

-                                Name="VCMIDLTool"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-        </Configurations>

-        <Files>

-                <Filter

-                        Name="Source Files"

-                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

-                        <File

-                                RelativePath="..\..\minizip\miniunz.c">

-                        </File>

-                </Filter>

-                <Filter

-                        Name="Header Files"

-                        Filter="h;hpp;hxx;hm;inl;inc">

-                </Filter>

-                <Filter

-                        Name="Resource Files"

-                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

-                </Filter>

-                <File

-                        RelativePath="ReleaseDll\zlibwapi.lib">

-                </File>

-        </Files>

-        <Globals>

-        </Globals>

-</VisualStudioProject>

diff --git a/contrib/vstudio/vc7/minizip.vcproj b/contrib/vstudio/vc7/minizip.vcproj
deleted file mode 100644
index fb5b632..0000000
--- a/contrib/vstudio/vc7/minizip.vcproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>

-<VisualStudioProject

-        ProjectType="Visual C++"

-        Version="7.00"

-        Name="minizip"

-        ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

-        Keyword="Win32Proj">

-        <Platforms>

-                <Platform

-                        Name="Win32"/>

-        </Platforms>

-        <Configurations>

-                <Configuration

-                        Name="Debug|Win32"

-                        OutputDirectory="Debug"

-                        IntermediateDirectory="Debug"

-                        ConfigurationType="1"

-                        CharacterSet="2">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"

-                                MinimalRebuild="TRUE"

-                                BasicRuntimeChecks="3"

-                                RuntimeLibrary="5"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

-                                DebugInformationFormat="4"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                OutputFile="$(OutDir)/minizip.exe"

-                                LinkIncremental="2"

-                                GenerateDebugInformation="TRUE"

-                                ProgramDatabaseFile="$(OutDir)/minizip.pdb"

-                                SubSystem="1"

-                                TargetMachine="1"/>

-                        <Tool

-                                Name="VCMIDLTool"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-                <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="Release"

-                        IntermediateDirectory="Release"

-                        ConfigurationType="1"

-                        CharacterSet="2">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="2"

-                                InlineFunctionExpansion="1"

-                                OmitFramePointers="TRUE"

-                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"

-                                StringPooling="TRUE"

-                                RuntimeLibrary="4"

-                                EnableFunctionLevelLinking="TRUE"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

-                                DebugInformationFormat="3"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                OutputFile="$(OutDir)/minizip.exe"

-                                LinkIncremental="1"

-                                GenerateDebugInformation="TRUE"

-                                SubSystem="1"

-                                OptimizeReferences="2"

-                                EnableCOMDATFolding="2"

-                                OptimizeForWindows98="1"

-                                TargetMachine="1"/>

-                        <Tool

-                                Name="VCMIDLTool"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-        </Configurations>

-        <Files>

-                <Filter

-                        Name="Source Files"

-                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

-                        <File

-                                RelativePath="..\..\minizip\minizip.c">

-                        </File>

-                </Filter>

-                <Filter

-                        Name="Header Files"

-                        Filter="h;hpp;hxx;hm;inl;inc">

-                </Filter>

-                <Filter

-                        Name="Resource Files"

-                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

-                </Filter>

-                <File

-                        RelativePath="ReleaseDll\zlibwapi.lib">

-                </File>

-        </Files>

-        <Globals>

-        </Globals>

-</VisualStudioProject>

diff --git a/contrib/vstudio/vc7/testzlib.vcproj b/contrib/vstudio/vc7/testzlib.vcproj
deleted file mode 100644
index 97bc3e8..0000000
--- a/contrib/vstudio/vc7/testzlib.vcproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>

-<VisualStudioProject

-        ProjectType="Visual C++"

-        Version="7.00"

-        Name="testZlibDll"

-        ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}"

-        Keyword="Win32Proj">

-        <Platforms>

-                <Platform

-                        Name="Win32"/>

-        </Platforms>

-        <Configurations>

-                <Configuration

-                        Name="Debug|Win32"

-                        OutputDirectory="Debug"

-                        IntermediateDirectory="Debug"

-                        ConfigurationType="1"

-                        CharacterSet="2">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"

-                                MinimalRebuild="TRUE"

-                                BasicRuntimeChecks="3"

-                                RuntimeLibrary="5"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

-                                DebugInformationFormat="4"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                OutputFile="$(OutDir)/testzlib.exe"

-                                LinkIncremental="2"

-                                GenerateDebugInformation="TRUE"

-                                ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

-                                SubSystem="1"

-                                TargetMachine="1"/>

-                        <Tool

-                                Name="VCMIDLTool"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-                <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="Release"

-                        IntermediateDirectory="Release"

-                        ConfigurationType="1"

-                        CharacterSet="2">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="2"

-                                InlineFunctionExpansion="1"

-                                OmitFramePointers="TRUE"

-                                AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"

-                                StringPooling="TRUE"

-                                RuntimeLibrary="4"

-                                EnableFunctionLevelLinking="TRUE"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

-                                DebugInformationFormat="3"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                OutputFile="$(OutDir)/testzlib.exe"

-                                LinkIncremental="1"

-                                GenerateDebugInformation="TRUE"

-                                SubSystem="1"

-                                OptimizeReferences="2"

-                                EnableCOMDATFolding="2"

-                                OptimizeForWindows98="1"

-                                TargetMachine="1"/>

-                        <Tool

-                                Name="VCMIDLTool"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-        </Configurations>

-        <Files>

-                <Filter

-                        Name="Source Files"

-                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

-                        <File

-                                RelativePath="..\..\testzlib\testzlib.c">

-                        </File>

-                </Filter>

-                <Filter

-                        Name="Header Files"

-                        Filter="h;hpp;hxx;hm;inl;inc">

-                </Filter>

-                <Filter

-                        Name="Resource Files"

-                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

-                </Filter>

-                <File

-                        RelativePath="ReleaseDll\zlibwapi.lib">

-                </File>

-        </Files>

-        <Globals>

-        </Globals>

-</VisualStudioProject>

diff --git a/contrib/vstudio/vc7/zlibstat.vcproj b/contrib/vstudio/vc7/zlibstat.vcproj
deleted file mode 100644
index 3c37959..0000000
--- a/contrib/vstudio/vc7/zlibstat.vcproj
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>

-<VisualStudioProject

-        ProjectType="Visual C++"

-        Version="7.00"

-        Name="zlibstat"

-        SccProjectName=""

-        SccLocalPath="">

-        <Platforms>

-                <Platform

-                        Name="Win32"/>

-        </Platforms>

-        <Configurations>

-                <Configuration

-                        Name="Debug|Win32"

-                        OutputDirectory=".\zlibstatDebug"

-                        IntermediateDirectory=".\zlibstatDebug"

-                        ConfigurationType="4"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI"

-                                ExceptionHandling="FALSE"

-                                RuntimeLibrary="5"

-                                PrecompiledHeaderFile=".\zlibstatDebug/zlibstat.pch"

-                                AssemblerListingLocation=".\zlibstatDebug/"

-                                ObjectFile=".\zlibstatDebug/"

-                                ProgramDataBaseFileName=".\zlibstatDebug/"

-                                WarningLevel="3"

-                                SuppressStartupBanner="TRUE"

-                                DebugInformationFormat="1"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/NODEFAULTLIB "

-                                OutputFile=".\zlibstatDebug\zlibstat.lib"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCMIDLTool"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                </Configuration>

-                <Configuration

-                        Name="ReleaseAxp|Win32"

-                        OutputDirectory=".\zlibsta0"

-                        IntermediateDirectory=".\zlibsta0"

-                        ConfigurationType="4"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI"

-                                StringPooling="TRUE"

-                                ExceptionHandling="FALSE"

-                                RuntimeLibrary="4"

-                                EnableFunctionLevelLinking="TRUE"

-                                PrecompiledHeaderFile=".\zlibsta0/zlibstat.pch"

-                                AssemblerListingLocation=".\zlibsta0/"

-                                ObjectFile=".\zlibsta0/"

-                                ProgramDataBaseFileName=".\zlibsta0/"

-                                WarningLevel="3"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="/NODEFAULTLIB "

-                                OutputFile=".\zlibsta0\zlibstat.lib"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCMIDLTool"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                </Configuration>

-                <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory=".\zlibstat"

-                        IntermediateDirectory=".\zlibstat"

-                        ConfigurationType="4"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;ASMV;ASMINF"

-                                StringPooling="TRUE"

-                                ExceptionHandling="FALSE"

-                                RuntimeLibrary="4"

-                                EnableFunctionLevelLinking="TRUE"

-                                PrecompiledHeaderFile=".\zlibstat/zlibstat.pch"

-                                AssemblerListingLocation=".\zlibstat/"

-                                ObjectFile=".\zlibstat/"

-                                ProgramDataBaseFileName=".\zlibstat/"

-                                WarningLevel="3"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj /NODEFAULTLIB "

-                                OutputFile=".\zlibstat\zlibstat.lib"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCMIDLTool"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                </Configuration>

-                <Configuration

-                        Name="ReleaseWithoutAsm|Win32"

-                        OutputDirectory="zlibstatWithoutAsm"

-                        IntermediateDirectory="zlibstatWithoutAsm"

-                        ConfigurationType="4"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI"

-                                StringPooling="TRUE"

-                                ExceptionHandling="FALSE"

-                                RuntimeLibrary="4"

-                                EnableFunctionLevelLinking="TRUE"

-                                PrecompiledHeaderFile=".\zlibstat/zlibstat.pch"

-                                AssemblerListingLocation=".\zlibstatWithoutAsm/"

-                                ObjectFile=".\zlibstatWithoutAsm/"

-                                ProgramDataBaseFileName=".\zlibstatWithoutAsm/"

-                                WarningLevel="3"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLibrarianTool"

-                                AdditionalOptions=" /NODEFAULTLIB "

-                                OutputFile=".\zlibstatWithoutAsm\zlibstat.lib"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCMIDLTool"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                Culture="1036"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                </Configuration>

-        </Configurations>

-        <Files>

-                <Filter

-                        Name="Source Files"

-                        Filter="">

-                        <File

-                                RelativePath="..\..\..\adler32.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\compress.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\crc32.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\deflate.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\masmx86\gvmat32c.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzclose.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzio.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzlib.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzread.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzwrite.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\infback.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inffast.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inflate.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inftrees.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\ioapi.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\trees.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\uncompr.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\unzip.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\zip.c">

-                        </File>

-                        <File

-                                RelativePath=".\zlib.rc">

-                        </File>

-                        <File

-                                RelativePath=".\zlibvc.def">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\zutil.c">

-                        </File>

-                </Filter>

-        </Files>

-        <Globals>

-        </Globals>

-</VisualStudioProject>

diff --git a/contrib/vstudio/vc7/zlibvc.def b/contrib/vstudio/vc7/zlibvc.def
index a40e715..0b6a9e9 100644
--- a/contrib/vstudio/vc7/zlibvc.def
+++ b/contrib/vstudio/vc7/zlibvc.def
@@ -90,3 +90,25 @@ EXPORTS
         unzGoToFilePos                           @101

 

         fill_win32_filefunc                      @110

+        fill_win32_filefunc64                    @111

+        fill_win32_filefunc64A                   @112

+        fill_win32_filefunc64W                   @113

+

+; quick hack by hkuno@microhouse.co.jp

+        unzOpen64                         @120

+        unzOpen2_64                       @121

+        unzGetGlobalInfo64                @122

+        unzGetCurrentFileInfo64           @124

+        unzGetCurrentFileZStreamPos64     @125

+        unztell64                         @126

+        unzGetFilePos64                   @127

+        unzGoToFilePos64                  @128

+

+        zipOpen64                         @130

+        zipOpen2_64                       @131

+        zipOpenNewFileInZip64             @132

+        zipOpenNewFileInZip2_64           @133

+        zipOpenNewFileInZip3_64           @134

+        zipOpenNewFileInZip4_64           @135

+        zipCloseFileInZipRaw64            @136

+; end hack

diff --git a/contrib/vstudio/vc7/zlibvc.sln b/contrib/vstudio/vc7/zlibvc.sln
deleted file mode 100644
index 927b42b..0000000
--- a/contrib/vstudio/vc7/zlibvc.sln
+++ /dev/null
@@ -1,78 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testZlibDll", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}"

-EndProject

-Global

-        GlobalSection(SolutionConfiguration) = preSolution

-                ConfigName.0 = Debug

-                ConfigName.1 = Release

-                ConfigName.2 = ReleaseAxp

-                ConfigName.3 = ReleaseWithoutAsm

-                ConfigName.4 = ReleaseWithoutCrtdll

-        EndGlobalSection

-        GlobalSection(ProjectDependencies) = postSolution

-        EndGlobalSection

-        GlobalSection(ProjectConfiguration) = postSolution

-                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug.ActiveCfg = Debug|Win32

-                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug.Build.0 = Debug|Win32

-                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release.ActiveCfg = Release|Win32

-                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release.Build.0 = Release|Win32

-                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseAxp.ActiveCfg = ReleaseAxp|Win32

-                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseAxp.Build.0 = ReleaseAxp|Win32

-                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm.ActiveCfg = ReleaseWithoutAsm|Win32

-                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm.Build.0 = ReleaseWithoutAsm|Win32

-                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutCrtdll.ActiveCfg = ReleaseAxp|Win32

-                {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutCrtdll.Build.0 = ReleaseAxp|Win32

-                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug.ActiveCfg = Debug|Win32

-                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug.Build.0 = Debug|Win32

-                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release.ActiveCfg = Release|Win32

-                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release.Build.0 = Release|Win32

-                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseAxp.ActiveCfg = ReleaseAxp|Win32

-                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseAxp.Build.0 = ReleaseAxp|Win32

-                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm.ActiveCfg = ReleaseWithoutAsm|Win32

-                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm.Build.0 = ReleaseWithoutAsm|Win32

-                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutCrtdll.ActiveCfg = ReleaseWithoutCrtdll|Win32

-                {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutCrtdll.Build.0 = ReleaseWithoutCrtdll|Win32

-                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug.ActiveCfg = Debug|Win32

-                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug.Build.0 = Debug|Win32

-                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release.ActiveCfg = Release|Win32

-                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release.Build.0 = Release|Win32

-                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAxp.ActiveCfg = Release|Win32

-                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAxp.Build.0 = Release|Win32

-                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm.ActiveCfg = Release|Win32

-                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm.Build.0 = Release|Win32

-                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32

-                {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutCrtdll.Build.0 = Release|Win32

-                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug.ActiveCfg = Debug|Win32

-                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug.Build.0 = Debug|Win32

-                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release.ActiveCfg = Release|Win32

-                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release.Build.0 = Release|Win32

-                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseAxp.ActiveCfg = Release|Win32

-                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseAxp.Build.0 = Release|Win32

-                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm.ActiveCfg = Release|Win32

-                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm.Build.0 = Release|Win32

-                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32

-                {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.Build.0 = Release|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Debug.ActiveCfg = Debug|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Debug.Build.0 = Debug|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Release.ActiveCfg = Release|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Release.Build.0 = Release|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseAxp.ActiveCfg = Release|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseAxp.Build.0 = Release|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutAsm.ActiveCfg = Release|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutAsm.Build.0 = Release|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutCrtdll.Build.0 = Release|Win32

-        EndGlobalSection

-        GlobalSection(ExtensibilityGlobals) = postSolution

-        EndGlobalSection

-        GlobalSection(ExtensibilityAddIns) = postSolution

-        EndGlobalSection

-EndGlobal

diff --git a/contrib/vstudio/vc7/zlibvc.vcproj b/contrib/vstudio/vc7/zlibvc.vcproj
deleted file mode 100644
index 2c66643..0000000
--- a/contrib/vstudio/vc7/zlibvc.vcproj
+++ /dev/null
@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>

-<VisualStudioProject

-        ProjectType="Visual C++"

-        Version="7.00"

-        Name="zlibvc"

-        SccProjectName=""

-        SccLocalPath="">

-        <Platforms>

-                <Platform

-                        Name="Win32"/>

-        </Platforms>

-        <Configurations>

-                <Configuration

-                        Name="Debug|Win32"

-                        OutputDirectory=".\DebugDll"

-                        IntermediateDirectory=".\DebugDll"

-                        ConfigurationType="2"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"

-                                ExceptionHandling="FALSE"

-                                RuntimeLibrary="1"

-                                PrecompiledHeaderFile=".\DebugDll/zlibvc.pch"

-                                AssemblerListingLocation=".\DebugDll/"

-                                ObjectFile=".\DebugDll/"

-                                ProgramDataBaseFileName=".\DebugDll/"

-                                WarningLevel="3"

-                                SuppressStartupBanner="TRUE"

-                                DebugInformationFormat="4"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                AdditionalOptions="/MACHINE:I386"

-                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"

-                                OutputFile=".\DebugDll\zlibwapi.dll"

-                                LinkIncremental="2"

-                                SuppressStartupBanner="TRUE"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                GenerateDebugInformation="TRUE"

-                                ProgramDatabaseFile=".\DebugDll/zlibwapi.pdb"

-                                SubSystem="2"

-                                ImportLibrary=".\DebugDll/zlibwapi.lib"/>

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="_DEBUG"

-                                MkTypLibCompatible="TRUE"

-                                SuppressStartupBanner="TRUE"

-                                TargetEnvironment="1"

-                                TypeLibraryName=".\DebugDll/zlibvc.tlb"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="_DEBUG"

-                                Culture="1036"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-                <Configuration

-                        Name="ReleaseWithoutAsm|Win32"

-                        OutputDirectory=".\zlibDllWithoutAsm"

-                        IntermediateDirectory=".\zlibDllWithoutAsm"

-                        ConfigurationType="2"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE"

-                        WholeProgramOptimization="TRUE">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,ZLIB_WINAPI"

-                                StringPooling="TRUE"

-                                ExceptionHandling="FALSE"

-                                RuntimeLibrary="0"

-                                EnableFunctionLevelLinking="TRUE"

-                                PrecompiledHeaderFile=".\zlibDllWithoutAsm/zlibvc.pch"

-                                AssemblerOutput="2"

-                                AssemblerListingLocation=".\zlibDllWithoutAsm/"

-                                ObjectFile=".\zlibDllWithoutAsm/"

-                                ProgramDataBaseFileName=".\zlibDllWithoutAsm/"

-                                BrowseInformation="1"

-                                WarningLevel="3"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                AdditionalOptions="/MACHINE:I386"

-                                AdditionalDependencies="crtdll.lib"

-                                OutputFile=".\zlibDllWithoutAsm\zlibwapi.dll"

-                                LinkIncremental="1"

-                                SuppressStartupBanner="TRUE"

-                                IgnoreAllDefaultLibraries="TRUE"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                ProgramDatabaseFile=".\zlibDllWithoutAsm/zlibwapi.pdb"

-                                GenerateMapFile="TRUE"

-                                MapFileName=".\zlibDllWithoutAsm/zlibwapi.map"

-                                SubSystem="2"

-                                OptimizeForWindows98="1"

-                                ImportLibrary=".\zlibDllWithoutAsm/zlibwapi.lib"/>

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                MkTypLibCompatible="TRUE"

-                                SuppressStartupBanner="TRUE"

-                                TargetEnvironment="1"

-                                TypeLibraryName=".\zlibDllWithoutAsm/zlibvc.tlb"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                Culture="1036"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-                <Configuration

-                        Name="ReleaseWithoutCrtdll|Win32"

-                        OutputDirectory=".\zlibDllWithoutCrtDll"

-                        IntermediateDirectory=".\zlibDllWithoutCrtDll"

-                        ConfigurationType="2"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE"

-                        WholeProgramOptimization="TRUE">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"

-                                StringPooling="TRUE"

-                                ExceptionHandling="FALSE"

-                                RuntimeLibrary="0"

-                                EnableFunctionLevelLinking="TRUE"

-                                PrecompiledHeaderFile=".\zlibDllWithoutCrtDll/zlibvc.pch"

-                                AssemblerOutput="2"

-                                AssemblerListingLocation=".\zlibDllWithoutCrtDll/"

-                                ObjectFile=".\zlibDllWithoutCrtDll/"

-                                ProgramDataBaseFileName=".\zlibDllWithoutCrtDll/"

-                                BrowseInformation="1"

-                                WarningLevel="3"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                AdditionalOptions="/MACHINE:I386"

-                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "

-                                OutputFile=".\zlibDllWithoutCrtDll\zlibwapi.dll"

-                                LinkIncremental="1"

-                                SuppressStartupBanner="TRUE"

-                                IgnoreAllDefaultLibraries="FALSE"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                ProgramDatabaseFile=".\zlibDllWithoutCrtDll/zlibwapi.pdb"

-                                GenerateMapFile="TRUE"

-                                MapFileName=".\zlibDllWithoutCrtDll/zlibwapi.map"

-                                SubSystem="2"

-                                OptimizeForWindows98="1"

-                                ImportLibrary=".\zlibDllWithoutCrtDll/zlibwapi.lib"/>

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                MkTypLibCompatible="TRUE"

-                                SuppressStartupBanner="TRUE"

-                                TargetEnvironment="1"

-                                TypeLibraryName=".\zlibDllWithoutCrtDll/zlibvc.tlb"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                Culture="1036"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-                <Configuration

-                        Name="ReleaseAxp|Win32"

-                        OutputDirectory=".\zlibvc__"

-                        IntermediateDirectory=".\zlibvc__"

-                        ConfigurationType="2"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE"

-                        WholeProgramOptimization="TRUE">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,ZLIB_WINAPI"

-                                StringPooling="TRUE"

-                                ExceptionHandling="FALSE"

-                                RuntimeLibrary="0"

-                                EnableFunctionLevelLinking="TRUE"

-                                PrecompiledHeaderFile=".\zlibvc__/zlibvc.pch"

-                                AssemblerOutput="2"

-                                AssemblerListingLocation=".\zlibvc__/"

-                                ObjectFile=".\zlibvc__/"

-                                ProgramDataBaseFileName=".\zlibvc__/"

-                                BrowseInformation="1"

-                                WarningLevel="3"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                AdditionalDependencies="crtdll.lib"

-                                OutputFile="zlibvc__\zlibwapi.dll"

-                                LinkIncremental="1"

-                                SuppressStartupBanner="TRUE"

-                                IgnoreAllDefaultLibraries="TRUE"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                ProgramDatabaseFile=".\zlibvc__/zlibwapi.pdb"

-                                GenerateMapFile="TRUE"

-                                MapFileName=".\zlibvc__/zlibwapi.map"

-                                SubSystem="2"

-                                ImportLibrary=".\zlibvc__/zlibwapi.lib"/>

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                MkTypLibCompatible="TRUE"

-                                SuppressStartupBanner="TRUE"

-                                TargetEnvironment="1"

-                                TypeLibraryName=".\zlibvc__/zlibvc.tlb"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                Culture="1036"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-                <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory=".\ReleaseDll"

-                        IntermediateDirectory=".\ReleaseDll"

-                        ConfigurationType="2"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE"

-                        WholeProgramOptimization="TRUE">

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"

-                                StringPooling="TRUE"

-                                ExceptionHandling="FALSE"

-                                RuntimeLibrary="0"

-                                EnableFunctionLevelLinking="TRUE"

-                                PrecompiledHeaderFile=".\ReleaseDll/zlibvc.pch"

-                                AssemblerOutput="2"

-                                AssemblerListingLocation=".\ReleaseDll/"

-                                ObjectFile=".\ReleaseDll/"

-                                ProgramDataBaseFileName=".\ReleaseDll/"

-                                BrowseInformation="1"

-                                WarningLevel="3"

-                                SuppressStartupBanner="TRUE"/>

-                        <Tool

-                                Name="VCCustomBuildTool"/>

-                        <Tool

-                                Name="VCLinkerTool"

-                                AdditionalOptions="/MACHINE:I386"

-                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj crtdll.lib"

-                                OutputFile=".\ReleaseDll\zlibwapi.dll"

-                                LinkIncremental="1"

-                                SuppressStartupBanner="TRUE"

-                                IgnoreAllDefaultLibraries="TRUE"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                ProgramDatabaseFile=".\ReleaseDll/zlibwapi.pdb"

-                                GenerateMapFile="TRUE"

-                                MapFileName=".\ReleaseDll/zlibwapi.map"

-                                SubSystem="2"

-                                OptimizeForWindows98="1"

-                                ImportLibrary=".\ReleaseDll/zlibwapi.lib"/>

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                MkTypLibCompatible="TRUE"

-                                SuppressStartupBanner="TRUE"

-                                TargetEnvironment="1"

-                                TypeLibraryName=".\Release/zlibvc.tlb"/>

-                        <Tool

-                                Name="VCPostBuildEventTool"/>

-                        <Tool

-                                Name="VCPreBuildEventTool"/>

-                        <Tool

-                                Name="VCPreLinkEventTool"/>

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                Culture="1036"/>

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"/>

-                        <Tool

-                                Name="VCWebDeploymentTool"/>

-                </Configuration>

-        </Configurations>

-        <Files>

-                <Filter

-                        Name="Source Files"

-                        Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90">

-                        <File

-                                RelativePath="..\..\..\adler32.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\compress.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\crc32.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\deflate.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\masmx86\gvmat32c.c">

-                                <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Win32"

-                                        ExcludedFromBuild="TRUE">

-                                        <Tool

-                                                Name="VCCLCompilerTool"/>

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzclose.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzio.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzlib.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzread.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzwrite.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\infback.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inffast.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inflate.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inftrees.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\ioapi.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\iowin32.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\trees.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\uncompr.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\unzip.c">

-                                <FileConfiguration

-                                        Name="Release|Win32">

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                                AdditionalIncludeDirectories=""

-                                                PreprocessorDefinitions="ZLIB_INTERNAL"/>

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\zip.c">

-                                <FileConfiguration

-                                        Name="Release|Win32">

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                                AdditionalIncludeDirectories=""

-                                                PreprocessorDefinitions="ZLIB_INTERNAL"/>

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath=".\zlib.rc">

-                        </File>

-                        <File

-                                RelativePath=".\zlibvc.def">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\zutil.c">

-                        </File>

-                </Filter>

-                <Filter

-                        Name="Header Files"

-                        Filter="h;hpp;hxx;hm;inl;fi;fd">

-                        <File

-                                RelativePath="..\..\..\deflate.h">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\infblock.h">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\infcodes.h">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inffast.h">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inftrees.h">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\infutil.h">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\zconf.h">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\zlib.h">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\zutil.h">

-                        </File>

-                </Filter>

-                <Filter

-                        Name="Resource Files"

-                        Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">

-                </Filter>

-        </Files>

-        <Globals>

-        </Globals>

-</VisualStudioProject>

diff --git a/contrib/vstudio/vc8/zlibvc.def b/contrib/vstudio/vc8/zlibvc.def
index a40e715..0b6a9e9 100644
--- a/contrib/vstudio/vc8/zlibvc.def
+++ b/contrib/vstudio/vc8/zlibvc.def
@@ -90,3 +90,25 @@ EXPORTS
         unzGoToFilePos                           @101

 

         fill_win32_filefunc                      @110

+        fill_win32_filefunc64                    @111

+        fill_win32_filefunc64A                   @112

+        fill_win32_filefunc64W                   @113

+

+; quick hack by hkuno@microhouse.co.jp

+        unzOpen64                         @120

+        unzOpen2_64                       @121

+        unzGetGlobalInfo64                @122

+        unzGetCurrentFileInfo64           @124

+        unzGetCurrentFileZStreamPos64     @125

+        unztell64                         @126

+        unzGetFilePos64                   @127

+        unzGoToFilePos64                  @128

+

+        zipOpen64                         @130

+        zipOpen2_64                       @131

+        zipOpenNewFileInZip64             @132

+        zipOpenNewFileInZip2_64           @133

+        zipOpenNewFileInZip3_64           @134

+        zipOpenNewFileInZip4_64           @135

+        zipCloseFileInZipRaw64            @136

+; end hack

diff --git a/contrib/vstudio/vc8/zlibvc.vcproj b/contrib/vstudio/vc8/zlibvc.vcproj
deleted file mode 100644
index f06273b..0000000
--- a/contrib/vstudio/vc8/zlibvc.vcproj
+++ /dev/null
@@ -1,1230 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-        ProjectType="Visual C++"

-        Version="8,00"

-        Name="zlibvc"

-        ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}"

-        >

-        <Platforms>

-                <Platform

-                        Name="Win32"

-                />

-                <Platform

-                        Name="x64"

-                />

-                <Platform

-                        Name="Itanium"

-                />

-        </Platforms>

-        <ToolFiles>

-        </ToolFiles>

-        <Configurations>

-                <Configuration

-                        Name="Debug|Win32"

-                        OutputDirectory="x86\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"

-                        ConfigurationType="2"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="_DEBUG"

-                                MkTypLibCompatible="true"

-                                SuppressStartupBanner="true"

-                                TargetEnvironment="1"

-                                TypeLibraryName="$(OutDir)/zlibvc.tlb"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI,ASMV,ASMINF"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="1"

-                                BufferSecurityCheck="false"

-                                PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                BrowseInformation="0"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                                DebugInformationFormat="4"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="_DEBUG"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLinkerTool"

-                                AdditionalOptions="/MACHINE:I386"

-                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"

-                                OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="2"

-                                SuppressStartupBanner="true"

-                                GenerateManifest="false"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                GenerateDebugInformation="true"

-                                ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-                                GenerateMapFile="true"

-                                MapFileName="$(OutDir)/zlibwapi.map"

-                                SubSystem="2"

-                                ImportLibrary="$(OutDir)/zlibwapi.lib"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCManifestTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCAppVerifierTool"

-                        />

-                        <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Debug|x64"

-                        OutputDirectory="x64\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"

-                        ConfigurationType="2"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="_DEBUG"

-                                MkTypLibCompatible="true"

-                                SuppressStartupBanner="true"

-                                TargetEnvironment="3"

-                                TypeLibraryName="$(OutDir)/zlibvc.tlb"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI,ASMV,ASMINF;WIN64"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="3"

-                                BufferSecurityCheck="false"

-                                PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                BrowseInformation="0"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                                DebugInformationFormat="3"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="_DEBUG"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLinkerTool"

-                                AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

-                                OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="2"

-                                SuppressStartupBanner="true"

-                                GenerateManifest="false"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                GenerateDebugInformation="true"

-                                ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-                                GenerateMapFile="true"

-                                MapFileName="$(OutDir)/zlibwapi.map"

-                                SubSystem="2"

-                                ImportLibrary="$(OutDir)/zlibwapi.lib"

-                                TargetMachine="17"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCManifestTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCAppVerifierTool"

-                        />

-                        <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Debug|Itanium"

-                        OutputDirectory="ia64\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"

-                        ConfigurationType="2"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="_DEBUG"

-                                MkTypLibCompatible="true"

-                                SuppressStartupBanner="true"

-                                TargetEnvironment="2"

-                                TypeLibraryName="$(OutDir)/zlibvc.tlb"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;WIN64"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="3"

-                                BufferSecurityCheck="false"

-                                PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                BrowseInformation="0"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                                DebugInformationFormat="3"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="_DEBUG"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLinkerTool"

-                                OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="2"

-                                SuppressStartupBanner="true"

-                                GenerateManifest="false"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                GenerateDebugInformation="true"

-                                ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-                                GenerateMapFile="true"

-                                MapFileName="$(OutDir)/zlibwapi.map"

-                                SubSystem="2"

-                                ImportLibrary="$(OutDir)/zlibwapi.lib"

-                                TargetMachine="5"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCManifestTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCAppVerifierTool"

-                        />

-                        <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="ReleaseWithoutAsm|Win32"

-                        OutputDirectory="x86\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"

-                        ConfigurationType="2"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        WholeProgramOptimization="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                MkTypLibCompatible="true"

-                                SuppressStartupBanner="true"

-                                TargetEnvironment="1"

-                                TypeLibraryName="$(OutDir)/zlibvc.tlb"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="2"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerOutput="2"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                BrowseInformation="0"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLinkerTool"

-                                AdditionalOptions="/MACHINE:I386"

-                                OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="1"

-                                SuppressStartupBanner="true"

-                                GenerateManifest="false"

-                                IgnoreAllDefaultLibraries="false"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-                                GenerateMapFile="true"

-                                MapFileName="$(OutDir)/zlibwapi.map"

-                                SubSystem="2"

-                                OptimizeForWindows98="1"

-                                ImportLibrary="$(OutDir)/zlibwapi.lib"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCManifestTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCAppVerifierTool"

-                        />

-                        <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="ReleaseWithoutAsm|x64"

-                        OutputDirectory="x64\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"

-                        ConfigurationType="2"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        WholeProgramOptimization="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                MkTypLibCompatible="true"

-                                SuppressStartupBanner="true"

-                                TargetEnvironment="3"

-                                TypeLibraryName="$(OutDir)/zlibvc.tlb"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;WIN64"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="2"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerOutput="2"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                BrowseInformation="0"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLinkerTool"

-                                OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="1"

-                                SuppressStartupBanner="true"

-                                GenerateManifest="false"

-                                IgnoreAllDefaultLibraries="false"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-                                GenerateMapFile="true"

-                                MapFileName="$(OutDir)/zlibwapi.map"

-                                SubSystem="2"

-                                OptimizeForWindows98="1"

-                                ImportLibrary="$(OutDir)/zlibwapi.lib"

-                                TargetMachine="17"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCManifestTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCAppVerifierTool"

-                        />

-                        <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="ReleaseWithoutAsm|Itanium"

-                        OutputDirectory="ia64\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"

-                        ConfigurationType="2"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        WholeProgramOptimization="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                MkTypLibCompatible="true"

-                                SuppressStartupBanner="true"

-                                TargetEnvironment="2"

-                                TypeLibraryName="$(OutDir)/zlibvc.tlb"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;WIN64"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="2"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerOutput="2"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                BrowseInformation="0"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLinkerTool"

-                                OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="1"

-                                SuppressStartupBanner="true"

-                                GenerateManifest="false"

-                                IgnoreAllDefaultLibraries="false"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-                                GenerateMapFile="true"

-                                MapFileName="$(OutDir)/zlibwapi.map"

-                                SubSystem="2"

-                                OptimizeForWindows98="1"

-                                ImportLibrary="$(OutDir)/zlibwapi.lib"

-                                TargetMachine="5"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCManifestTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCAppVerifierTool"

-                        />

-                        <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="x86\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"

-                        ConfigurationType="2"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        WholeProgramOptimization="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                MkTypLibCompatible="true"

-                                SuppressStartupBanner="true"

-                                TargetEnvironment="1"

-                                TypeLibraryName="$(OutDir)/zlibvc.tlb"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ASMV;ASMINF"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="2"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerOutput="2"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                BrowseInformation="0"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLinkerTool"

-                                AdditionalOptions="/MACHINE:I386"

-                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "

-                                OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="1"

-                                SuppressStartupBanner="true"

-                                GenerateManifest="false"

-                                IgnoreAllDefaultLibraries="false"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-                                GenerateMapFile="true"

-                                MapFileName="$(OutDir)/zlibwapi.map"

-                                SubSystem="2"

-                                OptimizeForWindows98="1"

-                                ImportLibrary="$(OutDir)/zlibwapi.lib"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCManifestTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCAppVerifierTool"

-                        />

-                        <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Release|x64"

-                        OutputDirectory="x64\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"

-                        ConfigurationType="2"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        WholeProgramOptimization="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                MkTypLibCompatible="true"

-                                SuppressStartupBanner="true"

-                                TargetEnvironment="3"

-                                TypeLibraryName="$(OutDir)/zlibvc.tlb"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ASMV;ASMINF;WIN64"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="2"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerOutput="2"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                BrowseInformation="0"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLinkerTool"

-                                AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

-                                OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="1"

-                                SuppressStartupBanner="true"

-                                GenerateManifest="false"

-                                IgnoreAllDefaultLibraries="false"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-                                GenerateMapFile="true"

-                                MapFileName="$(OutDir)/zlibwapi.map"

-                                SubSystem="2"

-                                OptimizeForWindows98="1"

-                                ImportLibrary="$(OutDir)/zlibwapi.lib"

-                                TargetMachine="17"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCManifestTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCAppVerifierTool"

-                        />

-                        <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Release|Itanium"

-                        OutputDirectory="ia64\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"

-                        ConfigurationType="2"

-                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

-                        UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="false"

-                        WholeProgramOptimization="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                MkTypLibCompatible="true"

-                                SuppressStartupBanner="true"

-                                TargetEnvironment="2"

-                                TypeLibraryName="$(OutDir)/zlibvc.tlb"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

-                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;WIN64"

-                                StringPooling="true"

-                                ExceptionHandling="0"

-                                RuntimeLibrary="2"

-                                BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerOutput="2"

-                                AssemblerListingLocation="$(IntDir)\"

-                                ObjectFile="$(IntDir)\"

-                                ProgramDataBaseFileName="$(OutDir)\"

-                                BrowseInformation="0"

-                                WarningLevel="3"

-                                SuppressStartupBanner="true"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

-                                Culture="1036"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLinkerTool"

-                                OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="1"

-                                SuppressStartupBanner="true"

-                                GenerateManifest="false"

-                                IgnoreAllDefaultLibraries="false"

-                                ModuleDefinitionFile=".\zlibvc.def"

-                                ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

-                                GenerateMapFile="true"

-                                MapFileName="$(OutDir)/zlibwapi.map"

-                                SubSystem="2"

-                                OptimizeForWindows98="1"

-                                ImportLibrary="$(OutDir)/zlibwapi.lib"

-                                TargetMachine="5"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCManifestTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCAppVerifierTool"

-                        />

-                        <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-        </Configurations>

-        <References>

-        </References>

-        <Files>

-                <Filter

-                        Name="Source Files"

-                        Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-                        >

-                        <File

-                                RelativePath="..\..\..\adler32.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\compress.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\crc32.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\deflate.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\masmx86\gvmat32c.c"

-                                >

-                                <FileConfiguration

-                                        Name="Debug|x64"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Debug|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Win32"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseWithoutAsm|x64"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|x64"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzclose.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzio.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzlib.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzread.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\gzwrite.c">

-                        </File>

-                        <File

-                                RelativePath="..\..\..\infback.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\masmx64\inffas8664.c"

-                                >

-                                <FileConfiguration

-                                        Name="Debug|Win32"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Debug|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Win32"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|Win32"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|Itanium"

-                                        ExcludedFromBuild="true"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inffast.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inflate.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inftrees.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\ioapi.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\iowin32.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\trees.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\uncompr.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\unzip.c"

-                                >

-                                <FileConfiguration

-                                        Name="Release|Win32"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                                AdditionalIncludeDirectories=""

-                                                PreprocessorDefinitions="ZLIB_INTERNAL"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|x64"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                                AdditionalIncludeDirectories=""

-                                                PreprocessorDefinitions="ZLIB_INTERNAL"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|Itanium"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                                AdditionalIncludeDirectories=""

-                                                PreprocessorDefinitions="ZLIB_INTERNAL"

-                                        />

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath="..\..\minizip\zip.c"

-                                >

-                                <FileConfiguration

-                                        Name="Release|Win32"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                                AdditionalIncludeDirectories=""

-                                                PreprocessorDefinitions="ZLIB_INTERNAL"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|x64"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                                AdditionalIncludeDirectories=""

-                                                PreprocessorDefinitions="ZLIB_INTERNAL"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|Itanium"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                                AdditionalIncludeDirectories=""

-                                                PreprocessorDefinitions="ZLIB_INTERNAL"

-                                        />

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath=".\zlib.rc"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\zlibvc.def"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\zutil.c"

-                                >

-                        </File>

-                </Filter>

-                <Filter

-                        Name="Header Files"

-                        Filter="h;hpp;hxx;hm;inl;fi;fd"

-                        >

-                        <File

-                                RelativePath="..\..\..\deflate.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\infblock.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\infcodes.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inffast.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\inftrees.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\infutil.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\zconf.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\zlib.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath="..\..\..\zutil.h"

-                                >

-                        </File>

-                </Filter>

-                <Filter

-                        Name="Resource Files"

-                        Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-                        >

-                </Filter>

-        </Files>

-        <Globals>

-        </Globals>

-</VisualStudioProject>

diff --git a/contrib/vstudio/vc8/miniunz.vcproj b/contrib/vstudio/vc9/miniunz.vcproj
index 4af53e8..7da32b9 100644
--- a/contrib/vstudio/vc8/miniunz.vcproj
+++ b/contrib/vstudio/vc9/miniunz.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

         ProjectType="Visual C++"

-        Version="8,00"

+        Version="9.00"

         Name="miniunz"

         ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

         Keyword="Win32Proj"

+        TargetFrameworkVersion="131072"

         >

         <Platforms>

                 <Platform

@@ -76,6 +77,8 @@
                                 GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

                                 SubSystem="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

                                 TargetMachine="1"

                         />

                         <Tool

@@ -97,16 +100,13 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|x64"

-                        OutputDirectory="x64\MiniUnzip$(ConfigurationName)"

-                        IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"

+                        Name="Release|Win32"

+                        OutputDirectory="x86\MiniUnzip$(ConfigurationName)"

+                        IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

@@ -125,17 +125,19 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="0"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

                                 AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

-                                MinimalRebuild="true"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

+                                StringPooling="true"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="3"

+                                RuntimeLibrary="0"

                                 BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

                                 AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

@@ -153,14 +155,18 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

+                                AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

                                 OutputFile="$(OutDir)/miniunz.exe"

-                                LinkIncremental="2"

+                                LinkIncremental="1"

                                 GenerateManifest="false"

                                 GenerateDebugInformation="true"

-                                ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

                                 SubSystem="1"

-                                TargetMachine="17"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

+                                TargetMachine="1"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -181,16 +187,13 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|Itanium"

-                        OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"

-                        IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"

+                        Name="Debug|x64"

+                        OutputDirectory="x64\MiniUnzip$(ConfigurationName)"

+                        IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

@@ -209,7 +212,7 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="2"

+                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

@@ -237,14 +240,14 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

+                                AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

                                 OutputFile="$(OutDir)/miniunz.exe"

                                 LinkIncremental="2"

                                 GenerateManifest="false"

                                 GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

                                 SubSystem="1"

-                                TargetMachine="5"

+                                TargetMachine="17"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -272,9 +275,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="x86\MiniUnzip$(ConfigurationName)"

-                        IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"

+                        Name="Debug|Itanium"

+                        OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"

+                        IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

@@ -293,19 +296,17 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

+                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="2"

-                                InlineFunctionExpansion="1"

-                                OmitFramePointers="true"

+                                Optimization="0"

                                 AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

-                                StringPooling="true"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

+                                MinimalRebuild="true"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="0"

+                                RuntimeLibrary="3"

                                 BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

                                 AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

@@ -323,16 +324,14 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

+                                AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

                                 OutputFile="$(OutDir)/miniunz.exe"

-                                LinkIncremental="1"

+                                LinkIncremental="2"

                                 GenerateManifest="false"

                                 GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

                                 SubSystem="1"

-                                OptimizeReferences="2"

-                                EnableCOMDATFolding="2"

-                                OptimizeForWindows98="1"

-                                TargetMachine="1"

+                                TargetMachine="5"

                         />

                         <Tool

                                 Name="VCALinkTool"

diff --git a/contrib/vstudio/vc8/minizip.vcproj b/contrib/vstudio/vc9/minizip.vcproj
index 85f64c4..e57e07d 100644
--- a/contrib/vstudio/vc8/minizip.vcproj
+++ b/contrib/vstudio/vc9/minizip.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

         ProjectType="Visual C++"

-        Version="8,00"

+        Version="9.00"

         Name="minizip"

         ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

         Keyword="Win32Proj"

+        TargetFrameworkVersion="131072"

         >

         <Platforms>

                 <Platform

@@ -76,6 +77,8 @@
                                 GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/minizip.pdb"

                                 SubSystem="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

                                 TargetMachine="1"

                         />

                         <Tool

@@ -97,16 +100,13 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|x64"

-                        OutputDirectory="x64\$(ConfigurationName)"

-                        IntermediateDirectory="x64\$(ConfigurationName)"

+                        Name="Release|Win32"

+                        OutputDirectory="x86\MiniZip$(ConfigurationName)"

+                        IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

@@ -125,17 +125,19 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="0"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

                                 AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

-                                MinimalRebuild="true"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

+                                StringPooling="true"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="3"

+                                RuntimeLibrary="0"

                                 BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

                                 AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

@@ -153,14 +155,17 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

+                                AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

                                 OutputFile="$(OutDir)/minizip.exe"

-                                LinkIncremental="2"

-                                GenerateManifest="false"

+                                LinkIncremental="1"

                                 GenerateDebugInformation="true"

-                                ProgramDatabaseFile="$(OutDir)/minizip.pdb"

                                 SubSystem="1"

-                                TargetMachine="17"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

+                                TargetMachine="1"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -181,16 +186,13 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|Itanium"

-                        OutputDirectory="ia64\$(ConfigurationName)"

-                        IntermediateDirectory="ia64\$(ConfigurationName)"

+                        Name="Debug|x64"

+                        OutputDirectory="x64\$(ConfigurationName)"

+                        IntermediateDirectory="x64\$(ConfigurationName)"

                         ConfigurationType="1"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

@@ -209,7 +211,7 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="2"

+                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

@@ -237,14 +239,14 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

+                                AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

                                 OutputFile="$(OutDir)/minizip.exe"

                                 LinkIncremental="2"

                                 GenerateManifest="false"

                                 GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/minizip.pdb"

                                 SubSystem="1"

-                                TargetMachine="5"

+                                TargetMachine="17"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -272,9 +274,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="x86\MiniZip$(ConfigurationName)"

-                        IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"

+                        Name="Debug|Itanium"

+                        OutputDirectory="ia64\$(ConfigurationName)"

+                        IntermediateDirectory="ia64\$(ConfigurationName)"

                         ConfigurationType="1"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

@@ -293,19 +295,17 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

+                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="2"

-                                InlineFunctionExpansion="1"

-                                OmitFramePointers="true"

+                                Optimization="0"

                                 AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

-                                StringPooling="true"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

+                                MinimalRebuild="true"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="0"

+                                RuntimeLibrary="3"

                                 BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

                                 AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

@@ -323,15 +323,14 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

+                                AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

                                 OutputFile="$(OutDir)/minizip.exe"

-                                LinkIncremental="1"

+                                LinkIncremental="2"

+                                GenerateManifest="false"

                                 GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/minizip.pdb"

                                 SubSystem="1"

-                                OptimizeReferences="2"

-                                EnableCOMDATFolding="2"

-                                OptimizeForWindows98="1"

-                                TargetMachine="1"

+                                TargetMachine="5"

                         />

                         <Tool

                                 Name="VCALinkTool"

diff --git a/contrib/vstudio/vc8/testzlib.vcproj b/contrib/vstudio/vc9/testzlib.vcproj
index 68c3539..9ad07ae 100644
--- a/contrib/vstudio/vc8/testzlib.vcproj
+++ b/contrib/vstudio/vc9/testzlib.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

         ProjectType="Visual C++"

-        Version="8,00"

+        Version="9.00"

         Name="testzlib"

         ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

         RootNamespace="testzlib"

         Keyword="Win32Proj"

+        TargetFrameworkVersion="131072"

         >

         <Platforms>

                 <Platform

@@ -47,7 +48,7 @@
                                 Name="VCCLCompilerTool"

                                 Optimization="0"

                                 AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

                                 MinimalRebuild="true"

                                 BasicRuntimeChecks="0"

                                 RuntimeLibrary="1"

@@ -77,6 +78,8 @@
                                 GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

                                 SubSystem="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

                                 TargetMachine="1"

                         />

                         <Tool

@@ -98,17 +101,16 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|x64"

-                        OutputDirectory="x64\TestZlib$(ConfigurationName)"

-                        IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"

+                        Name="ReleaseWithoutAsm|Win32"

+                        OutputDirectory="x86\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

+                        CharacterSet="2"

+                        WholeProgramOptimization="1"

                         >

                         <Tool

                                 Name="VCPreBuildEventTool"

@@ -127,12 +129,21 @@
                         />

                         <Tool

                                 Name="VCCLCompilerTool"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

                                 AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

+                                StringPooling="true"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="3"

+                                RuntimeLibrary="0"

                                 BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

                                 AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

@@ -145,8 +156,17 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"

+                                OutputFile="$(OutDir)/testzlib.exe"

+                                LinkIncremental="1"

                                 GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

+                                TargetMachine="1"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -167,18 +187,16 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|Itanium"

-                        OutputDirectory="ia64\TestZlib$(ConfigurationName)"

-                        IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"

+                        Name="Release|Win32"

+                        OutputDirectory="x86\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

                         CharacterSet="2"

+                        WholeProgramOptimization="1"

                         >

                         <Tool

                                 Name="VCPreBuildEventTool"

@@ -194,19 +212,20 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="0"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

                                 AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

-                                MinimalRebuild="true"

+                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

+                                StringPooling="true"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="3"

+                                RuntimeLibrary="0"

                                 BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

-                                AssemblerOutput="4"

                                 AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

                                 Detect64BitPortabilityProblems="true"

@@ -223,13 +242,18 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

+                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"

                                 OutputFile="$(OutDir)/testzlib.exe"

-                                LinkIncremental="2"

+                                LinkIncremental="1"

                                 GenerateManifest="false"

                                 GenerateDebugInformation="true"

-                                ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

                                 SubSystem="1"

-                                TargetMachine="5"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

+                                TargetMachine="1"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -250,19 +274,14 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="ReleaseWithoutAsm|Win32"

-                        OutputDirectory="x86\TestZlib$(ConfigurationName)"

-                        IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"

+                        Name="Debug|x64"

+                        OutputDirectory="x64\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

-                        CharacterSet="2"

-                        WholeProgramOptimization="1"

                         >

                         <Tool

                                 Name="VCPreBuildEventTool"

@@ -281,21 +300,12 @@
                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="2"

-                                InlineFunctionExpansion="1"

-                                OmitFramePointers="true"

                                 AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

-                                StringPooling="true"

+                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="0"

+                                RuntimeLibrary="3"

                                 BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                UsePrecompiledHeader="0"

                                 AssemblerListingLocation="$(IntDir)\"

-                                WarningLevel="3"

-                                Detect64BitPortabilityProblems="true"

-                                DebugInformationFormat="3"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

@@ -308,15 +318,8 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                OutputFile="$(OutDir)/testzlib.exe"

-                                LinkIncremental="1"

+                                AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"

                                 GenerateManifest="false"

-                                GenerateDebugInformation="true"

-                                SubSystem="1"

-                                OptimizeReferences="2"

-                                EnableCOMDATFolding="2"

-                                OptimizeForWindows98="1"

-                                TargetMachine="1"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -344,11 +347,11 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="ReleaseWithoutAsm|x64"

-                        OutputDirectory="x64\TestZlib$(ConfigurationName)"

-                        IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"

+                        Name="Debug|Itanium"

+                        OutputDirectory="ia64\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

-                        WholeProgramOptimization="1"

+                        CharacterSet="2"

                         >

                         <Tool

                                 Name="VCPreBuildEventTool"

@@ -364,15 +367,23 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

+                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

+                                Optimization="0"

                                 AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

+                                MinimalRebuild="true"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="2"

+                                RuntimeLibrary="3"

                                 BufferSecurityCheck="false"

+                                UsePrecompiledHeader="0"

+                                AssemblerOutput="4"

                                 AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

@@ -385,8 +396,13 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies=""

+                                OutputFile="$(OutDir)/testzlib.exe"

+                                LinkIncremental="2"

                                 GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

+                                SubSystem="1"

+                                TargetMachine="5"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -414,11 +430,10 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="ReleaseWithoutAsm|Itanium"

-                        OutputDirectory="ia64\TestZlib$(ConfigurationName)"

-                        IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"

+                        Name="ReleaseWithoutAsm|x64"

+                        OutputDirectory="x64\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

-                        CharacterSet="2"

                         WholeProgramOptimization="1"

                         >

                         <Tool

@@ -435,25 +450,15 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="2"

-                                InlineFunctionExpansion="1"

-                                OmitFramePointers="true"

                                 AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

-                                StringPooling="true"

+                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

                                 BasicRuntimeChecks="0"

                                 RuntimeLibrary="2"

                                 BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

-                                UsePrecompiledHeader="0"

                                 AssemblerListingLocation="$(IntDir)\"

-                                WarningLevel="3"

-                                Detect64BitPortabilityProblems="true"

-                                DebugInformationFormat="3"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

@@ -466,15 +471,8 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                OutputFile="$(OutDir)/testzlib.exe"

-                                LinkIncremental="1"

+                                AdditionalDependencies=""

                                 GenerateManifest="false"

-                                GenerateDebugInformation="true"

-                                SubSystem="1"

-                                OptimizeReferences="2"

-                                EnableCOMDATFolding="2"

-                                OptimizeForWindows98="1"

-                                TargetMachine="5"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -502,9 +500,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="x86\TestZlib$(ConfigurationName)"

-                        IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"

+                        Name="ReleaseWithoutAsm|Itanium"

+                        OutputDirectory="ia64\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

                         CharacterSet="2"

                         WholeProgramOptimization="1"

@@ -523,6 +521,7 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

+                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

@@ -530,10 +529,10 @@
                                 InlineFunctionExpansion="1"

                                 OmitFramePointers="true"

                                 AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

                                 StringPooling="true"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="0"

+                                RuntimeLibrary="2"

                                 BufferSecurityCheck="false"

                                 EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

@@ -553,7 +552,6 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"

                                 OutputFile="$(OutDir)/testzlib.exe"

                                 LinkIncremental="1"

                                 GenerateManifest="false"

@@ -562,7 +560,7 @@
                                 OptimizeReferences="2"

                                 EnableCOMDATFolding="2"

                                 OptimizeForWindows98="1"

-                                TargetMachine="1"

+                                TargetMachine="5"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -614,7 +612,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

                                 BasicRuntimeChecks="0"

                                 RuntimeLibrary="2"

                                 BufferSecurityCheck="false"

@@ -689,7 +687,7 @@
                                 InlineFunctionExpansion="1"

                                 OmitFramePointers="true"

                                 AdditionalIncludeDirectories="..\..\.."

-                                PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

+                                PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

                                 StringPooling="true"

                                 BasicRuntimeChecks="0"

                                 RuntimeLibrary="2"

@@ -863,7 +861,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="Debug|Itanium"

+                                        Name="ReleaseWithoutAsm|Win32"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -871,7 +869,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Win32"

+                                        Name="Release|Win32"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -879,7 +877,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Itanium"

+                                        Name="Debug|Itanium"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -887,7 +885,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="Release|Win32"

+                                        Name="ReleaseWithoutAsm|Itanium"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

diff --git a/contrib/vstudio/vc8/testzlibdll.vcproj b/contrib/vstudio/vc9/testzlibdll.vcproj
index f38ab5e..b1ddde0 100644
--- a/contrib/vstudio/vc8/testzlibdll.vcproj
+++ b/contrib/vstudio/vc9/testzlibdll.vcproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

         ProjectType="Visual C++"

-        Version="8,00"

+        Version="9.00"

         Name="TestZlibDll"

         ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}"

         Keyword="Win32Proj"

-        SignManifests="true"

+        TargetFrameworkVersion="131072"

         >

         <Platforms>

                 <Platform

@@ -77,6 +77,8 @@
                                 GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

                                 SubSystem="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

                                 TargetMachine="1"

                         />

                         <Tool

@@ -98,16 +100,13 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|x64"

-                        OutputDirectory="x64\TestZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"

+                        Name="Release|Win32"

+                        OutputDirectory="x86\TestZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

@@ -126,17 +125,19 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="0"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

                                 AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

-                                MinimalRebuild="true"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

+                                StringPooling="true"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="3"

+                                RuntimeLibrary="0"

                                 BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

                                 AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

@@ -154,14 +155,18 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

+                                AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

                                 OutputFile="$(OutDir)/testzlib.exe"

-                                LinkIncremental="2"

+                                LinkIncremental="1"

                                 GenerateManifest="false"

                                 GenerateDebugInformation="true"

-                                ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

                                 SubSystem="1"

-                                TargetMachine="17"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

+                                TargetMachine="1"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -182,16 +187,13 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|Itanium"

-                        OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"

+                        Name="Debug|x64"

+                        OutputDirectory="x64\TestZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

@@ -210,7 +212,7 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="2"

+                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

@@ -238,14 +240,14 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

+                                AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

                                 OutputFile="$(OutDir)/testzlib.exe"

                                 LinkIncremental="2"

                                 GenerateManifest="false"

                                 GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

                                 SubSystem="1"

-                                TargetMachine="5"

+                                TargetMachine="17"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -273,9 +275,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="x86\TestZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"

+                        Name="Debug|Itanium"

+                        OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

@@ -294,19 +296,17 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

+                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="2"

-                                InlineFunctionExpansion="1"

-                                OmitFramePointers="true"

+                                Optimization="0"

                                 AdditionalIncludeDirectories="..\..\..;..\..\minizip"

-                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

-                                StringPooling="true"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

+                                MinimalRebuild="true"

                                 BasicRuntimeChecks="0"

-                                RuntimeLibrary="0"

+                                RuntimeLibrary="3"

                                 BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

                                 AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

@@ -324,16 +324,14 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

+                                AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

                                 OutputFile="$(OutDir)/testzlib.exe"

-                                LinkIncremental="1"

+                                LinkIncremental="2"

                                 GenerateManifest="false"

                                 GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

                                 SubSystem="1"

-                                OptimizeReferences="2"

-                                EnableCOMDATFolding="2"

-                                OptimizeForWindows98="1"

-                                TargetMachine="1"

+                                TargetMachine="5"

                         />

                         <Tool

                                 Name="VCALinkTool"

diff --git a/contrib/vstudio/vc7/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 266fb83..72cb8b4 100644
--- a/contrib/vstudio/vc7/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 

 #define IDR_VERSION1  1

 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION    1,2,3,8

-  PRODUCTVERSION 1,2,3,8

+  FILEVERSION    1,2,3,0

+  PRODUCTVERSION 1,2,3,0

   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

   FILEFLAGS     0

   FILEOS        VOS_DOS_WINDOWS32

@@ -17,12 +17,12 @@ BEGIN
 

     BEGIN

       VALUE "FileDescription", "zlib data compression library\0"

-      VALUE "FileVersion",      "1.2.3.8\0"

+      VALUE "FileVersion",      "1.2.3.0\0"

       VALUE "InternalName",     "zlib\0"

       VALUE "OriginalFilename", "zlib.dll\0"

       VALUE "ProductName",      "ZLib.DLL\0"

       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"

-      VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0"

+      VALUE "LegalCopyright", "(C) 1995-2003 Jean-loup Gailly & Mark Adler\0"

     END

   END

   BLOCK "VarFileInfo"

diff --git a/contrib/vstudio/vc8/zlibstat.vcproj b/contrib/vstudio/vc9/zlibstat.vcproj
index 51a4073..ff9813a 100644
--- a/contrib/vstudio/vc8/zlibstat.vcproj
+++ b/contrib/vstudio/vc9/zlibstat.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

         ProjectType="Visual C++"

-        Version="8,00"

+        Version="9.00"

         Name="zlibstat"

         ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"

+        TargetFrameworkVersion="131072"

         >

         <Platforms>

                 <Platform

@@ -47,7 +48,7 @@
                                 Name="VCCLCompilerTool"

                                 Optimization="0"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

                                 ExceptionHandling="0"

                                 RuntimeLibrary="1"

                                 BufferSecurityCheck="false"

@@ -93,9 +94,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|x64"

-                        OutputDirectory="x64\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"

+                        Name="Release|Win32"

+                        OutputDirectory="x86\ZlibStat$(ConfigurationName)"

+                        IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"

                         ConfigurationType="4"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

@@ -115,24 +116,23 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="0"

+                                InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

+                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"

+                                StringPooling="true"

                                 ExceptionHandling="0"

-                                RuntimeLibrary="3"

+                                RuntimeLibrary="0"

                                 BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

                                 AssemblerListingLocation="$(IntDir)\"

                                 ObjectFile="$(IntDir)\"

                                 ProgramDataBaseFileName="$(OutDir)\"

                                 WarningLevel="3"

                                 SuppressStartupBanner="true"

-                                Detect64BitPortabilityProblems="true"

-                                DebugInformationFormat="1"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

@@ -146,7 +146,8 @@
                         />

                         <Tool

                                 Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

+                                AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

+                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "

                                 OutputFile="$(OutDir)\zlibstat.lib"

                                 SuppressStartupBanner="true"

                         />

@@ -167,9 +168,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|Itanium"

-                        OutputDirectory="ia64\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"

+                        Name="ReleaseWithoutAsm|Win32"

+                        OutputDirectory="x86\ZlibStat$(ConfigurationName)"

+                        IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"

                         ConfigurationType="4"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

@@ -189,24 +190,23 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="0"

+                                InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

+                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"

+                                StringPooling="true"

                                 ExceptionHandling="0"

-                                RuntimeLibrary="3"

+                                RuntimeLibrary="0"

                                 BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

                                 AssemblerListingLocation="$(IntDir)\"

                                 ObjectFile="$(IntDir)\"

                                 ProgramDataBaseFileName="$(OutDir)\"

                                 WarningLevel="3"

                                 SuppressStartupBanner="true"

-                                Detect64BitPortabilityProblems="true"

-                                DebugInformationFormat="1"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

@@ -220,7 +220,7 @@
                         />

                         <Tool

                                 Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"

+                                AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

                                 OutputFile="$(OutDir)\zlibstat.lib"

                                 SuppressStartupBanner="true"

                         />

@@ -241,9 +241,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="x86\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"

+                        Name="Debug|x64"

+                        OutputDirectory="x64\ZlibStat$(ConfigurationName)"

+                        IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"

                         ConfigurationType="4"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

@@ -263,23 +263,24 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

+                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

+                                Optimization="0"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF"

-                                StringPooling="true"

+                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

                                 ExceptionHandling="0"

-                                RuntimeLibrary="0"

+                                RuntimeLibrary="3"

                                 BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

                                 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

                                 AssemblerListingLocation="$(IntDir)\"

                                 ObjectFile="$(IntDir)\"

                                 ProgramDataBaseFileName="$(OutDir)\"

                                 WarningLevel="3"

                                 SuppressStartupBanner="true"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="1"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

@@ -293,8 +294,7 @@
                         />

                         <Tool

                                 Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

-                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "

+                                AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

                                 OutputFile="$(OutDir)\zlibstat.lib"

                                 SuppressStartupBanner="true"

                         />

@@ -315,9 +315,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Release|x64"

-                        OutputDirectory="x64\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"

+                        Name="Debug|Itanium"

+                        OutputDirectory="ia64\ZlibStat$(ConfigurationName)"

+                        IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"

                         ConfigurationType="4"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

@@ -337,24 +337,24 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="3"

+                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

+                                Optimization="0"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF;WIN64"

-                                StringPooling="true"

+                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

                                 ExceptionHandling="0"

-                                RuntimeLibrary="2"

+                                RuntimeLibrary="3"

                                 BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

                                 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

                                 AssemblerListingLocation="$(IntDir)\"

                                 ObjectFile="$(IntDir)\"

                                 ProgramDataBaseFileName="$(OutDir)\"

                                 WarningLevel="3"

                                 SuppressStartupBanner="true"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="1"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

@@ -368,8 +368,7 @@
                         />

                         <Tool

                                 Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

-                                AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

+                                AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"

                                 OutputFile="$(OutDir)\zlibstat.lib"

                                 SuppressStartupBanner="true"

                         />

@@ -390,9 +389,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Release|Itanium"

-                        OutputDirectory="ia64\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"

+                        Name="Release|x64"

+                        OutputDirectory="x64\ZlibStat$(ConfigurationName)"

+                        IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"

                         ConfigurationType="4"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

@@ -412,13 +411,13 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="2"

+                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

+                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64"

                                 StringPooling="true"

                                 ExceptionHandling="0"

                                 RuntimeLibrary="2"

@@ -443,7 +442,8 @@
                         />

                         <Tool

                                 Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"

+                                AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"

+                                AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

                                 OutputFile="$(OutDir)\zlibstat.lib"

                                 SuppressStartupBanner="true"

                         />

@@ -464,9 +464,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="ReleaseWithoutAsm|Win32"

-                        OutputDirectory="x86\ZlibStat$(ConfigurationName)"

-                        IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"

+                        Name="Release|Itanium"

+                        OutputDirectory="ia64\ZlibStat$(ConfigurationName)"

+                        IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"

                         ConfigurationType="4"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

@@ -486,15 +486,16 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

+                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

                                 StringPooling="true"

                                 ExceptionHandling="0"

-                                RuntimeLibrary="0"

+                                RuntimeLibrary="2"

                                 BufferSecurityCheck="false"

                                 EnableFunctionLevelLinking="true"

                                 PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"

@@ -516,7 +517,7 @@
                         />

                         <Tool

                                 Name="VCLibrarianTool"

-                                AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"

+                                AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"

                                 OutputFile="$(OutDir)\zlibstat.lib"

                                 SuppressStartupBanner="true"

                         />

@@ -565,7 +566,7 @@
                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

+                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

                                 StringPooling="true"

                                 ExceptionHandling="0"

                                 RuntimeLibrary="2"

@@ -639,7 +640,7 @@
                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

+                                PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"

                                 StringPooling="true"

                                 ExceptionHandling="0"

                                 RuntimeLibrary="2"

@@ -760,19 +761,24 @@
                                 </FileConfiguration>

                         </File>

                         <File

-                                RelativePath="..\..\..\gzclose.c">

+                                RelativePath="..\..\..\gzclose.c"

+                                >

                         </File>

                         <File

-                                RelativePath="..\..\..\gzio.c">

+                                RelativePath="..\..\..\gzio.c"

+                                >

                         </File>

                         <File

-                                RelativePath="..\..\..\gzlib.c">

+                                RelativePath="..\..\..\gzlib.c"

+                                >

                         </File>

                         <File

-                                RelativePath="..\..\..\gzread.c">

+                                RelativePath="..\..\..\gzread.c"

+                                >

                         </File>

                         <File

-                                RelativePath="..\..\..\gzwrite.c">

+                                RelativePath="..\..\..\gzwrite.c"

+                                >

                         </File>

                         <File

                                 RelativePath="..\..\..\infback.c"

@@ -790,7 +796,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="Debug|Itanium"

+                                        Name="Release|Win32"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -798,7 +804,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="Release|Win32"

+                                        Name="ReleaseWithoutAsm|Win32"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -806,7 +812,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="Release|Itanium"

+                                        Name="Debug|Itanium"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -814,7 +820,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Win32"

+                                        Name="Release|Itanium"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

diff --git a/contrib/contrib/vstudio/vc8/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index de70122..0b6a9e9 100644
--- a/contrib/contrib/vstudio/vc8/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -93,3 +93,22 @@ EXPORTS
         fill_win32_filefunc64                    @111

         fill_win32_filefunc64A                   @112

         fill_win32_filefunc64W                   @113

+

+; quick hack by hkuno@microhouse.co.jp

+        unzOpen64                         @120

+        unzOpen2_64                       @121

+        unzGetGlobalInfo64                @122

+        unzGetCurrentFileInfo64           @124

+        unzGetCurrentFileZStreamPos64     @125

+        unztell64                         @126

+        unzGetFilePos64                   @127

+        unzGoToFilePos64                  @128

+

+        zipOpen64                         @130

+        zipOpen2_64                       @131

+        zipOpenNewFileInZip64             @132

+        zipOpenNewFileInZip2_64           @133

+        zipOpenNewFileInZip3_64           @134

+        zipOpenNewFileInZip4_64           @135

+        zipCloseFileInZipRaw64            @136

+; end hack

diff --git a/contrib/vstudio/vc8/zlibvc.sln b/contrib/vstudio/vc9/zlibvc.sln
index a815a55..c7f1b0b 100644
--- a/contrib/vstudio/vc8/zlibvc.sln
+++ b/contrib/vstudio/vc9/zlibvc.sln
@@ -1,6 +1,6 @@
 

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"

diff --git a/contrib/contrib/vstudio/vc8/zlibvc.vcproj b/contrib/vstudio/vc9/zlibvc.vcproj
index 91e966d..ee86786 100644
--- a/contrib/contrib/vstudio/vc8/zlibvc.vcproj
+++ b/contrib/vstudio/vc9/zlibvc.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

         ProjectType="Visual C++"

-        Version="8,00"

+        Version="9.00"

         Name="zlibvc"

         ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}"

+        TargetFrameworkVersion="131072"

         >

         <Platforms>

                 <Platform

@@ -52,7 +53,7 @@
                                 Name="VCCLCompilerTool"

                                 Optimization="0"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf,ASMV,ASMINF"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"

                                 ExceptionHandling="0"

                                 RuntimeLibrary="1"

                                 BufferSecurityCheck="false"

@@ -90,6 +91,8 @@
                                 GenerateMapFile="true"

                                 MapFileName="$(OutDir)/zlibwapi.map"

                                 SubSystem="2"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

                                 ImportLibrary="$(OutDir)/zlibwapi.lib"

                         />

                         <Tool

@@ -111,20 +114,18 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|x64"

-                        OutputDirectory="x64\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"

+                        Name="ReleaseWithoutAsm|Win32"

+                        OutputDirectory="x86\ZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="2"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

                         ATLMinimizesCRunTimeLibraryUsage="false"

+                        WholeProgramOptimization="1"

                         >

                         <Tool

                                 Name="VCPreBuildEventTool"

@@ -140,35 +141,37 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                PreprocessorDefinitions="_DEBUG"

+                                PreprocessorDefinitions="NDEBUG"

                                 MkTypLibCompatible="true"

                                 SuppressStartupBanner="true"

-                                TargetEnvironment="3"

+                                TargetEnvironment="1"

                                 TypeLibraryName="$(OutDir)/zlibvc.tlb"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="0"

+                                InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf,ASMV,ASMINF;WIN64"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"

+                                StringPooling="true"

                                 ExceptionHandling="0"

-                                RuntimeLibrary="3"

+                                RuntimeLibrary="2"

                                 BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

+                                AssemblerOutput="2"

                                 AssemblerListingLocation="$(IntDir)\"

                                 ObjectFile="$(IntDir)\"

                                 ProgramDataBaseFileName="$(OutDir)\"

                                 BrowseInformation="0"

                                 WarningLevel="3"

                                 SuppressStartupBanner="true"

-                                DebugInformationFormat="3"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

                         />

                         <Tool

                                 Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="_DEBUG"

+                                PreprocessorDefinitions="NDEBUG"

                                 Culture="1036"

                         />

                         <Tool

@@ -176,19 +179,21 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

+                                AdditionalOptions="/MACHINE:I386"

                                 OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="2"

+                                LinkIncremental="1"

                                 SuppressStartupBanner="true"

                                 GenerateManifest="false"

+                                IgnoreAllDefaultLibraries="false"

                                 ModuleDefinitionFile=".\zlibvc.def"

-                                GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

                                 GenerateMapFile="true"

                                 MapFileName="$(OutDir)/zlibwapi.map"

                                 SubSystem="2"

+                                OptimizeForWindows98="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

                                 ImportLibrary="$(OutDir)/zlibwapi.lib"

-                                TargetMachine="17"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -209,20 +214,18 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|Itanium"

-                        OutputDirectory="ia64\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"

+                        Name="Release|Win32"

+                        OutputDirectory="x86\ZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="2"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

                         ATLMinimizesCRunTimeLibraryUsage="false"

+                        WholeProgramOptimization="1"

                         >

                         <Tool

                                 Name="VCPreBuildEventTool"

@@ -238,35 +241,37 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                PreprocessorDefinitions="_DEBUG"

+                                PreprocessorDefinitions="NDEBUG"

                                 MkTypLibCompatible="true"

                                 SuppressStartupBanner="true"

-                                TargetEnvironment="2"

+                                TargetEnvironment="1"

                                 TypeLibraryName="$(OutDir)/zlibvc.tlb"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="0"

+                                InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;WIN64"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"

+                                StringPooling="true"

                                 ExceptionHandling="0"

-                                RuntimeLibrary="3"

+                                RuntimeLibrary="2"

                                 BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

+                                AssemblerOutput="2"

                                 AssemblerListingLocation="$(IntDir)\"

                                 ObjectFile="$(IntDir)\"

                                 ProgramDataBaseFileName="$(OutDir)\"

                                 BrowseInformation="0"

                                 WarningLevel="3"

                                 SuppressStartupBanner="true"

-                                DebugInformationFormat="3"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

                         />

                         <Tool

                                 Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="_DEBUG"

+                                PreprocessorDefinitions="NDEBUG"

                                 Culture="1036"

                         />

                         <Tool

@@ -274,18 +279,22 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

+                                AdditionalOptions="/MACHINE:I386"

+                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "

                                 OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="2"

+                                LinkIncremental="1"

                                 SuppressStartupBanner="true"

                                 GenerateManifest="false"

+                                IgnoreAllDefaultLibraries="false"

                                 ModuleDefinitionFile=".\zlibvc.def"

-                                GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

                                 GenerateMapFile="true"

                                 MapFileName="$(OutDir)/zlibwapi.map"

                                 SubSystem="2"

+                                OptimizeForWindows98="1"

+                                RandomizedBaseAddress="1"

+                                DataExecutionPrevention="0"

                                 ImportLibrary="$(OutDir)/zlibwapi.lib"

-                                TargetMachine="5"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -306,21 +315,17 @@
                                 Name="VCAppVerifierTool"

                         />

                         <Tool

-                                Name="VCWebDeploymentTool"

-                        />

-                        <Tool

                                 Name="VCPostBuildEventTool"

                         />

                 </Configuration>

                 <Configuration

-                        Name="ReleaseWithoutAsm|Win32"

-                        OutputDirectory="x86\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"

+                        Name="Debug|x64"

+                        OutputDirectory="x64\ZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="2"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

                         ATLMinimizesCRunTimeLibraryUsage="false"

-                        WholeProgramOptimization="1"

                         >

                         <Tool

                                 Name="VCPreBuildEventTool"

@@ -336,37 +341,35 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

+                                PreprocessorDefinitions="_DEBUG"

                                 MkTypLibCompatible="true"

                                 SuppressStartupBanner="true"

-                                TargetEnvironment="1"

+                                TargetEnvironment="3"

                                 TypeLibraryName="$(OutDir)/zlibvc.tlb"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

+                                Optimization="0"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf"

-                                StringPooling="true"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"

                                 ExceptionHandling="0"

-                                RuntimeLibrary="2"

+                                RuntimeLibrary="3"

                                 BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

                                 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerOutput="2"

                                 AssemblerListingLocation="$(IntDir)\"

                                 ObjectFile="$(IntDir)\"

                                 ProgramDataBaseFileName="$(OutDir)\"

                                 BrowseInformation="0"

                                 WarningLevel="3"

                                 SuppressStartupBanner="true"

+                                DebugInformationFormat="3"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

                         />

                         <Tool

                                 Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

+                                PreprocessorDefinitions="_DEBUG"

                                 Culture="1036"

                         />

                         <Tool

@@ -374,19 +377,19 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalOptions="/MACHINE:I386"

+                                AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "

                                 OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="1"

+                                LinkIncremental="2"

                                 SuppressStartupBanner="true"

                                 GenerateManifest="false"

-                                IgnoreAllDefaultLibraries="false"

                                 ModuleDefinitionFile=".\zlibvc.def"

+                                GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

                                 GenerateMapFile="true"

                                 MapFileName="$(OutDir)/zlibwapi.map"

                                 SubSystem="2"

-                                OptimizeForWindows98="1"

                                 ImportLibrary="$(OutDir)/zlibwapi.lib"

+                                TargetMachine="17"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -414,14 +417,13 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="ReleaseWithoutAsm|x64"

-                        OutputDirectory="x64\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"

+                        Name="Debug|Itanium"

+                        OutputDirectory="ia64\ZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="2"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

                         ATLMinimizesCRunTimeLibraryUsage="false"

-                        WholeProgramOptimization="1"

                         >

                         <Tool

                                 Name="VCPreBuildEventTool"

@@ -437,37 +439,35 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                PreprocessorDefinitions="NDEBUG"

+                                PreprocessorDefinitions="_DEBUG"

                                 MkTypLibCompatible="true"

                                 SuppressStartupBanner="true"

-                                TargetEnvironment="3"

+                                TargetEnvironment="2"

                                 TypeLibraryName="$(OutDir)/zlibvc.tlb"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                InlineFunctionExpansion="1"

+                                Optimization="0"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf;WIN64"

-                                StringPooling="true"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

                                 ExceptionHandling="0"

-                                RuntimeLibrary="2"

+                                RuntimeLibrary="3"

                                 BufferSecurityCheck="false"

-                                EnableFunctionLevelLinking="true"

                                 PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"

-                                AssemblerOutput="2"

                                 AssemblerListingLocation="$(IntDir)\"

                                 ObjectFile="$(IntDir)\"

                                 ProgramDataBaseFileName="$(OutDir)\"

                                 BrowseInformation="0"

                                 WarningLevel="3"

                                 SuppressStartupBanner="true"

+                                DebugInformationFormat="3"

                         />

                         <Tool

                                 Name="VCManagedResourceCompilerTool"

                         />

                         <Tool

                                 Name="VCResourceCompilerTool"

-                                PreprocessorDefinitions="NDEBUG"

+                                PreprocessorDefinitions="_DEBUG"

                                 Culture="1036"

                         />

                         <Tool

@@ -476,18 +476,17 @@
                         <Tool

                                 Name="VCLinkerTool"

                                 OutputFile="$(OutDir)\zlibwapi.dll"

-                                LinkIncremental="1"

+                                LinkIncremental="2"

                                 SuppressStartupBanner="true"

                                 GenerateManifest="false"

-                                IgnoreAllDefaultLibraries="false"

                                 ModuleDefinitionFile=".\zlibvc.def"

+                                GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"

                                 GenerateMapFile="true"

                                 MapFileName="$(OutDir)/zlibwapi.map"

                                 SubSystem="2"

-                                OptimizeForWindows98="1"

                                 ImportLibrary="$(OutDir)/zlibwapi.lib"

-                                TargetMachine="17"

+                                TargetMachine="5"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -515,9 +514,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="ReleaseWithoutAsm|Itanium"

-                        OutputDirectory="ia64\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"

+                        Name="ReleaseWithoutAsm|x64"

+                        OutputDirectory="x64\ZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="2"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

@@ -541,14 +540,14 @@
                                 PreprocessorDefinitions="NDEBUG"

                                 MkTypLibCompatible="true"

                                 SuppressStartupBanner="true"

-                                TargetEnvironment="2"

+                                TargetEnvironment="3"

                                 TypeLibraryName="$(OutDir)/zlibvc.tlb"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf;WIN64"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

                                 StringPooling="true"

                                 ExceptionHandling="0"

                                 RuntimeLibrary="2"

@@ -588,7 +587,7 @@
                                 SubSystem="2"

                                 OptimizeForWindows98="1"

                                 ImportLibrary="$(OutDir)/zlibwapi.lib"

-                                TargetMachine="5"

+                                TargetMachine="17"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -616,9 +615,9 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="x86\ZlibDll$(ConfigurationName)"

-                        IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"

+                        Name="ReleaseWithoutAsm|Itanium"

+                        OutputDirectory="ia64\ZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="2"

                         InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         UseOfMFC="0"

@@ -642,14 +641,14 @@
                                 PreprocessorDefinitions="NDEBUG"

                                 MkTypLibCompatible="true"

                                 SuppressStartupBanner="true"

-                                TargetEnvironment="1"

+                                TargetEnvironment="2"

                                 TypeLibraryName="$(OutDir)/zlibvc.tlb"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;ASMV;ASMINF"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

                                 StringPooling="true"

                                 ExceptionHandling="0"

                                 RuntimeLibrary="2"

@@ -677,8 +676,6 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalOptions="/MACHINE:I386"

-                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "

                                 OutputFile="$(OutDir)\zlibwapi.dll"

                                 LinkIncremental="1"

                                 SuppressStartupBanner="true"

@@ -691,6 +688,7 @@
                                 SubSystem="2"

                                 OptimizeForWindows98="1"

                                 ImportLibrary="$(OutDir)/zlibwapi.lib"

+                                TargetMachine="5"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -751,7 +749,7 @@
                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;ASMV;ASMINF;WIN64"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"

                                 StringPooling="true"

                                 ExceptionHandling="0"

                                 RuntimeLibrary="2"

@@ -853,7 +851,7 @@
                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

                                 AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

-                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;WIN64"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"

                                 StringPooling="true"

                                 ExceptionHandling="0"

                                 RuntimeLibrary="2"

@@ -948,7 +946,7 @@
                                 RelativePath="..\..\masmx86\gvmat32c.c"

                                 >

                                 <FileConfiguration

-                                        Name="Debug|x64"

+                                        Name="ReleaseWithoutAsm|Win32"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -956,7 +954,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="Debug|Itanium"

+                                        Name="Debug|x64"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -964,7 +962,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Win32"

+                                        Name="Debug|Itanium"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -1005,19 +1003,24 @@
                                 </FileConfiguration>

                         </File>

                         <File

-                                RelativePath="..\..\..\gzclose.c">

+                                RelativePath="..\..\..\gzclose.c"

+                                >

                         </File>

                         <File

-                                RelativePath="..\..\..\gzio.c">

+                                RelativePath="..\..\..\gzio.c"

+                                >

                         </File>

                         <File

-                                RelativePath="..\..\..\gzlib.c">

+                                RelativePath="..\..\..\gzlib.c"

+                                >

                         </File>

                         <File

-                                RelativePath="..\..\..\gzread.c">

+                                RelativePath="..\..\..\gzread.c"

+                                >

                         </File>

                         <File

-                                RelativePath="..\..\..\gzwrite.c">

+                                RelativePath="..\..\..\gzwrite.c"

+                                >

                         </File>

                         <File

                                 RelativePath="..\..\..\infback.c"

@@ -1035,7 +1038,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="Debug|Itanium"

+                                        Name="ReleaseWithoutAsm|Win32"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -1043,7 +1046,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Win32"

+                                        Name="Release|Win32"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -1051,7 +1054,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="ReleaseWithoutAsm|Itanium"

+                                        Name="Debug|Itanium"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool

@@ -1059,7 +1062,7 @@
                                         />

                                 </FileConfiguration>

                                 <FileConfiguration

-                                        Name="Release|Win32"

+                                        Name="ReleaseWithoutAsm|Itanium"

                                         ExcludedFromBuild="true"

                                         >

                                         <Tool