65 files changed, 11095 insertions, 6683 deletions

diff --git a/ChangeLog b/ChangeLog
index 105a7cb..7f6869d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.3 (18 July 2005)
+- Apply security vulnerability fixes to contrib/infback9 as well
+- Clean up some text files (carriage returns, trailing space)
+- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
+
 Changes in 1.2.2.4 (11 July 2005)
 - Add inflatePrime() function for starting inflation at bit boundary
 - Avoid some Visual C warnings in deflate.c
diff --git a/Makefile b/Makefile
index 26f63cd..2fd6e45 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CPP=$(CC) -E
 
 LIBS=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.2.4
+SHAREDLIBV=libz.so.1.2.3
 SHAREDLIBM=libz.so.1
 
 AR=ar rc
diff --git a/Makefile.in b/Makefile.in
index 26f63cd..2fd6e45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,7 +30,7 @@ CPP=$(CC) -E
 
 LIBS=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.2.4
+SHAREDLIBV=libz.so.1.2.3
 SHAREDLIBM=libz.so.1
 
 AR=ar rc
diff --git a/README b/README
index 3c8e1d4..758cc50 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.2.4 is a general purpose data compression library.  All the code is
+zlib 1.2.3 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -33,7 +33,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
 issue of  Dr. Dobb's Journal; a copy of the article is available in
 http://dogma.net/markn/articles/zlibtool/zlibtool.htm
 
-The changes made in version 1.2.2.4 are documented in the file ChangeLog.
+The changes made in version 1.2.3 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory "contrib".
 
diff --git a/amiga/Makefile.sas b/amiga/Makefile.sas
index d6842b8..296ef48 100644
--- a/amiga/Makefile.sas
+++ b/amiga/Makefile.sas
@@ -23,7 +23,7 @@ all: SCOPTIONS example minigzip
 check: test
 test: all
         example
-        echo hello world | minigzip | minigzip -d 
+        echo hello world | minigzip | minigzip -d
 
 install: z.lib
         copy clone zlib.h zconf.h INCLUDE:
diff --git a/as400/compile.clp b/as400/compile.clp
index 3c47bb4..8554951 100644
--- a/as400/compile.clp
+++ b/as400/compile.clp
@@ -118,6 +118,6 @@
                                  &MODLIB/INFTREES    &MODLIB/TREES       +
                                  &MODLIB/UNCOMPR     &MODLIB/ZUTIL)      +
                           SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC) +
-                          TEXT('ZLIB 1.2.2') TGTRLS(V4R4M0)
+                          TEXT('ZLIB 1.2.3') TGTRLS(V4R4M0)
 
              ENDPGM
diff --git a/as400/readme.txt b/as400/readme.txt
index 27ca676..beae13f 100644
--- a/as400/readme.txt
+++ b/as400/readme.txt
@@ -1,4 +1,4 @@
-        ZLIB version 1.2.2 for AS400 installation instructions
+        ZLIB version 1.2.3 for AS400 installation instructions
 
 I) From an AS400 *SAVF file:
 
diff --git a/as400/zlib.inc b/as400/zlib.inc
index 263677d..7bbfb7e 100644
--- a/as400/zlib.inc
+++ b/as400/zlib.inc
@@ -1,7 +1,7 @@
       *  ZLIB.INC - Interface to the general purpose compression library
       *
       *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
-      *  Version 1.2.2.4
+      *  Version 1.2.3
       *
       *
       *  WARNING:
@@ -22,8 +22,8 @@
       *
       *  Versioning information.
       *
-     D ZLIB_VERSION    C                   '1.2.2.4'
-     D ZLIB_VERNUM     C                   X'1224'
+     D ZLIB_VERSION    C                   '1.2.3'
+     D ZLIB_VERNUM     C                   X'1230'
       *
       *  Other equates.
       *
diff --git a/contrib/asm586/match.S b/contrib/asm586/match.S
index 371c9a0..0368b35 100644
--- a/contrib/asm586/match.S
+++ b/contrib/asm586/match.S
@@ -1,364 +1,364 @@
-/* match.s -- Pentium-optimized version of longest_match()

- * Written for zlib 1.1.2

- * Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>

- *

- * This is free software; you can redistribute it and/or modify it

- * under the terms of the GNU General Public License.

- */

-

-#ifndef NO_UNDERLINE

-#define match_init      _match_init

-#define longest_match   _longest_match

-#endif

-

-#define MAX_MATCH       (258)

-#define MIN_MATCH       (3)

-#define MIN_LOOKAHEAD   (MAX_MATCH + MIN_MATCH + 1)

-#define MAX_MATCH_8     ((MAX_MATCH + 7) & ~7)

-

-/* stack frame offsets */

-

-#define wmask                   0       /* local copy of s->wmask       */

-#define window                  4       /* local copy of s->window      */

-#define windowbestlen           8       /* s->window + bestlen          */

-#define chainlenscanend         12      /* high word: current chain len */

-                                        /* low word: last bytes sought  */

-#define scanstart               16      /* first two bytes of string    */

-#define scanalign               20      /* dword-misalignment of string */

-#define nicematch               24      /* a good enough match size     */

-#define bestlen                 28      /* size of best match so far    */

-#define scan                    32      /* ptr to string wanting match  */

-

-#define LocalVarsSize           (36)

-/*      saved ebx               36 */

-/*      saved edi               40 */

-/*      saved esi               44 */

-/*      saved ebp               48 */

-/*      return address          52 */

-#define deflatestate            56      /* the function arguments       */

-#define curmatch                60

-

-/* Offsets for fields in the deflate_state structure. These numbers

- * are calculated from the definition of deflate_state, with the

- * assumption that the compiler will dword-align the fields. (Thus,

- * changing the definition of deflate_state could easily cause this

- * program to crash horribly, without so much as a warning at

- * compile time. Sigh.)

- */

-

-/* All the +zlib1222add offsets are due to the addition of fields

- *  in zlib in the deflate_state structure since the asm code was first written

- * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").

- * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").

- * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").

- */

-

-#define zlib1222add             (8)

-

-#define dsWSize                 (36+zlib1222add)

-#define dsWMask                 (44+zlib1222add)

-#define dsWindow                (48+zlib1222add)

-#define dsPrev                  (56+zlib1222add)

-#define dsMatchLen              (88+zlib1222add)

-#define dsPrevMatch             (92+zlib1222add)

-#define dsStrStart              (100+zlib1222add)

-#define dsMatchStart            (104+zlib1222add)

-#define dsLookahead             (108+zlib1222add)

-#define dsPrevLen               (112+zlib1222add)

-#define dsMaxChainLen           (116+zlib1222add)

-#define dsGoodMatch             (132+zlib1222add)

-#define dsNiceMatch             (136+zlib1222add)

-

-

-.file "match.S"

-

-.globl  match_init, longest_match

-

-.text

-

-/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */

-

-longest_match:

-

-/* Save registers that the compiler may be using, and adjust %esp to    */

-/* make room for our stack frame.                                       */

-

-                pushl   %ebp

-                pushl   %edi

-                pushl   %esi

-                pushl   %ebx

-                subl    $LocalVarsSize, %esp

-

-/* Retrieve the function arguments. %ecx will hold cur_match            */

-/* throughout the entire function. %edx will hold the pointer to the    */

-/* deflate_state structure during the function's setup (before          */

-/* entering the main loop).                                             */

-

-                movl    deflatestate(%esp), %edx

-                movl    curmatch(%esp), %ecx

-

-/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;      */

-

-                movl    dsNiceMatch(%edx), %eax

-                movl    dsLookahead(%edx), %ebx

-                cmpl    %eax, %ebx

-                jl      LookaheadLess

-                movl    %eax, %ebx

-LookaheadLess:  movl    %ebx, nicematch(%esp)

-

-/* register Bytef *scan = s->window + s->strstart;                      */

-

-                movl    dsWindow(%edx), %esi

-                movl    %esi, window(%esp)

-                movl    dsStrStart(%edx), %ebp

-                lea     (%esi,%ebp), %edi

-                movl    %edi, scan(%esp)

-

-/* Determine how many bytes the scan ptr is off from being              */

-/* dword-aligned.                                                       */

-

-                movl    %edi, %eax

-                negl    %eax

-                andl    $3, %eax

-                movl    %eax, scanalign(%esp)

-

-/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?                       */

-/*     s->strstart - (IPos)MAX_DIST(s) : NIL;                           */

-

-                movl    dsWSize(%edx), %eax

-                subl    $MIN_LOOKAHEAD, %eax

-                subl    %eax, %ebp

-                jg      LimitPositive

-                xorl    %ebp, %ebp

-LimitPositive:

-

-/* unsigned chain_length = s->max_chain_length;                         */

-/* if (s->prev_length >= s->good_match) {                               */

-/*     chain_length >>= 2;                                              */

-/* }                                                                    */

-

-                movl    dsPrevLen(%edx), %eax

-                movl    dsGoodMatch(%edx), %ebx

-                cmpl    %ebx, %eax

-                movl    dsMaxChainLen(%edx), %ebx

-                jl      LastMatchGood

-                shrl    $2, %ebx

-LastMatchGood:

-

-/* chainlen is decremented once beforehand so that the function can     */

-/* use the sign flag instead of the zero flag for the exit test.        */

-/* It is then shifted into the high word, to make room for the scanend  */

-/* scanend value, which it will always accompany.                       */

-

-                decl    %ebx

-                shll    $16, %ebx

-

-/* int best_len = s->prev_length;                                       */

-

-                movl    dsPrevLen(%edx), %eax

-                movl    %eax, bestlen(%esp)

-

-/* Store the sum of s->window + best_len in %esi locally, and in %esi.  */

-

-                addl    %eax, %esi

-                movl    %esi, windowbestlen(%esp)

-

-/* register ush scan_start = *(ushf*)scan;                              */

-/* register ush scan_end   = *(ushf*)(scan+best_len-1);                 */

-

-                movw    (%edi), %bx

-                movw    %bx, scanstart(%esp)

-                movw    -1(%edi,%eax), %bx

-                movl    %ebx, chainlenscanend(%esp)

-

-/* Posf *prev = s->prev;                                                */

-/* uInt wmask = s->w_mask;                                              */

-

-                movl    dsPrev(%edx), %edi

-                movl    dsWMask(%edx), %edx

-                mov     %edx, wmask(%esp)

-

-/* Jump into the main loop.                                             */

-

-                jmp     LoopEntry

-

-.balign 16

-

-/* do {

- *     match = s->window + cur_match;

- *     if (*(ushf*)(match+best_len-1) != scan_end ||

- *         *(ushf*)match != scan_start) continue;

- *     [...]

- * } while ((cur_match = prev[cur_match & wmask]) > limit

- *          && --chain_length != 0);

- *

- * Here is the inner loop of the function. The function will spend the

- * majority of its time in this loop, and majority of that time will

- * be spent in the first ten instructions.

- *

- * Within this loop:

- * %ebx = chainlenscanend - i.e., ((chainlen << 16) | scanend)

- * %ecx = curmatch

- * %edx = curmatch & wmask

- * %esi = windowbestlen - i.e., (window + bestlen)

- * %edi = prev

- * %ebp = limit

- *

- * Two optimization notes on the choice of instructions:

- *

- * The first instruction uses a 16-bit address, which costs an extra,

- * unpairable cycle. This is cheaper than doing a 32-bit access and

- * zeroing the high word, due to the 3-cycle misalignment penalty which

- * would occur half the time. This also turns out to be cheaper than

- * doing two separate 8-bit accesses, as the memory is so rarely in the

- * L1 cache.

- *

- * The window buffer, however, apparently spends a lot of time in the

- * cache, and so it is faster to retrieve the word at the end of the

- * match string with two 8-bit loads. The instructions that test the

- * word at the beginning of the match string, however, are executed

- * much less frequently, and there it was cheaper to use 16-bit

- * instructions, which avoided the necessity of saving off and

- * subsequently reloading one of the other registers.

- */

-LookupLoop:

-                                                        /* 1 U & V  */

-                movw    (%edi,%edx,2), %cx              /* 2 U pipe */

-                movl    wmask(%esp), %edx               /* 2 V pipe */

-                cmpl    %ebp, %ecx                      /* 3 U pipe */

-                jbe     LeaveNow                        /* 3 V pipe */

-                subl    $0x00010000, %ebx               /* 4 U pipe */

-                js      LeaveNow                        /* 4 V pipe */

-LoopEntry:      movb    -1(%esi,%ecx), %al              /* 5 U pipe */

-                andl    %ecx, %edx                      /* 5 V pipe */

-                cmpb    %bl, %al                        /* 6 U pipe */

-                jnz     LookupLoop                      /* 6 V pipe */

-                movb    (%esi,%ecx), %ah

-                cmpb    %bh, %ah

-                jnz     LookupLoop

-                movl    window(%esp), %eax

-                movw    (%eax,%ecx), %ax

-                cmpw    scanstart(%esp), %ax

-                jnz     LookupLoop

-

-/* Store the current value of chainlen.                                 */

-

-                movl    %ebx, chainlenscanend(%esp)

-

-/* Point %edi to the string under scrutiny, and %esi to the string we   */

-/* are hoping to match it up with. In actuality, %esi and %edi are      */

-/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is      */

-/* initialized to -(MAX_MATCH_8 - scanalign).                           */

-

-                movl    window(%esp), %esi

-                movl    scan(%esp), %edi

-                addl    %ecx, %esi

-                movl    scanalign(%esp), %eax

-                movl    $(-MAX_MATCH_8), %edx

-                lea     MAX_MATCH_8(%edi,%eax), %edi

-                lea     MAX_MATCH_8(%esi,%eax), %esi

-

-/* Test the strings for equality, 8 bytes at a time. At the end,

- * adjust %edx so that it is offset to the exact byte that mismatched.

- *

- * We already know at this point that the first three bytes of the

- * strings match each other, and they can be safely passed over before

- * starting the compare loop. So what this code does is skip over 0-3

- * bytes, as much as necessary in order to dword-align the %edi

- * pointer. (%esi will still be misaligned three times out of four.)

- *

- * It should be confessed that this loop usually does not represent

- * much of the total running time. Replacing it with a more

- * straightforward "rep cmpsb" would not drastically degrade

- * performance.

- */

-LoopCmps:

-                movl    (%esi,%edx), %eax

-                movl    (%edi,%edx), %ebx

-                xorl    %ebx, %eax

-                jnz     LeaveLoopCmps

-                movl    4(%esi,%edx), %eax

-                movl    4(%edi,%edx), %ebx

-                xorl    %ebx, %eax

-                jnz     LeaveLoopCmps4

-                addl    $8, %edx

-                jnz     LoopCmps

-                jmp     LenMaximum

-LeaveLoopCmps4: addl    $4, %edx

-LeaveLoopCmps:  testl   $0x0000FFFF, %eax

-                jnz     LenLower

-                addl    $2, %edx

-                shrl    $16, %eax

-LenLower:       subb    $1, %al

-                adcl    $0, %edx

-

-/* Calculate the length of the match. If it is longer than MAX_MATCH,   */

-/* then automatically accept it as the best possible match and leave.   */

-

-                lea     (%edi,%edx), %eax

-                movl    scan(%esp), %edi

-                subl    %edi, %eax

-                cmpl    $MAX_MATCH, %eax

-                jge     LenMaximum

-

-/* If the length of the match is not longer than the best match we      */

-/* have so far, then forget it and return to the lookup loop.           */

-

-                movl    deflatestate(%esp), %edx

-                movl    bestlen(%esp), %ebx

-                cmpl    %ebx, %eax

-                jg      LongerMatch

-                movl    chainlenscanend(%esp), %ebx

-                movl    windowbestlen(%esp), %esi

-                movl    dsPrev(%edx), %edi

-                movl    wmask(%esp), %edx

-                andl    %ecx, %edx

-                jmp     LookupLoop

-

-/*         s->match_start = cur_match;                                  */

-/*         best_len = len;                                              */

-/*         if (len >= nice_match) break;                                */

-/*         scan_end = *(ushf*)(scan+best_len-1);                        */

-

-LongerMatch:    movl    nicematch(%esp), %ebx

-                movl    %eax, bestlen(%esp)

-                movl    %ecx, dsMatchStart(%edx)

-                cmpl    %ebx, %eax

-                jge     LeaveNow

-                movl    window(%esp), %esi

-                addl    %eax, %esi

-                movl    %esi, windowbestlen(%esp)

-                movl    chainlenscanend(%esp), %ebx

-                movw    -1(%edi,%eax), %bx

-                movl    dsPrev(%edx), %edi

-                movl    %ebx, chainlenscanend(%esp)

-                movl    wmask(%esp), %edx

-                andl    %ecx, %edx

-                jmp     LookupLoop

-

-/* Accept the current string, with the maximum possible length.         */

-

-LenMaximum:     movl    deflatestate(%esp), %edx

-                movl    $MAX_MATCH, bestlen(%esp)

-                movl    %ecx, dsMatchStart(%edx)

-

-/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;           */

-/* return s->lookahead;                                                 */

-

-LeaveNow:

-                movl    deflatestate(%esp), %edx

-                movl    bestlen(%esp), %ebx

-                movl    dsLookahead(%edx), %eax

-                cmpl    %eax, %ebx

-                jg      LookaheadRet

-                movl    %ebx, %eax

-LookaheadRet:

-

-/* Restore the stack and return from whence we came.                    */

-

-                addl    $LocalVarsSize, %esp

-                popl    %ebx

-                popl    %esi

-                popl    %edi

-                popl    %ebp

-match_init:     ret

+/* match.s -- Pentium-optimized version of longest_match()
+ * Written for zlib 1.1.2
+ * Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License.
+ */
+
+#ifndef NO_UNDERLINE
+#define match_init      _match_init
+#define longest_match   _longest_match
+#endif
+
+#define MAX_MATCH       (258)
+#define MIN_MATCH       (3)
+#define MIN_LOOKAHEAD   (MAX_MATCH + MIN_MATCH + 1)
+#define MAX_MATCH_8     ((MAX_MATCH + 7) & ~7)
+
+/* stack frame offsets */
+
+#define wmask                   0       /* local copy of s->wmask       */
+#define window                  4       /* local copy of s->window      */
+#define windowbestlen           8       /* s->window + bestlen          */
+#define chainlenscanend         12      /* high word: current chain len */
+                                        /* low word: last bytes sought  */
+#define scanstart               16      /* first two bytes of string    */
+#define scanalign               20      /* dword-misalignment of string */
+#define nicematch               24      /* a good enough match size     */
+#define bestlen                 28      /* size of best match so far    */
+#define scan                    32      /* ptr to string wanting match  */
+
+#define LocalVarsSize           (36)
+/*      saved ebx               36 */
+/*      saved edi               40 */
+/*      saved esi               44 */
+/*      saved ebp               48 */
+/*      return address          52 */
+#define deflatestate            56      /* the function arguments       */
+#define curmatch                60
+
+/* Offsets for fields in the deflate_state structure. These numbers
+ * are calculated from the definition of deflate_state, with the
+ * assumption that the compiler will dword-align the fields. (Thus,
+ * changing the definition of deflate_state could easily cause this
+ * program to crash horribly, without so much as a warning at
+ * compile time. Sigh.)
+ */
+
+/* All the +zlib1222add offsets are due to the addition of fields
+ *  in zlib in the deflate_state structure since the asm code was first written
+ * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
+ * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
+ * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
+ */
+
+#define zlib1222add             (8)
+
+#define dsWSize                 (36+zlib1222add)
+#define dsWMask                 (44+zlib1222add)
+#define dsWindow                (48+zlib1222add)
+#define dsPrev                  (56+zlib1222add)
+#define dsMatchLen              (88+zlib1222add)
+#define dsPrevMatch             (92+zlib1222add)
+#define dsStrStart              (100+zlib1222add)
+#define dsMatchStart            (104+zlib1222add)
+#define dsLookahead             (108+zlib1222add)
+#define dsPrevLen               (112+zlib1222add)
+#define dsMaxChainLen           (116+zlib1222add)
+#define dsGoodMatch             (132+zlib1222add)
+#define dsNiceMatch             (136+zlib1222add)
+
+
+.file "match.S"
+
+.globl  match_init, longest_match
+
+.text
+
+/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
+
+longest_match:
+
+/* Save registers that the compiler may be using, and adjust %esp to    */
+/* make room for our stack frame.                                       */
+
+                pushl   %ebp
+                pushl   %edi
+                pushl   %esi
+                pushl   %ebx
+                subl    $LocalVarsSize, %esp
+
+/* Retrieve the function arguments. %ecx will hold cur_match            */
+/* throughout the entire function. %edx will hold the pointer to the    */
+/* deflate_state structure during the function's setup (before          */
+/* entering the main loop).                                             */
+
+                movl    deflatestate(%esp), %edx
+                movl    curmatch(%esp), %ecx
+
+/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;      */
+
+                movl    dsNiceMatch(%edx), %eax
+                movl    dsLookahead(%edx), %ebx
+                cmpl    %eax, %ebx
+                jl      LookaheadLess
+                movl    %eax, %ebx
+LookaheadLess:  movl    %ebx, nicematch(%esp)
+
+/* register Bytef *scan = s->window + s->strstart;                      */
+
+                movl    dsWindow(%edx), %esi
+                movl    %esi, window(%esp)
+                movl    dsStrStart(%edx), %ebp
+                lea     (%esi,%ebp), %edi
+                movl    %edi, scan(%esp)
+
+/* Determine how many bytes the scan ptr is off from being              */
+/* dword-aligned.                                                       */
+
+                movl    %edi, %eax
+                negl    %eax
+                andl    $3, %eax
+                movl    %eax, scanalign(%esp)
+
+/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?                       */
+/*     s->strstart - (IPos)MAX_DIST(s) : NIL;                           */
+
+                movl    dsWSize(%edx), %eax
+                subl    $MIN_LOOKAHEAD, %eax
+                subl    %eax, %ebp
+                jg      LimitPositive
+                xorl    %ebp, %ebp
+LimitPositive:
+
+/* unsigned chain_length = s->max_chain_length;                         */
+/* if (s->prev_length >= s->good_match) {                               */
+/*     chain_length >>= 2;                                              */
+/* }                                                                    */
+
+                movl    dsPrevLen(%edx), %eax
+                movl    dsGoodMatch(%edx), %ebx
+                cmpl    %ebx, %eax
+                movl    dsMaxChainLen(%edx), %ebx
+                jl      LastMatchGood
+                shrl    $2, %ebx
+LastMatchGood:
+
+/* chainlen is decremented once beforehand so that the function can     */
+/* use the sign flag instead of the zero flag for the exit test.        */
+/* It is then shifted into the high word, to make room for the scanend  */
+/* scanend value, which it will always accompany.                       */
+
+                decl    %ebx
+                shll    $16, %ebx
+
+/* int best_len = s->prev_length;                                       */
+
+                movl    dsPrevLen(%edx), %eax
+                movl    %eax, bestlen(%esp)
+
+/* Store the sum of s->window + best_len in %esi locally, and in %esi.  */
+
+                addl    %eax, %esi
+                movl    %esi, windowbestlen(%esp)
+
+/* register ush scan_start = *(ushf*)scan;                              */
+/* register ush scan_end   = *(ushf*)(scan+best_len-1);                 */
+
+                movw    (%edi), %bx
+                movw    %bx, scanstart(%esp)
+                movw    -1(%edi,%eax), %bx
+                movl    %ebx, chainlenscanend(%esp)
+
+/* Posf *prev = s->prev;                                                */
+/* uInt wmask = s->w_mask;                                              */
+
+                movl    dsPrev(%edx), %edi
+                movl    dsWMask(%edx), %edx
+                mov     %edx, wmask(%esp)
+
+/* Jump into the main loop.                                             */
+
+                jmp     LoopEntry
+
+.balign 16
+
+/* do {
+ *     match = s->window + cur_match;
+ *     if (*(ushf*)(match+best_len-1) != scan_end ||
+ *         *(ushf*)match != scan_start) continue;
+ *     [...]
+ * } while ((cur_match = prev[cur_match & wmask]) > limit
+ *          && --chain_length != 0);
+ *
+ * Here is the inner loop of the function. The function will spend the
+ * majority of its time in this loop, and majority of that time will
+ * be spent in the first ten instructions.
+ *
+ * Within this loop:
+ * %ebx = chainlenscanend - i.e., ((chainlen << 16) | scanend)
+ * %ecx = curmatch
+ * %edx = curmatch & wmask
+ * %esi = windowbestlen - i.e., (window + bestlen)
+ * %edi = prev
+ * %ebp = limit
+ *
+ * Two optimization notes on the choice of instructions:
+ *
+ * The first instruction uses a 16-bit address, which costs an extra,
+ * unpairable cycle. This is cheaper than doing a 32-bit access and
+ * zeroing the high word, due to the 3-cycle misalignment penalty which
+ * would occur half the time. This also turns out to be cheaper than
+ * doing two separate 8-bit accesses, as the memory is so rarely in the
+ * L1 cache.
+ *
+ * The window buffer, however, apparently spends a lot of time in the
+ * cache, and so it is faster to retrieve the word at the end of the
+ * match string with two 8-bit loads. The instructions that test the
+ * word at the beginning of the match string, however, are executed
+ * much less frequently, and there it was cheaper to use 16-bit
+ * instructions, which avoided the necessity of saving off and
+ * subsequently reloading one of the other registers.
+ */
+LookupLoop:
+                                                        /* 1 U & V  */
+                movw    (%edi,%edx,2), %cx              /* 2 U pipe */
+                movl    wmask(%esp), %edx               /* 2 V pipe */
+                cmpl    %ebp, %ecx                      /* 3 U pipe */
+                jbe     LeaveNow                        /* 3 V pipe */
+                subl    $0x00010000, %ebx               /* 4 U pipe */
+                js      LeaveNow                        /* 4 V pipe */
+LoopEntry:      movb    -1(%esi,%ecx), %al              /* 5 U pipe */
+                andl    %ecx, %edx                      /* 5 V pipe */
+                cmpb    %bl, %al                        /* 6 U pipe */
+                jnz     LookupLoop                      /* 6 V pipe */
+                movb    (%esi,%ecx), %ah
+                cmpb    %bh, %ah
+                jnz     LookupLoop
+                movl    window(%esp), %eax
+                movw    (%eax,%ecx), %ax
+                cmpw    scanstart(%esp), %ax
+                jnz     LookupLoop
+
+/* Store the current value of chainlen.                                 */
+
+                movl    %ebx, chainlenscanend(%esp)
+
+/* Point %edi to the string under scrutiny, and %esi to the string we   */
+/* are hoping to match it up with. In actuality, %esi and %edi are      */
+/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is      */
+/* initialized to -(MAX_MATCH_8 - scanalign).                           */
+
+                movl    window(%esp), %esi
+                movl    scan(%esp), %edi
+                addl    %ecx, %esi
+                movl    scanalign(%esp), %eax
+                movl    $(-MAX_MATCH_8), %edx
+                lea     MAX_MATCH_8(%edi,%eax), %edi
+                lea     MAX_MATCH_8(%esi,%eax), %esi
+
+/* Test the strings for equality, 8 bytes at a time. At the end,
+ * adjust %edx so that it is offset to the exact byte that mismatched.
+ *
+ * We already know at this point that the first three bytes of the
+ * strings match each other, and they can be safely passed over before
+ * starting the compare loop. So what this code does is skip over 0-3
+ * bytes, as much as necessary in order to dword-align the %edi
+ * pointer. (%esi will still be misaligned three times out of four.)
+ *
+ * It should be confessed that this loop usually does not represent
+ * much of the total running time. Replacing it with a more
+ * straightforward "rep cmpsb" would not drastically degrade
+ * performance.
+ */
+LoopCmps:
+                movl    (%esi,%edx), %eax
+                movl    (%edi,%edx), %ebx
+                xorl    %ebx, %eax
+                jnz     LeaveLoopCmps
+                movl    4(%esi,%edx), %eax
+                movl    4(%edi,%edx), %ebx
+                xorl    %ebx, %eax
+                jnz     LeaveLoopCmps4
+                addl    $8, %edx
+                jnz     LoopCmps
+                jmp     LenMaximum
+LeaveLoopCmps4: addl    $4, %edx
+LeaveLoopCmps:  testl   $0x0000FFFF, %eax
+                jnz     LenLower
+                addl    $2, %edx
+                shrl    $16, %eax
+LenLower:       subb    $1, %al
+                adcl    $0, %edx
+
+/* Calculate the length of the match. If it is longer than MAX_MATCH,   */
+/* then automatically accept it as the best possible match and leave.   */
+
+                lea     (%edi,%edx), %eax
+                movl    scan(%esp), %edi
+                subl    %edi, %eax
+                cmpl    $MAX_MATCH, %eax
+                jge     LenMaximum
+
+/* If the length of the match is not longer than the best match we      */
+/* have so far, then forget it and return to the lookup loop.           */
+
+                movl    deflatestate(%esp), %edx
+                movl    bestlen(%esp), %ebx
+                cmpl    %ebx, %eax
+                jg      LongerMatch
+                movl    chainlenscanend(%esp), %ebx
+                movl    windowbestlen(%esp), %esi
+                movl    dsPrev(%edx), %edi
+                movl    wmask(%esp), %edx
+                andl    %ecx, %edx
+                jmp     LookupLoop
+
+/*         s->match_start = cur_match;                                  */
+/*         best_len = len;                                              */
+/*         if (len >= nice_match) break;                                */
+/*         scan_end = *(ushf*)(scan+best_len-1);                        */
+
+LongerMatch:    movl    nicematch(%esp), %ebx
+                movl    %eax, bestlen(%esp)
+                movl    %ecx, dsMatchStart(%edx)
+                cmpl    %ebx, %eax
+                jge     LeaveNow
+                movl    window(%esp), %esi
+                addl    %eax, %esi
+                movl    %esi, windowbestlen(%esp)
+                movl    chainlenscanend(%esp), %ebx
+                movw    -1(%edi,%eax), %bx
+                movl    dsPrev(%edx), %edi
+                movl    %ebx, chainlenscanend(%esp)
+                movl    wmask(%esp), %edx
+                andl    %ecx, %edx
+                jmp     LookupLoop
+
+/* Accept the current string, with the maximum possible length.         */
+
+LenMaximum:     movl    deflatestate(%esp), %edx
+                movl    $MAX_MATCH, bestlen(%esp)
+                movl    %ecx, dsMatchStart(%edx)
+
+/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;           */
+/* return s->lookahead;                                                 */
+
+LeaveNow:
+                movl    deflatestate(%esp), %edx
+                movl    bestlen(%esp), %ebx
+                movl    dsLookahead(%edx), %eax
+                cmpl    %eax, %ebx
+                jg      LookaheadRet
+                movl    %ebx, %eax
+LookaheadRet:
+
+/* Restore the stack and return from whence we came.                    */
+
+                addl    $LocalVarsSize, %esp
+                popl    %ebx
+                popl    %esi
+                popl    %edi
+                popl    %ebp
+match_init:     ret
diff --git a/contrib/asm686/match.S b/contrib/asm686/match.S
index c24be4d..5c3e9ee 100644
--- a/contrib/asm686/match.S
+++ b/contrib/asm686/match.S
@@ -1,329 +1,329 @@
-/* match.s -- Pentium-Pro-optimized version of longest_match()

- * Written for zlib 1.1.2

- * Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>

- *

- * This is free software; you can redistribute it and/or modify it

- * under the terms of the GNU General Public License.

- */

-

-#ifndef NO_UNDERLINE

-#define match_init      _match_init

-#define longest_match   _longest_match

-#endif

-

-#define MAX_MATCH       (258)

-#define MIN_MATCH       (3)

-#define MIN_LOOKAHEAD   (MAX_MATCH + MIN_MATCH + 1)

-#define MAX_MATCH_8     ((MAX_MATCH + 7) & ~7)

-

-/* stack frame offsets */

-

-#define chainlenwmask           0       /* high word: current chain len */

-                                        /* low word: s->wmask           */

-#define window                  4       /* local copy of s->window      */

-#define windowbestlen           8       /* s->window + bestlen          */

-#define scanstart               16      /* first two bytes of string    */

-#define scanend                 12      /* last two bytes of string     */

-#define scanalign               20      /* dword-misalignment of string */

-#define nicematch               24      /* a good enough match size     */

-#define bestlen                 28      /* size of best match so far    */

-#define scan                    32      /* ptr to string wanting match  */

-

-#define LocalVarsSize           (36)

-/*      saved ebx               36 */

-/*      saved edi               40 */

-/*      saved esi               44 */

-/*      saved ebp               48 */

-/*      return address          52 */

-#define deflatestate            56      /* the function arguments       */

-#define curmatch                60

-

-/* All the +zlib1222add offsets are due to the addition of fields

- *  in zlib in the deflate_state structure since the asm code was first written

- * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").

- * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").

- * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").

- */

-

-#define zlib1222add             (8)

-

-#define dsWSize                 (36+zlib1222add)

-#define dsWMask                 (44+zlib1222add)

-#define dsWindow                (48+zlib1222add)

-#define dsPrev                  (56+zlib1222add)

-#define dsMatchLen              (88+zlib1222add)

-#define dsPrevMatch             (92+zlib1222add)

-#define dsStrStart              (100+zlib1222add)

-#define dsMatchStart            (104+zlib1222add)

-#define dsLookahead             (108+zlib1222add)

-#define dsPrevLen               (112+zlib1222add)

-#define dsMaxChainLen           (116+zlib1222add)

-#define dsGoodMatch             (132+zlib1222add)

-#define dsNiceMatch             (136+zlib1222add)

-

-

-.file "match.S"

-

-.globl  match_init, longest_match

-

-.text

-

-/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */

-

-longest_match:

-

-/* Save registers that the compiler may be using, and adjust %esp to    */

-/* make room for our stack frame.                                       */

-

-                pushl   %ebp

-                pushl   %edi

-                pushl   %esi

-                pushl   %ebx

-                subl    $LocalVarsSize, %esp

-

-/* Retrieve the function arguments. %ecx will hold cur_match            */

-/* throughout the entire function. %edx will hold the pointer to the    */

-/* deflate_state structure during the function's setup (before          */

-/* entering the main loop).                                             */

-

-                movl    deflatestate(%esp), %edx

-                movl    curmatch(%esp), %ecx

-

-/* uInt wmask = s->w_mask;                                              */

-/* unsigned chain_length = s->max_chain_length;                         */

-/* if (s->prev_length >= s->good_match) {                               */

-/*     chain_length >>= 2;                                              */

-/* }                                                                    */

-

-                movl    dsPrevLen(%edx), %eax

-                movl    dsGoodMatch(%edx), %ebx

-                cmpl    %ebx, %eax

-                movl    dsWMask(%edx), %eax

-                movl    dsMaxChainLen(%edx), %ebx

-                jl      LastMatchGood

-                shrl    $2, %ebx

-LastMatchGood:

-

-/* chainlen is decremented once beforehand so that the function can     */

-/* use the sign flag instead of the zero flag for the exit test.        */

-/* It is then shifted into the high word, to make room for the wmask    */

-/* value, which it will always accompany.                               */

-

-                decl    %ebx

-                shll    $16, %ebx

-                orl     %eax, %ebx

-                movl    %ebx, chainlenwmask(%esp)

-

-/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;      */

-

-                movl    dsNiceMatch(%edx), %eax

-                movl    dsLookahead(%edx), %ebx

-                cmpl    %eax, %ebx

-                jl      LookaheadLess

-                movl    %eax, %ebx

-LookaheadLess:  movl    %ebx, nicematch(%esp)

-

-/* register Bytef *scan = s->window + s->strstart;                      */

-

-                movl    dsWindow(%edx), %esi

-                movl    %esi, window(%esp)

-                movl    dsStrStart(%edx), %ebp

-                lea     (%esi,%ebp), %edi

-                movl    %edi, scan(%esp)

-

-/* Determine how many bytes the scan ptr is off from being              */

-/* dword-aligned.                                                       */

-

-                movl    %edi, %eax

-                negl    %eax

-                andl    $3, %eax

-                movl    %eax, scanalign(%esp)

-

-/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?                       */

-/*     s->strstart - (IPos)MAX_DIST(s) : NIL;                           */

-

-                movl    dsWSize(%edx), %eax

-                subl    $MIN_LOOKAHEAD, %eax

-                subl    %eax, %ebp

-                jg      LimitPositive

-                xorl    %ebp, %ebp

-LimitPositive:

-

-/* int best_len = s->prev_length;                                       */

-

-                movl    dsPrevLen(%edx), %eax

-                movl    %eax, bestlen(%esp)

-

-/* Store the sum of s->window + best_len in %esi locally, and in %esi.  */

-

-                addl    %eax, %esi

-                movl    %esi, windowbestlen(%esp)

-

-/* register ush scan_start = *(ushf*)scan;                              */

-/* register ush scan_end   = *(ushf*)(scan+best_len-1);                 */

-/* Posf *prev = s->prev;                                                */

-

-                movzwl  (%edi), %ebx

-                movl    %ebx, scanstart(%esp)

-                movzwl  -1(%edi,%eax), %ebx

-                movl    %ebx, scanend(%esp)

-                movl    dsPrev(%edx), %edi

-

-/* Jump into the main loop.                                             */

-

-                movl    chainlenwmask(%esp), %edx

-                jmp     LoopEntry

-

-.balign 16

-

-/* do {

- *     match = s->window + cur_match;

- *     if (*(ushf*)(match+best_len-1) != scan_end ||

- *         *(ushf*)match != scan_start) continue;

- *     [...]

- * } while ((cur_match = prev[cur_match & wmask]) > limit

- *          && --chain_length != 0);

- *

- * Here is the inner loop of the function. The function will spend the

- * majority of its time in this loop, and majority of that time will

- * be spent in the first ten instructions.

- *

- * Within this loop:

- * %ebx = scanend

- * %ecx = curmatch

- * %edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)

- * %esi = windowbestlen - i.e., (window + bestlen)

- * %edi = prev

- * %ebp = limit

- */

-LookupLoop:

-                andl    %edx, %ecx

-                movzwl  (%edi,%ecx,2), %ecx

-                cmpl    %ebp, %ecx

-                jbe     LeaveNow

-                subl    $0x00010000, %edx

-                js      LeaveNow

-LoopEntry:      movzwl  -1(%esi,%ecx), %eax

-                cmpl    %ebx, %eax

-                jnz     LookupLoop

-                movl    window(%esp), %eax

-                movzwl  (%eax,%ecx), %eax

-                cmpl    scanstart(%esp), %eax

-                jnz     LookupLoop

-

-/* Store the current value of chainlen.                                 */

-

-                movl    %edx, chainlenwmask(%esp)

-

-/* Point %edi to the string under scrutiny, and %esi to the string we   */

-/* are hoping to match it up with. In actuality, %esi and %edi are      */

-/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is      */

-/* initialized to -(MAX_MATCH_8 - scanalign).                           */

-

-                movl    window(%esp), %esi

-                movl    scan(%esp), %edi

-                addl    %ecx, %esi

-                movl    scanalign(%esp), %eax

-                movl    $(-MAX_MATCH_8), %edx

-                lea     MAX_MATCH_8(%edi,%eax), %edi

-                lea     MAX_MATCH_8(%esi,%eax), %esi

-

-/* Test the strings for equality, 8 bytes at a time. At the end,

- * adjust %edx so that it is offset to the exact byte that mismatched.

- *

- * We already know at this point that the first three bytes of the

- * strings match each other, and they can be safely passed over before

- * starting the compare loop. So what this code does is skip over 0-3

- * bytes, as much as necessary in order to dword-align the %edi

- * pointer. (%esi will still be misaligned three times out of four.)

- *

- * It should be confessed that this loop usually does not represent

- * much of the total running time. Replacing it with a more

- * straightforward "rep cmpsb" would not drastically degrade

- * performance.

- */

-LoopCmps:

-                movl    (%esi,%edx), %eax

-                xorl    (%edi,%edx), %eax

-                jnz     LeaveLoopCmps

-                movl    4(%esi,%edx), %eax

-                xorl    4(%edi,%edx), %eax

-                jnz     LeaveLoopCmps4

-                addl    $8, %edx

-                jnz     LoopCmps

-                jmp     LenMaximum

-LeaveLoopCmps4: addl    $4, %edx

-LeaveLoopCmps:  testl   $0x0000FFFF, %eax

-                jnz     LenLower

-                addl    $2, %edx

-                shrl    $16, %eax

-LenLower:       subb    $1, %al

-                adcl    $0, %edx

-

-/* Calculate the length of the match. If it is longer than MAX_MATCH,   */

-/* then automatically accept it as the best possible match and leave.   */

-

-                lea     (%edi,%edx), %eax

-                movl    scan(%esp), %edi

-                subl    %edi, %eax

-                cmpl    $MAX_MATCH, %eax

-                jge     LenMaximum

-

-/* If the length of the match is not longer than the best match we      */

-/* have so far, then forget it and return to the lookup loop.           */

-

-                movl    deflatestate(%esp), %edx

-                movl    bestlen(%esp), %ebx

-                cmpl    %ebx, %eax

-                jg      LongerMatch

-                movl    windowbestlen(%esp), %esi

-                movl    dsPrev(%edx), %edi

-                movl    scanend(%esp), %ebx

-                movl    chainlenwmask(%esp), %edx

-                jmp     LookupLoop

-

-/*         s->match_start = cur_match;                                  */

-/*         best_len = len;                                              */

-/*         if (len >= nice_match) break;                                */

-/*         scan_end = *(ushf*)(scan+best_len-1);                        */

-

-LongerMatch:    movl    nicematch(%esp), %ebx

-                movl    %eax, bestlen(%esp)

-                movl    %ecx, dsMatchStart(%edx)

-                cmpl    %ebx, %eax

-                jge     LeaveNow

-                movl    window(%esp), %esi

-                addl    %eax, %esi

-                movl    %esi, windowbestlen(%esp)

-                movzwl  -1(%edi,%eax), %ebx

-                movl    dsPrev(%edx), %edi

-                movl    %ebx, scanend(%esp)

-                movl    chainlenwmask(%esp), %edx

-                jmp     LookupLoop

-

-/* Accept the current string, with the maximum possible length.         */

-

-LenMaximum:     movl    deflatestate(%esp), %edx

-                movl    $MAX_MATCH, bestlen(%esp)

-                movl    %ecx, dsMatchStart(%edx)

-

-/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;           */

-/* return s->lookahead;                                                 */

-

-LeaveNow:

-                movl    deflatestate(%esp), %edx

-                movl    bestlen(%esp), %ebx

-                movl    dsLookahead(%edx), %eax

-                cmpl    %eax, %ebx

-                jg      LookaheadRet

-                movl    %ebx, %eax

-LookaheadRet:

-

-/* Restore the stack and return from whence we came.                    */

-

-                addl    $LocalVarsSize, %esp

-                popl    %ebx

-                popl    %esi

-                popl    %edi

-                popl    %ebp

-match_init:     ret

+/* match.s -- Pentium-Pro-optimized version of longest_match()
+ * Written for zlib 1.1.2
+ * Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License.
+ */
+
+#ifndef NO_UNDERLINE
+#define match_init      _match_init
+#define longest_match   _longest_match
+#endif
+
+#define MAX_MATCH       (258)
+#define MIN_MATCH       (3)
+#define MIN_LOOKAHEAD   (MAX_MATCH + MIN_MATCH + 1)
+#define MAX_MATCH_8     ((MAX_MATCH + 7) & ~7)
+
+/* stack frame offsets */
+
+#define chainlenwmask           0       /* high word: current chain len */
+                                        /* low word: s->wmask           */
+#define window                  4       /* local copy of s->window      */
+#define windowbestlen           8       /* s->window + bestlen          */
+#define scanstart               16      /* first two bytes of string    */
+#define scanend                 12      /* last two bytes of string     */
+#define scanalign               20      /* dword-misalignment of string */
+#define nicematch               24      /* a good enough match size     */
+#define bestlen                 28      /* size of best match so far    */
+#define scan                    32      /* ptr to string wanting match  */
+
+#define LocalVarsSize           (36)
+/*      saved ebx               36 */
+/*      saved edi               40 */
+/*      saved esi               44 */
+/*      saved ebp               48 */
+/*      return address          52 */
+#define deflatestate            56      /* the function arguments       */
+#define curmatch                60
+
+/* All the +zlib1222add offsets are due to the addition of fields
+ *  in zlib in the deflate_state structure since the asm code was first written
+ * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
+ * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
+ * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
+ */
+
+#define zlib1222add             (8)
+
+#define dsWSize                 (36+zlib1222add)
+#define dsWMask                 (44+zlib1222add)
+#define dsWindow                (48+zlib1222add)
+#define dsPrev                  (56+zlib1222add)
+#define dsMatchLen              (88+zlib1222add)
+#define dsPrevMatch             (92+zlib1222add)
+#define dsStrStart              (100+zlib1222add)
+#define dsMatchStart            (104+zlib1222add)
+#define dsLookahead             (108+zlib1222add)
+#define dsPrevLen               (112+zlib1222add)
+#define dsMaxChainLen           (116+zlib1222add)
+#define dsGoodMatch             (132+zlib1222add)
+#define dsNiceMatch             (136+zlib1222add)
+
+
+.file "match.S"
+
+.globl  match_init, longest_match
+
+.text
+
+/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
+
+longest_match:
+
+/* Save registers that the compiler may be using, and adjust %esp to    */
+/* make room for our stack frame.                                       */
+
+                pushl   %ebp
+                pushl   %edi
+                pushl   %esi
+                pushl   %ebx
+                subl    $LocalVarsSize, %esp
+
+/* Retrieve the function arguments. %ecx will hold cur_match            */
+/* throughout the entire function. %edx will hold the pointer to the    */
+/* deflate_state structure during the function's setup (before          */
+/* entering the main loop).                                             */
+
+                movl    deflatestate(%esp), %edx
+                movl    curmatch(%esp), %ecx
+
+/* uInt wmask = s->w_mask;                                              */
+/* unsigned chain_length = s->max_chain_length;                         */
+/* if (s->prev_length >= s->good_match) {                               */
+/*     chain_length >>= 2;                                              */
+/* }                                                                    */
+
+                movl    dsPrevLen(%edx), %eax
+                movl    dsGoodMatch(%edx), %ebx
+                cmpl    %ebx, %eax
+                movl    dsWMask(%edx), %eax
+                movl    dsMaxChainLen(%edx), %ebx
+                jl      LastMatchGood
+                shrl    $2, %ebx
+LastMatchGood:
+
+/* chainlen is decremented once beforehand so that the function can     */
+/* use the sign flag instead of the zero flag for the exit test.        */
+/* It is then shifted into the high word, to make room for the wmask    */
+/* value, which it will always accompany.                               */
+
+                decl    %ebx
+                shll    $16, %ebx
+                orl     %eax, %ebx
+                movl    %ebx, chainlenwmask(%esp)
+
+/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;      */
+
+                movl    dsNiceMatch(%edx), %eax
+                movl    dsLookahead(%edx), %ebx
+                cmpl    %eax, %ebx
+                jl      LookaheadLess
+                movl    %eax, %ebx
+LookaheadLess:  movl    %ebx, nicematch(%esp)
+
+/* register Bytef *scan = s->window + s->strstart;                      */
+
+                movl    dsWindow(%edx), %esi
+                movl    %esi, window(%esp)
+                movl    dsStrStart(%edx), %ebp
+                lea     (%esi,%ebp), %edi
+                movl    %edi, scan(%esp)
+
+/* Determine how many bytes the scan ptr is off from being              */
+/* dword-aligned.                                                       */
+
+                movl    %edi, %eax
+                negl    %eax
+                andl    $3, %eax
+                movl    %eax, scanalign(%esp)
+
+/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?                       */
+/*     s->strstart - (IPos)MAX_DIST(s) : NIL;                           */
+
+                movl    dsWSize(%edx), %eax
+                subl    $MIN_LOOKAHEAD, %eax
+                subl    %eax, %ebp
+                jg      LimitPositive
+                xorl    %ebp, %ebp
+LimitPositive:
+
+/* int best_len = s->prev_length;                                       */
+
+                movl    dsPrevLen(%edx), %eax
+                movl    %eax, bestlen(%esp)
+
+/* Store the sum of s->window + best_len in %esi locally, and in %esi.  */
+
+                addl    %eax, %esi
+                movl    %esi, windowbestlen(%esp)
+
+/* register ush scan_start = *(ushf*)scan;                              */
+/* register ush scan_end   = *(ushf*)(scan+best_len-1);                 */
+/* Posf *prev = s->prev;                                                */
+
+                movzwl  (%edi), %ebx
+                movl    %ebx, scanstart(%esp)
+                movzwl  -1(%edi,%eax), %ebx
+                movl    %ebx, scanend(%esp)
+                movl    dsPrev(%edx), %edi
+
+/* Jump into the main loop.                                             */
+
+                movl    chainlenwmask(%esp), %edx
+                jmp     LoopEntry
+
+.balign 16
+
+/* do {
+ *     match = s->window + cur_match;
+ *     if (*(ushf*)(match+best_len-1) != scan_end ||
+ *         *(ushf*)match != scan_start) continue;
+ *     [...]
+ * } while ((cur_match = prev[cur_match & wmask]) > limit
+ *          && --chain_length != 0);
+ *
+ * Here is the inner loop of the function. The function will spend the
+ * majority of its time in this loop, and majority of that time will
+ * be spent in the first ten instructions.
+ *
+ * Within this loop:
+ * %ebx = scanend
+ * %ecx = curmatch
+ * %edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
+ * %esi = windowbestlen - i.e., (window + bestlen)
+ * %edi = prev
+ * %ebp = limit
+ */
+LookupLoop:
+                andl    %edx, %ecx
+                movzwl  (%edi,%ecx,2), %ecx
+                cmpl    %ebp, %ecx
+                jbe     LeaveNow
+                subl    $0x00010000, %edx
+                js      LeaveNow
+LoopEntry:      movzwl  -1(%esi,%ecx), %eax
+                cmpl    %ebx, %eax
+                jnz     LookupLoop
+                movl    window(%esp), %eax
+                movzwl  (%eax,%ecx), %eax
+                cmpl    scanstart(%esp), %eax
+                jnz     LookupLoop
+
+/* Store the current value of chainlen.                                 */
+
+                movl    %edx, chainlenwmask(%esp)
+
+/* Point %edi to the string under scrutiny, and %esi to the string we   */
+/* are hoping to match it up with. In actuality, %esi and %edi are      */
+/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is      */
+/* initialized to -(MAX_MATCH_8 - scanalign).                           */
+
+                movl    window(%esp), %esi
+                movl    scan(%esp), %edi
+                addl    %ecx, %esi
+                movl    scanalign(%esp), %eax
+                movl    $(-MAX_MATCH_8), %edx
+                lea     MAX_MATCH_8(%edi,%eax), %edi
+                lea     MAX_MATCH_8(%esi,%eax), %esi
+
+/* Test the strings for equality, 8 bytes at a time. At the end,
+ * adjust %edx so that it is offset to the exact byte that mismatched.
+ *
+ * We already know at this point that the first three bytes of the
+ * strings match each other, and they can be safely passed over before
+ * starting the compare loop. So what this code does is skip over 0-3
+ * bytes, as much as necessary in order to dword-align the %edi
+ * pointer. (%esi will still be misaligned three times out of four.)
+ *
+ * It should be confessed that this loop usually does not represent
+ * much of the total running time. Replacing it with a more
+ * straightforward "rep cmpsb" would not drastically degrade
+ * performance.
+ */
+LoopCmps:
+                movl    (%esi,%edx), %eax
+                xorl    (%edi,%edx), %eax
+                jnz     LeaveLoopCmps
+                movl    4(%esi,%edx), %eax
+                xorl    4(%edi,%edx), %eax
+                jnz     LeaveLoopCmps4
+                addl    $8, %edx
+                jnz     LoopCmps
+                jmp     LenMaximum
+LeaveLoopCmps4: addl    $4, %edx
+LeaveLoopCmps:  testl   $0x0000FFFF, %eax
+                jnz     LenLower
+                addl    $2, %edx
+                shrl    $16, %eax
+LenLower:       subb    $1, %al
+                adcl    $0, %edx
+
+/* Calculate the length of the match. If it is longer than MAX_MATCH,   */
+/* then automatically accept it as the best possible match and leave.   */
+
+                lea     (%edi,%edx), %eax
+                movl    scan(%esp), %edi
+                subl    %edi, %eax
+                cmpl    $MAX_MATCH, %eax
+                jge     LenMaximum
+
+/* If the length of the match is not longer than the best match we      */
+/* have so far, then forget it and return to the lookup loop.           */
+
+                movl    deflatestate(%esp), %edx
+                movl    bestlen(%esp), %ebx
+                cmpl    %ebx, %eax
+                jg      LongerMatch
+                movl    windowbestlen(%esp), %esi
+                movl    dsPrev(%edx), %edi
+                movl    scanend(%esp), %ebx
+                movl    chainlenwmask(%esp), %edx
+                jmp     LookupLoop
+
+/*         s->match_start = cur_match;                                  */
+/*         best_len = len;                                              */
+/*         if (len >= nice_match) break;                                */
+/*         scan_end = *(ushf*)(scan+best_len-1);                        */
+
+LongerMatch:    movl    nicematch(%esp), %ebx
+                movl    %eax, bestlen(%esp)
+                movl    %ecx, dsMatchStart(%edx)
+                cmpl    %ebx, %eax
+                jge     LeaveNow
+                movl    window(%esp), %esi
+                addl    %eax, %esi
+                movl    %esi, windowbestlen(%esp)
+                movzwl  -1(%edi,%eax), %ebx
+                movl    dsPrev(%edx), %edi
+                movl    %ebx, scanend(%esp)
+                movl    chainlenwmask(%esp), %edx
+                jmp     LookupLoop
+
+/* Accept the current string, with the maximum possible length.         */
+
+LenMaximum:     movl    deflatestate(%esp), %edx
+                movl    $MAX_MATCH, bestlen(%esp)
+                movl    %ecx, dsMatchStart(%edx)
+
+/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;           */
+/* return s->lookahead;                                                 */
+
+LeaveNow:
+                movl    deflatestate(%esp), %edx
+                movl    bestlen(%esp), %ebx
+                movl    dsLookahead(%edx), %eax
+                cmpl    %eax, %ebx
+                jg      LookaheadRet
+                movl    %ebx, %eax
+LookaheadRet:
+
+/* Restore the stack and return from whence we came.                    */
+
+                addl    $LocalVarsSize, %esp
+                popl    %ebx
+                popl    %esi
+                popl    %edi
+                popl    %ebp
+match_init:     ret
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index b9d33e2..3f2b8b4 100644
--- a/contrib/delphi/ZLib.pas
+++ b/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
   const OutBuf: Pointer; BufSize: Integer);
 
 const
-  zlib_version = '1.2.2';
+  zlib_version = '1.2.3';
 
 type
   EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 2f374b6..8dc00db 100644
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
         public void Info_Version()

         {

             Info info = new Info();

-            Assert.AreEqual("1.2.2", Info.Version);

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

             Assert.AreEqual(32, info.SizeOfUInt);

             Assert.AreEqual(32, info.SizeOfULong);

             Assert.AreEqual(32, info.SizeOfPointer);

diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index 9e37840..0993f75 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.2.4 Copyright 1995-2005 Mark Adler ";
+   " inflate9 1.2.3 Copyright 1995-2005 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, 206, 69};
+        133, 133, 133, 133, 144, 201, 196};
     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
         65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
@@ -128,7 +128,7 @@ unsigned short FAR *work;
         left -= count[len];
         if (left < 0) return -1;        /* over-subscribed */
     }
-    if (left > 0 && (type == CODES || (codes - count[0] != 1)))
+    if (left > 0 && (type == CODES || max != 1))
         return -1;                      /* incomplete set */
 
     /* generate offsets into symbol table for each length for sorting */
diff --git a/contrib/infback9/inftree9.h b/contrib/infback9/inftree9.h
index 6a699a7..a268084 100644
--- a/contrib/infback9/inftree9.h
+++ b/contrib/infback9/inftree9.h
@@ -36,12 +36,12 @@ typedef struct {
  */
 
 /* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1004 code structures (850 for length/literals
-   and 154 for distances, the latter actually the result of an
+   exhaustive search was 1444 code structures (852 for length/literals
+   and 592 for distances, the latter actually the result of an
    exhaustive search).  The true maximum is not known, but the value
    below is more than safe. */
-#define ENOUGH 1440
-#define MAXD 154
+#define ENOUGH 2048
+#define MAXD 592
 
 /* Type of code to build for inftable() */
 typedef enum {
diff --git a/contrib/masmx64/gvmat64.asm b/contrib/masmx64/gvmat64.asm
index cee2145..790d655 100644
--- a/contrib/masmx64/gvmat64.asm
+++ b/contrib/masmx64/gvmat64.asm
@@ -4,24 +4,33 @@
 

 ; gvmat64.asm -- Asm portion of the optimized longest_match for 32 bits x86

 ; Copyright (C) 1995-2005 Jean-loup Gailly, Brian Raiter and Gilles Vollant.

-; File written by Gilles Vollant, by modifiying the longest_match

-;  from Jean-loup Gailly in deflate.c

-;  and modifying asm686 with masm, optimised assembly code from Brian Raiter,

-;      written 1998

+;

+; File written by Gilles Vollant, by converting to assembly the longest_match

+;  from Jean-loup Gailly in deflate.c of zLib and infoZip zip.

+;

+;  and by taking inspiration on asm686 with masm, optimised assembly code

+;        from Brian Raiter, written 1998

+;

 ;         http://www.zlib.net

 ;         http://www.winimage.com/zLibDll

 ;         http://www.muppetlabs.com/~breadbox/software/assembly.html

 ;

-; to compile this file, I use option

+; to compile this file for infozip Zip, I use option:

+;   ml64.exe /Flgvmat64 /c /Zi /DINFOZIP gvmat64.asm

+;

+; to compile this file for zLib, I use option:

 ;   ml64.exe /Flgvmat64 /c /Zi gvmat64.asm

-;   with Microsoft Macro Assembler (x64) for AMD64

+; Be carrefull to adapt zlib1222add below to your version of zLib

+;   (if you use a version of zLib before 1.0.4 or after 1.2.2.2, change

+;    value of zlib1222add later)

 ;

-;   ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK

+; This file compile with Microsoft Macro Assembler (x64) for AMD64

+;

+;   ml64.exe is given with Visual Studio 2005 and Windows 2003 server DDK

 ;

 ;   (you can get Windows 2003 server DDK with ml64 and cl for AMD64 from

 ;      http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price)

 ;

-; Be carrefull to adapt zlib1222add below to your version of zLib

 

 

 ;uInt longest_match(s, cur_match)

@@ -47,7 +56,10 @@ longest_match PROC
 ;scanalign       equ  rsp + xx - LocalVarsSize   ; dword-misalignment of string r13

 ;bestlen         equ  rsp + xx - LocalVarsSize   ; size of best match so far -> r11d

 ;scan            equ  rsp + xx - LocalVarsSize   ; ptr to string wanting match -> r9

- nicematch       equ  rsp + 16 - LocalVarsSize   ; a good enough match size -> r14

+IFDEF INFOZIP

+ELSE

+ nicematch       equ  (rsp + 16 - LocalVarsSize) ; a good enough match size

+ENDIF

 

 save_rdi        equ  rsp + 24 - LocalVarsSize

 save_rsi        equ  rsp + 32 - LocalVarsSize

@@ -84,8 +96,34 @@ save_r13        equ  rsp + 64 - LocalVarsSize
 ;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").

 ;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").

 

-zlib1222add     equ 8

 

+IFDEF INFOZIP

+

+_DATA   SEGMENT

+COMM    window_size:DWORD

+; WMask ; 7fff

+COMM    window:BYTE:010040H

+COMM    prev:WORD:08000H

+; MatchLen : unused

+; PrevMatch : unused

+COMM    strstart:DWORD

+COMM    match_start:DWORD

+; Lookahead : ignore

+COMM    prev_length:DWORD ; PrevLen

+COMM    max_chain_length:DWORD

+COMM    good_match:DWORD

+COMM    nice_match:DWORD

+prev_ad equ OFFSET prev

+window_ad equ OFFSET window

+nicematch equ nice_match

+_DATA ENDS

+WMask equ 07fffh

+

+ELSE

+

+  IFNDEF zlib1222add

+    zlib1222add equ 8

+  ENDIF

 dsWSize         equ 56+zlib1222add+(zlib1222add/2)

 dsWMask         equ 64+zlib1222add+(zlib1222add/2)

 dsWindow        equ 72+zlib1222add

@@ -100,6 +138,18 @@ dsMaxChainLen   equ 156+zlib1222add
 dsGoodMatch     equ 172+zlib1222add

 dsNiceMatch     equ 176+zlib1222add

 

+window_size     equ [ rcx + dsWSize]

+WMask           equ [ rcx + dsWMask]

+window_ad       equ [ rcx + dsWindow]

+prev_ad         equ [ rcx + dsPrev]

+strstart        equ [ rcx + dsStrStart]

+match_start     equ [ rcx + dsMatchStart]

+Lookahead       equ [ rcx + dsLookahead] ; 0ffffffffh on infozip

+prev_length     equ [ rcx + dsPrevLen]

+max_chain_length equ [ rcx + dsMaxChainLen]

+good_match      equ [ rcx + dsGoodMatch]

+nice_match      equ [ rcx + dsNiceMatch]

+ENDIF

 

 ; parameter 1 in r8(deflate state s), param 2 in rdx (cur match)

 

@@ -107,7 +157,7 @@ dsNiceMatch     equ 176+zlib1222add
 ; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp

 ;

 ; All registers must be preserved across the call, except for

-;   rax, rcx, rdx, r8, r-9, r10, and r11, which are scratch.

+;   rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.

 

 

 

@@ -124,12 +174,15 @@ dsNiceMatch     equ 176+zlib1222add
 

 ; this clear high 32 bits of r8, which can be garbage in both r8 and rdx

 

-

         mov [save_rdi],rdi

         mov [save_rsi],rsi

         mov [save_rbx],rbx

         mov [save_rbp],rbp

+IFDEF INFOZIP

+        mov r8d,ecx

+ELSE

         mov r8d,edx

+ENDIF

         mov [save_r12],r12

         mov [save_r13],r13

 ;        mov [save_r14],r14

@@ -142,10 +195,10 @@ dsNiceMatch     equ 176+zlib1222add
 ;;;     chain_length >>= 2;

 ;;; }

 

-        mov edi, [rcx + dsPrevLen]

-        mov esi, [rcx + dsGoodMatch]

-        mov eax, [rcx + dsWMask]

-        mov ebx, [rcx + dsMaxChainLen]

+        mov edi, prev_length

+        mov esi, good_match

+        mov eax, WMask

+        mov ebx, max_chain_length

         cmp edi, esi

         jl  LastMatchGood

         shr ebx, 2

@@ -159,21 +212,25 @@ LastMatchGood:
         dec ebx

         shl ebx, 16

         or  ebx, eax

-        mov [chainlenwmask], ebx

 

+;;; on zlib only

 ;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;

 

-        mov eax, [rcx + dsNiceMatch]

-        mov r10d, [rcx + dsLookahead]

+IFDEF INFOZIP

+        mov [chainlenwmask], ebx

+; on infozip nice_match = [nice_match]

+ELSE

+        mov eax, nice_match

+        mov [chainlenwmask], ebx

+        mov r10d, Lookahead

         cmp r10d, eax

         cmovnl r10d, eax

         mov [nicematch],r10d

-LookaheadLess:

+ENDIF

 

 ;;; register Bytef *scan = s->window + s->strstart;

-

-        mov r10, [rcx + dsWindow]

-        mov ebp, [rcx + dsStrStart]

+        mov r10, window_ad

+        mov ebp, strstart

         lea r13, [r10 + rbp]

 

 ;;; Determine how many bytes the scan ptr is off from being

@@ -185,13 +242,16 @@ LookaheadLess:
 

 ;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?

 ;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;

-

-        mov eax, [rcx + dsWSize]

+IFDEF INFOZIP

+        mov eax,07efah ; MAX_DIST = (WSIZE-MIN_LOOKAHEAD) (0x8000-(3+8+1))

+ELSE

+        mov eax, window_size

         sub eax, MIN_LOOKAHEAD

+ENDIF

         xor edi,edi

         sub ebp, eax

 

-        mov r11d, [rcx + dsPrevLen]

+        mov r11d, prev_length

 

         cmovng ebp,edi

 

@@ -207,8 +267,9 @@ LookaheadLess:
 ;;; Posf *prev = s->prev;

 

         movzx r12d,word ptr [r9]

-        movzx   ebx, word ptr [r9 + r11 - 1]

-        mov rdi, [rcx + dsPrev]

+        movzx ebx, word ptr [r9 + r11 - 1]

+

+        mov rdi, prev_ad

 

 ;;; Jump into the main loop.

 

@@ -312,38 +373,22 @@ LookupLoopIsZero:
 

         prefetcht1 [rsi+rdx]

         prefetcht1 [rdi+rdx]

+

+

 ;;; Test the strings for equality, 8 bytes at a time. At the end,

-;;; adjust edx so that it is offset to the exact byte that mismatched.

+;;; adjust rdx so that it is offset to the exact byte that mismatched.

 ;;;

 ;;; We already know at this point that the first three bytes of the

 ;;; strings match each other, and they can be safely passed over before

 ;;; starting the compare loop. So what this code does is skip over 0-3

 ;;; bytes, as much as necessary in order to dword-align the edi

-;;; pointer. (esi will still be misaligned three times out of four.)

+;;; pointer. (rsi will still be misaligned three times out of four.)

 ;;;

 ;;; It should be confessed that this loop usually does not represent

 ;;; much of the total running time. Replacing it with a more

 ;;; straightforward "rep cmpsb" would not drastically degrade

 ;;; performance.

 

-;LoopCmps:

-;        mov eax, [rsi + rdx]

-;        xor eax, [rdi + rdx]

-;        jnz LeaveLoopCmps

-;        mov eax, [rsi + rdx + 4]

-;        xor eax, [rdi + rdx + 4]

-;        jnz LeaveLoopCmps4

-;        add rdx, 8

-;        jnz LoopCmps

-;        jmp LenMaximum

-;LeaveLoopCmps4: add rdx, 4

-;LeaveLoopCmps:  test    eax, 0000FFFFh

-;        jnz LenLower

-;        add rdx,  2

-;        shr eax, 16

-;LenLower:   sub al, 1

-;        adc rdx, 0

-

 

 LoopCmps:

         mov rax, [rsi + rdx]

@@ -400,7 +445,7 @@ LenLower:   sub al, 1
 

         lea rsi,[r10+r11]

 

-        mov rdi, [rcx + dsPrev]

+        mov rdi, prev_ad

         mov edx, [chainlenwmask]

         jmp LookupLoop

 

@@ -411,14 +456,14 @@ LenLower:   sub al, 1
 

 LongerMatch:

         mov r11d, eax

-        mov [rcx + dsMatchStart], r8d

+        mov match_start, r8d

         cmp eax, [nicematch]

         jge LeaveNow

 

         lea rsi,[r10+rax]

 

         movzx   ebx, word ptr [r9 + rax - 1]

-        mov rdi, [rcx + dsPrev]

+        mov rdi, prev_ad

         mov edx, [chainlenwmask]

         jmp LookupLoop

 

@@ -426,16 +471,19 @@ LongerMatch:
 

 LenMaximum:

         mov r11d,MAX_MATCH

-        mov [rcx + dsMatchStart], r8d

+        mov match_start, r8d

 

 ;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;

 ;;; return s->lookahead;

 

 LeaveNow:

-        mov eax, [rcx + dsLookahead]

+IFDEF INFOZIP

+        mov eax,r11d

+ELSE

+        mov eax, Lookahead

         cmp r11d, eax

         cmovng eax, r11d

-

+ENDIF

 

 ;;; Restore the stack and return from whence we came.

 

@@ -452,7 +500,8 @@ LeaveNow:
 

         ret 0

 ; please don't remove this string !

-; Your can freely use gvmat32 in any free or commercial app if you don't remove the string in the binary!

+; Your can freely use gvmat64 in any free or commercial app

+; but it is far better don't remove the string in the binary!

     db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0

 longest_match   ENDP

 

diff --git a/contrib/masmx64/gvmat64.obj b/contrib/masmx64/gvmat64.obj
index 10a73fe..a49ca02 100644
--- a/contrib/masmx64/gvmat64.obj
+++ b/contrib/masmx64/gvmat64.obj
diff --git a/contrib/vstudio/vc7/gvmat32.obj b/contrib/masmx86/gvmat32.obj
index ebb3262..ebb3262 100644
--- a/contrib/vstudio/vc7/gvmat32.obj
+++ b/contrib/masmx86/gvmat32.obj
diff --git a/contrib/vstudio/vc7/inffas32.obj b/contrib/masmx86/inffas32.obj
index bd6664d..bd6664d 100644
--- a/contrib/vstudio/vc7/inffas32.obj
+++ b/contrib/masmx86/inffas32.obj
diff --git a/contrib/minizip/ChangeLogUnzip b/contrib/minizip/ChangeLogUnzip
index e62af14..50ca6a9 100644
--- a/contrib/minizip/ChangeLogUnzip
+++ b/contrib/minizip/ChangeLogUnzip
@@ -1,67 +1,67 @@
-Change in 1.01e (12 feb 05)

-- Fix in zipOpen2 for globalcomment (Rolf Kalbermatter)

-- Fix possible memory leak in unzip.c (Zoran Stevanovic)

-

-Change in 1.01b (20 may 04)

-- Integrate patch from Debian package (submited by Mark Brown)

-- Add tools mztools from Xavier Roche

-

-Change in 1.01 (8 may 04)

-- fix buffer overrun risk in unzip.c (Xavier Roche)

-- fix a minor buffer insecurity in minizip.c (Mike Whittaker)

-

-Change in 1.00: (10 sept 03)

-- rename to 1.00

-- cosmetic code change

-

-Change in 0.22: (19 May 03)

-- crypting support (unless you define NOCRYPT)

-- append file in existing zipfile

-

-Change in 0.21: (10 Mar 03)

-- bug fixes

-

-Change in 0.17: (27 Jan 02)

-- bug fixes

-

-Change in 0.16: (19 Jan 02)

-- Support of ioapi for virtualize zip file access

-

-Change in 0.15: (19 Mar 98)

-- fix memory leak in minizip.c

-

-Change in 0.14: (10 Mar 98)

-- fix bugs in minizip.c sample for zipping big file

-- fix problem in month in date handling

-- fix bug in unzlocal_GetCurrentFileInfoInternal in unzip.c for

-    comment handling

-

-Change in 0.13: (6 Mar 98)

-- fix bugs in zip.c

-- add real minizip sample

-

-Change in 0.12: (4 Mar 98)

-- add zip.c and zip.h for creates .zip file

-- fix change_file_date in miniunz.c for Unix (Jean-loup Gailly)

-- fix miniunz.c for file without specific record for directory

-

-Change in 0.11: (3 Mar 98)

-- fix bug in unzGetCurrentFileInfo for get extra field and comment

-- enhance miniunz sample, remove the bad unztst.c sample

-

-Change in 0.10: (2 Mar 98)

-- fix bug in unzReadCurrentFile

-- rename unzip* to unz* function and structure

-- remove Windows-like hungary notation variable name

-- modify some structure in unzip.h

-- add somes comment in source

-- remove unzipGetcCurrentFile function

-- replace ZUNZEXPORT by ZEXPORT

-- add unzGetLocalExtrafield for get the local extrafield info

-- add a new sample, miniunz.c

-

-Change in 0.4: (25 Feb 98)

-- suppress the type unzipFileInZip.

-  Only on file in the zipfile can be open at the same time

-- fix somes typo in code

-- added tm_unz structure in unzip_file_info (date/time in readable format)

+Change in 1.01e (12 feb 05)
+- Fix in zipOpen2 for globalcomment (Rolf Kalbermatter)
+- Fix possible memory leak in unzip.c (Zoran Stevanovic)
+
+Change in 1.01b (20 may 04)
+- Integrate patch from Debian package (submited by Mark Brown)
+- Add tools mztools from Xavier Roche
+
+Change in 1.01 (8 may 04)
+- fix buffer overrun risk in unzip.c (Xavier Roche)
+- fix a minor buffer insecurity in minizip.c (Mike Whittaker)
+
+Change in 1.00: (10 sept 03)
+- rename to 1.00
+- cosmetic code change
+
+Change in 0.22: (19 May 03)
+- crypting support (unless you define NOCRYPT)
+- append file in existing zipfile
+
+Change in 0.21: (10 Mar 03)
+- bug fixes
+
+Change in 0.17: (27 Jan 02)
+- bug fixes
+
+Change in 0.16: (19 Jan 02)
+- Support of ioapi for virtualize zip file access
+
+Change in 0.15: (19 Mar 98)
+- fix memory leak in minizip.c
+
+Change in 0.14: (10 Mar 98)
+- fix bugs in minizip.c sample for zipping big file
+- fix problem in month in date handling
+- fix bug in unzlocal_GetCurrentFileInfoInternal in unzip.c for
+    comment handling
+
+Change in 0.13: (6 Mar 98)
+- fix bugs in zip.c
+- add real minizip sample
+
+Change in 0.12: (4 Mar 98)
+- add zip.c and zip.h for creates .zip file
+- fix change_file_date in miniunz.c for Unix (Jean-loup Gailly)
+- fix miniunz.c for file without specific record for directory
+
+Change in 0.11: (3 Mar 98)
+- fix bug in unzGetCurrentFileInfo for get extra field and comment
+- enhance miniunz sample, remove the bad unztst.c sample
+
+Change in 0.10: (2 Mar 98)
+- fix bug in unzReadCurrentFile
+- rename unzip* to unz* function and structure
+- remove Windows-like hungary notation variable name
+- modify some structure in unzip.h
+- add somes comment in source
+- remove unzipGetcCurrentFile function
+- replace ZUNZEXPORT by ZEXPORT
+- add unzGetLocalExtrafield for get the local extrafield info
+- add a new sample, miniunz.c
+
+Change in 0.4: (25 Feb 98)
+- suppress the type unzipFileInZip.
+  Only on file in the zipfile can be open at the same time
+- fix somes typo in code
+- added tm_unz structure in unzip_file_info (date/time in readable format)
diff --git a/contrib/minizip/Makefile b/contrib/minizip/Makefile
index fbba3ac..84eaad2 100644
--- a/contrib/minizip/Makefile
+++ b/contrib/minizip/Makefile
@@ -1,25 +1,25 @@
-CC=cc

-CFLAGS=-O -I../..

-

-UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a

-ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a

-

-.c.o:

-        $(CC) -c $(CFLAGS) $*.c

-

-all: miniunz minizip

-

-miniunz:  $(UNZ_OBJS)

-        $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)

-

-minizip:  $(ZIP_OBJS)

-        $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)

-

-test:   miniunz minizip

-        ./minizip test readme.txt

-        ./miniunz -l test.zip

-        mv readme.txt readme.old

-        ./miniunz test.zip

-

-clean:

-        /bin/rm -f *.o *~ minizip miniunz

+CC=cc
+CFLAGS=-O -I../..
+
+UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
+ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a
+
+.c.o:
+        $(CC) -c $(CFLAGS) $*.c
+
+all: miniunz minizip
+
+miniunz:  $(UNZ_OBJS)
+        $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
+
+minizip:  $(ZIP_OBJS)
+        $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
+
+test:   miniunz minizip
+        ./minizip test readme.txt
+        ./miniunz -l test.zip
+        mv readme.txt readme.old
+        ./miniunz test.zip
+
+clean:
+        /bin/rm -f *.o *~ minizip miniunz
diff --git a/contrib/minizip/crypt.h b/contrib/minizip/crypt.h
index f14a628..622f4bc 100644
--- a/contrib/minizip/crypt.h
+++ b/contrib/minizip/crypt.h
@@ -1,132 +1,132 @@
-/* crypt.h -- base code for crypt/uncrypt ZIPfile

-

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   This code is a modified version of crypting code in Infozip distribution

-

-   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

-   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).

-

-   If you don't need crypting in your application, just define symbols

-   NOCRYPT and NOUNCRYPT.

-

-   This code support the "Traditional PKWARE Encryption".

-

-   The new AES encryption added on Zip format by Winzip (see the page

-   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong

-   Encryption is not supported.

-*/

-

-#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))

-

-/***********************************************************************

- * Return the next byte in the pseudo-random sequence

- */

-static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)

-{

-    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an

-                     * unpredictable manner on 16-bit systems; not a problem

-                     * with any known compiler so far, though */

-

-    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;

-    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);

-}

-

-/***********************************************************************

- * Update the encryption keys with the next byte of plain text

- */

-static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)

-{

-    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);

-    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;

-    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;

-    {

-      register int keyshift = (int)((*(pkeys+1)) >> 24);

-      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);

-    }

-    return c;

-}

-

-

-/***********************************************************************

- * Initialize the encryption keys and the random header according to

- * the given password.

- */

-static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)

-{

-    *(pkeys+0) = 305419896L;

-    *(pkeys+1) = 591751049L;

-    *(pkeys+2) = 878082192L;

-    while (*passwd != '\0') {

-        update_keys(pkeys,pcrc_32_tab,(int)*passwd);

-        passwd++;

-    }

-}

-

-#define zdecode(pkeys,pcrc_32_tab,c) \

-    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))

-

-#define zencode(pkeys,pcrc_32_tab,c,t) \

-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))

-

-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED

-

-#define RAND_HEAD_LEN  12

-   /* "last resort" source for second part of crypt seed pattern */

-#  ifndef ZCR_SEED2

-#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */

-#  endif

-

-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)

-    const char *passwd;         /* password string */

-    unsigned char *buf;         /* where to write header */

-    int bufSize;

-    unsigned long* pkeys;

-    const unsigned long* pcrc_32_tab;

-    unsigned long crcForCrypting;

-{

-    int n;                       /* index in random header */

-    int t;                       /* temporary */

-    int c;                       /* random byte */

-    unsigned char header[RAND_HEAD_LEN-2]; /* random header */

-    static unsigned calls = 0;   /* ensure different random header each time */

-

-    if (bufSize<RAND_HEAD_LEN)

-      return 0;

-

-    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the

-     * output of rand() to get less predictability, since rand() is

-     * often poorly implemented.

-     */

-    if (++calls == 1)

-    {

-        srand((unsigned)(time(NULL) ^ ZCR_SEED2));

-    }

-    init_keys(passwd, pkeys, pcrc_32_tab);

-    for (n = 0; n < RAND_HEAD_LEN-2; n++)

-    {

-        c = (rand() >> 7) & 0xff;

-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);

-    }

-    /* Encrypt random header (last two bytes is high word of crc) */

-    init_keys(passwd, pkeys, pcrc_32_tab);

-    for (n = 0; n < RAND_HEAD_LEN-2; n++)

-    {

-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);

-    }

-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);

-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);

-    return n;

-}

-

-#endif

+/* crypt.h -- base code for crypt/uncrypt ZIPfile
+
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This code is a modified version of crypting code in Infozip distribution
+
+   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
+   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).
+
+   If you don't need crypting in your application, just define symbols
+   NOCRYPT and NOUNCRYPT.
+
+   This code support the "Traditional PKWARE Encryption".
+
+   The new AES encryption added on Zip format by Winzip (see the page
+   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
+   Encryption is not supported.
+*/
+
+#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
+
+/***********************************************************************
+ * Return the next byte in the pseudo-random sequence
+ */
+static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
+{
+    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
+                     * unpredictable manner on 16-bit systems; not a problem
+                     * with any known compiler so far, though */
+
+    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
+    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
+}
+
+/***********************************************************************
+ * Update the encryption keys with the next byte of plain text
+ */
+static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
+{
+    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
+    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
+    {
+      register int keyshift = (int)((*(pkeys+1)) >> 24);
+      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
+    }
+    return c;
+}
+
+
+/***********************************************************************
+ * Initialize the encryption keys and the random header according to
+ * the given password.
+ */
+static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
+{
+    *(pkeys+0) = 305419896L;
+    *(pkeys+1) = 591751049L;
+    *(pkeys+2) = 878082192L;
+    while (*passwd != '\0') {
+        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
+        passwd++;
+    }
+}
+
+#define zdecode(pkeys,pcrc_32_tab,c) \
+    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
+
+#define zencode(pkeys,pcrc_32_tab,c,t) \
+    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
+
+#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+
+#define RAND_HEAD_LEN  12
+   /* "last resort" source for second part of crypt seed pattern */
+#  ifndef ZCR_SEED2
+#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
+#  endif
+
+static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
+    const char *passwd;         /* password string */
+    unsigned char *buf;         /* where to write header */
+    int bufSize;
+    unsigned long* pkeys;
+    const unsigned long* pcrc_32_tab;
+    unsigned long crcForCrypting;
+{
+    int n;                       /* index in random header */
+    int t;                       /* temporary */
+    int c;                       /* random byte */
+    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
+    static unsigned calls = 0;   /* ensure different random header each time */
+
+    if (bufSize<RAND_HEAD_LEN)
+      return 0;
+
+    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
+     * output of rand() to get less predictability, since rand() is
+     * often poorly implemented.
+     */
+    if (++calls == 1)
+    {
+        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
+    }
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        c = (rand() >> 7) & 0xff;
+        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
+    }
+    /* Encrypt random header (last two bytes is high word of crc) */
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
+    }
+    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
+    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
+    return n;
+}
+
+#endif
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
index 7f20c18..f1bee23 100644
--- a/contrib/minizip/ioapi.c
+++ b/contrib/minizip/ioapi.c
@@ -1,177 +1,177 @@
-/* ioapi.c -- IO base function header for compress/uncompress .zip

-   files using zlib + zip or unzip API

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

-#include "zlib.h"

-#include "ioapi.h"

-

-

-

-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */

-

-#ifndef SEEK_CUR

-#define SEEK_CUR    1

-#endif

-

-#ifndef SEEK_END

-#define SEEK_END    2

-#endif

-

-#ifndef SEEK_SET

-#define SEEK_SET    0

-#endif

-

-voidpf ZCALLBACK fopen_file_func OF((

-   voidpf opaque,

-   const char* filename,

-   int mode));

-

-uLong ZCALLBACK fread_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   void* buf,

-   uLong size));

-

-uLong ZCALLBACK fwrite_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   const void* buf,

-   uLong size));

-

-long ZCALLBACK ftell_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-long ZCALLBACK fseek_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   uLong offset,

-   int origin));

-

-int ZCALLBACK fclose_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-int ZCALLBACK ferror_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-

-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)

-   voidpf opaque;

-   const char* filename;

-   int mode;

-{

-    FILE* file = NULL;

-    const char* mode_fopen = NULL;

-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)

-        mode_fopen = "rb";

-    else

-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)

-        mode_fopen = "r+b";

-    else

-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)

-        mode_fopen = "wb";

-

-    if ((filename!=NULL) && (mode_fopen != NULL))

-        file = fopen(filename, mode_fopen);

-    return file;

-}

-

-

-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)

-   voidpf opaque;

-   voidpf stream;

-   void* buf;

-   uLong size;

-{

-    uLong ret;

-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);

-    return ret;

-}

-

-

-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)

-   voidpf opaque;

-   voidpf stream;

-   const void* buf;

-   uLong size;

-{

-    uLong ret;

-    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);

-    return ret;

-}

-

-long ZCALLBACK ftell_file_func (opaque, stream)

-   voidpf opaque;

-   voidpf stream;

-{

-    long ret;

-    ret = ftell((FILE *)stream);

-    return ret;

-}

-

-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)

-   voidpf opaque;

-   voidpf stream;

-   uLong offset;

-   int origin;

-{

-    int fseek_origin=0;

-    long ret;

-    switch (origin)

-    {

-    case ZLIB_FILEFUNC_SEEK_CUR :

-        fseek_origin = SEEK_CUR;

-        break;

-    case ZLIB_FILEFUNC_SEEK_END :

-        fseek_origin = SEEK_END;

-        break;

-    case ZLIB_FILEFUNC_SEEK_SET :

-        fseek_origin = SEEK_SET;

-        break;

-    default: return -1;

-    }

-    ret = 0;

-    fseek((FILE *)stream, offset, fseek_origin);

-    return ret;

-}

-

-int ZCALLBACK fclose_file_func (opaque, stream)

-   voidpf opaque;

-   voidpf stream;

-{

-    int ret;

-    ret = fclose((FILE *)stream);

-    return ret;

-}

-

-int ZCALLBACK ferror_file_func (opaque, stream)

-   voidpf opaque;

-   voidpf stream;

-{

-    int ret;

-    ret = ferror((FILE *)stream);

-    return ret;

-}

-

-void fill_fopen_filefunc (pzlib_filefunc_def)

-  zlib_filefunc_def* pzlib_filefunc_def;

-{

-    pzlib_filefunc_def->zopen_file = fopen_file_func;

-    pzlib_filefunc_def->zread_file = fread_file_func;

-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;

-    pzlib_filefunc_def->ztell_file = ftell_file_func;

-    pzlib_filefunc_def->zseek_file = fseek_file_func;

-    pzlib_filefunc_def->zclose_file = fclose_file_func;

-    pzlib_filefunc_def->zerror_file = ferror_file_func;

-    pzlib_filefunc_def->opaque = NULL;

-}

+/* ioapi.c -- IO base function header for compress/uncompress .zip
+   files using zlib + zip or unzip API
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "zlib.h"
+#include "ioapi.h"
+
+
+
+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
+
+#ifndef SEEK_CUR
+#define SEEK_CUR    1
+#endif
+
+#ifndef SEEK_END
+#define SEEK_END    2
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET    0
+#endif
+
+voidpf ZCALLBACK fopen_file_func OF((
+   voidpf opaque,
+   const char* filename,
+   int mode));
+
+uLong ZCALLBACK fread_file_func OF((
+   voidpf opaque,
+   voidpf stream,
+   void* buf,
+   uLong size));
+
+uLong ZCALLBACK fwrite_file_func OF((
+   voidpf opaque,
+   voidpf stream,
+   const void* buf,
+   uLong size));
+
+long ZCALLBACK ftell_file_func OF((
+   voidpf opaque,
+   voidpf stream));
+
+long ZCALLBACK fseek_file_func OF((
+   voidpf opaque,
+   voidpf stream,
+   uLong offset,
+   int origin));
+
+int ZCALLBACK fclose_file_func OF((
+   voidpf opaque,
+   voidpf stream));
+
+int ZCALLBACK ferror_file_func OF((
+   voidpf opaque,
+   voidpf stream));
+
+
+voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
+   voidpf opaque;
+   const char* filename;
+   int mode;
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = fopen(filename, mode_fopen);
+    return file;
+}
+
+
+uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
+   voidpf opaque;
+   voidpf stream;
+   void* buf;
+   uLong size;
+{
+    uLong ret;
+    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+
+uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
+   voidpf opaque;
+   voidpf stream;
+   const void* buf;
+   uLong size;
+{
+    uLong ret;
+    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+long ZCALLBACK ftell_file_func (opaque, stream)
+   voidpf opaque;
+   voidpf stream;
+{
+    long ret;
+    ret = ftell((FILE *)stream);
+    return ret;
+}
+
+long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
+   voidpf opaque;
+   voidpf stream;
+   uLong offset;
+   int origin;
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+    fseek((FILE *)stream, offset, fseek_origin);
+    return ret;
+}
+
+int ZCALLBACK fclose_file_func (opaque, stream)
+   voidpf opaque;
+   voidpf stream;
+{
+    int ret;
+    ret = fclose((FILE *)stream);
+    return ret;
+}
+
+int ZCALLBACK ferror_file_func (opaque, stream)
+   voidpf opaque;
+   voidpf stream;
+{
+    int ret;
+    ret = ferror((FILE *)stream);
+    return ret;
+}
+
+void fill_fopen_filefunc (pzlib_filefunc_def)
+  zlib_filefunc_def* pzlib_filefunc_def;
+{
+    pzlib_filefunc_def->zopen_file = fopen_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell_file = ftell_file_func;
+    pzlib_filefunc_def->zseek_file = fseek_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
index e73a3b2..7d457ba 100644
--- a/contrib/minizip/ioapi.h
+++ b/contrib/minizip/ioapi.h
@@ -1,75 +1,75 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip

-   files using zlib + zip or unzip API

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#ifndef _ZLIBIOAPI_H

-#define _ZLIBIOAPI_H

-

-

-#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 (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)

-#define ZCALLBACK CALLBACK

-#else

-#define ZCALLBACK

-#endif

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));

-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));

-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));

-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));

-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));

-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));

-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));

-

-typedef 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;

-

-

-

-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));

-

-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))

-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))

-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))

-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))

-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))

-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))

-

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   files using zlib + zip or unzip API
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+*/
+
+#ifndef _ZLIBIOAPI_H
+#define _ZLIBIOAPI_H
+
+
+#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 (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+#define ZCALLBACK CALLBACK
+#else
+#define ZCALLBACK
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
+typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
+typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
+typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+
+typedef 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;
+
+
+
+void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+
+#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
+#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
+#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
+#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
+#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
+#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
index 694bc03..a9b5f78 100644
--- a/contrib/minizip/iowin32.c
+++ b/contrib/minizip/iowin32.c
@@ -1,270 +1,270 @@
-/* iowin32.c -- IO base function header for compress/uncompress .zip

-   files using zlib + zip or unzip API

-   This IO API version uses the Win32 API (for Microsoft Windows)

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#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));

-

-long ZCALLBACK win32_tell_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-long ZCALLBACK win32_seek_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   uLong offset,

-   int origin));

-

-int ZCALLBACK win32_close_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-int ZCALLBACK win32_error_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-typedef struct

-{

-    HANDLE hf;

-    int error;

-} WIN32FILE_IOWIN;

-

-voidpf ZCALLBACK win32_open_file_func (opaque, filename, mode)

-   voidpf opaque;

-   const char* filename;

-   int mode;

-{

-    const char* mode_fopen = NULL;

-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;

-    HANDLE hFile = 0;

-    voidpf ret=NULL;

-

-    dwDesiredAccess = dwShareMode = dwFlagsAndAttributes = 0;

-

-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)

-    {

-        dwDesiredAccess = GENERIC_READ;

-        dwCreationDisposition = OPEN_EXISTING;

-        dwShareMode = FILE_SHARE_READ;

-    }

-    else

-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)

-    {

-        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;

-        dwCreationDisposition = OPEN_EXISTING;

-    }

-    else

-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)

-    {

-        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;

-        dwCreationDisposition = CREATE_ALWAYS;

-    }

-

-    if ((filename!=NULL) && (dwDesiredAccess != 0))

-        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL,

-                      dwCreationDisposition, dwFlagsAndAttributes, NULL);

-

-    if (hFile == INVALID_HANDLE_VALUE)

-        hFile = NULL;

-

-    if (hFile != NULL)

-    {

-        WIN32FILE_IOWIN w32fiow;

-        w32fiow.hf = hFile;

-        w32fiow.error = 0;

-        ret = malloc(sizeof(WIN32FILE_IOWIN));

-        if (ret==NULL)

-            CloseHandle(hFile);

-        else *((WIN32FILE_IOWIN*)ret) = w32fiow;

-    }

-    return ret;

-}

-

-

-uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)

-   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 (opaque, stream, buf, size)

-   voidpf opaque;

-   voidpf stream;

-   const void* buf;

-   uLong size;

-{

-    uLong ret=0;

-    HANDLE hFile = NULL;

-    if (stream!=NULL)

-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;

-

-    if (hFile !=NULL)

-        if (!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 (opaque, stream)

-   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;

-}

-

-long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)

-   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;

-}

-

-int ZCALLBACK win32_close_file_func (opaque, stream)

-   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 (opaque, stream)

-   voidpf opaque;

-   voidpf stream;

-{

-    int ret=-1;

-    if (stream!=NULL)

-    {

-        ret = ((WIN32FILE_IOWIN*)stream) -> error;

-    }

-    return ret;

-}

-

-void fill_win32_filefunc (pzlib_filefunc_def)

-  zlib_filefunc_def* pzlib_filefunc_def;

-{

-    pzlib_filefunc_def->zopen_file = win32_open_file_func;

-    pzlib_filefunc_def->zread_file = win32_read_file_func;

-    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;

-}

+/* iowin32.c -- IO base function header for compress/uncompress .zip
+   files using zlib + zip or unzip API
+   This IO API version uses the Win32 API (for Microsoft Windows)
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+*/
+
+#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));
+
+long ZCALLBACK win32_tell_file_func OF((
+   voidpf opaque,
+   voidpf stream));
+
+long ZCALLBACK win32_seek_file_func OF((
+   voidpf opaque,
+   voidpf stream,
+   uLong offset,
+   int origin));
+
+int ZCALLBACK win32_close_file_func OF((
+   voidpf opaque,
+   voidpf stream));
+
+int ZCALLBACK win32_error_file_func OF((
+   voidpf opaque,
+   voidpf stream));
+
+typedef struct
+{
+    HANDLE hf;
+    int error;
+} WIN32FILE_IOWIN;
+
+voidpf ZCALLBACK win32_open_file_func (opaque, filename, mode)
+   voidpf opaque;
+   const char* filename;
+   int mode;
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = 0;
+    voidpf ret=NULL;
+
+    dwDesiredAccess = dwShareMode = dwFlagsAndAttributes = 0;
+
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+    {
+        dwDesiredAccess = GENERIC_READ;
+        dwCreationDisposition = OPEN_EXISTING;
+        dwShareMode = FILE_SHARE_READ;
+    }
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+    {
+        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        dwCreationDisposition = OPEN_EXISTING;
+    }
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+    {
+        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        dwCreationDisposition = CREATE_ALWAYS;
+    }
+
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL,
+                      dwCreationDisposition, dwFlagsAndAttributes, NULL);
+
+    if (hFile == INVALID_HANDLE_VALUE)
+        hFile = NULL;
+
+    if (hFile != NULL)
+    {
+        WIN32FILE_IOWIN w32fiow;
+        w32fiow.hf = hFile;
+        w32fiow.error = 0;
+        ret = malloc(sizeof(WIN32FILE_IOWIN));
+        if (ret==NULL)
+            CloseHandle(hFile);
+        else *((WIN32FILE_IOWIN*)ret) = w32fiow;
+    }
+    return ret;
+}
+
+
+uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
+   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 (opaque, stream, buf, size)
+   voidpf opaque;
+   voidpf stream;
+   const void* buf;
+   uLong size;
+{
+    uLong ret=0;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+
+    if (hFile !=NULL)
+        if (!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 (opaque, stream)
+   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;
+}
+
+long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
+   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;
+}
+
+int ZCALLBACK win32_close_file_func (opaque, stream)
+   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 (opaque, stream)
+   voidpf opaque;
+   voidpf stream;
+{
+    int ret=-1;
+    if (stream!=NULL)
+    {
+        ret = ((WIN32FILE_IOWIN*)stream) -> error;
+    }
+    return ret;
+}
+
+void fill_win32_filefunc (pzlib_filefunc_def)
+  zlib_filefunc_def* pzlib_filefunc_def;
+{
+    pzlib_filefunc_def->zopen_file = win32_open_file_func;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    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;
+}
diff --git a/contrib/minizip/iowin32.h b/contrib/minizip/iowin32.h
index e9c5f8b..a3a437a 100644
--- a/contrib/minizip/iowin32.h
+++ b/contrib/minizip/iowin32.h
@@ -1,21 +1,21 @@
-/* iowin32.h -- IO base function header for compress/uncompress .zip

-   files using zlib + zip or unzip API

-   This IO API version uses the Win32 API (for Microsoft Windows)

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#include <windows.h>

-

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));

-

-#ifdef __cplusplus

-}

-#endif

+/* iowin32.h -- IO base function header for compress/uncompress .zip
+   files using zlib + zip or unzip API
+   This IO API version uses the Win32 API (for Microsoft Windows)
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+*/
+
+#include <windows.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
index 82d8702..f599938 100644
--- a/contrib/minizip/miniunz.c
+++ b/contrib/minizip/miniunz.c
@@ -1,585 +1,585 @@
-/*

-   miniunz.c

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-

-#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

-

-#include "unzip.h"

-

-#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 = CreateFile(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);

-  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");

-}

-

-

-int do_list(uf)

-    unzFile uf;

-{

-    uLong i;

-    unz_global_info gi;

-    int err;

-

-    err = unzGetGlobalInfo (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_info file_info;

-        uLong ratio=0;

-        const char *string_method;

-        char charCrypt=' ';

-        err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);

-        if (err!=UNZ_OK)

-        {

-            printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);

-            break;

-        }

-        if (file_info.uncompressed_size>0)

-            ratio = (file_info.compressed_size*100)/file_info.uncompressed_size;

-

-        /* 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

-            string_method="Unkn. ";

-

-        printf("%7lu  %6s%c%7lu %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",

-                file_info.uncompressed_size,string_method,

-                charCrypt,

-                file_info.compressed_size,

-                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_info file_info;

-    uLong ratio=0;

-    err = unzGetCurrentFileInfo(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 = fopen(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=fopen(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=fopen(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_info gi;

-    int err;

-    FILE* fout=NULL;

-

-    err = unzGetGlobalInfo (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 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_filefunc_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_filefunc(&ffunc);

-        uf = unzOpen2(zipfilename,&ffunc);

-#        else

-        uf = unzOpen(zipfilename);

-#        endif

-        if (uf==NULL)

-        {

-            strcat(filename_try,".zip");

-#            ifdef USEWIN32IOAPI

-            uf = unzOpen2(filename_try,&ffunc);

-#            else

-            uf = unzOpen(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)

-        return do_list(uf);

-    else if (opt_do_extract==1)

-    {

-        if (opt_extractdir && chdir(dirname)) 

-        {

-          printf("Error changing into %s, aborting\n", dirname);

-          exit(-1);

-        }

-

-        if (filename_to_extract == NULL)

-            return do_extract(uf,opt_do_extract_withoutpath,opt_overwrite,password);

-        else

-            return do_extract_onefile(uf,filename_to_extract,

-                                      opt_do_extract_withoutpath,opt_overwrite,password);

-    }

-    unzCloseCurrentFile(uf);

-

-    return 0;

-}

+/*
+   miniunz.c
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+*/
+
+
+#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
+
+#include "unzip.h"
+
+#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 = CreateFile(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);
+  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");
+}
+
+
+int do_list(uf)
+    unzFile uf;
+{
+    uLong i;
+    unz_global_info gi;
+    int err;
+
+    err = unzGetGlobalInfo (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_info file_info;
+        uLong ratio=0;
+        const char *string_method;
+        char charCrypt=' ';
+        err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+        if (err!=UNZ_OK)
+        {
+            printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
+            break;
+        }
+        if (file_info.uncompressed_size>0)
+            ratio = (file_info.compressed_size*100)/file_info.uncompressed_size;
+
+        /* 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
+            string_method="Unkn. ";
+
+        printf("%7lu  %6s%c%7lu %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
+                file_info.uncompressed_size,string_method,
+                charCrypt,
+                file_info.compressed_size,
+                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_info file_info;
+    uLong ratio=0;
+    err = unzGetCurrentFileInfo(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 = fopen(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=fopen(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=fopen(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_info gi;
+    int err;
+    FILE* fout=NULL;
+
+    err = unzGetGlobalInfo (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 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_filefunc_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_filefunc(&ffunc);
+        uf = unzOpen2(zipfilename,&ffunc);
+#        else
+        uf = unzOpen(zipfilename);
+#        endif
+        if (uf==NULL)
+        {
+            strcat(filename_try,".zip");
+#            ifdef USEWIN32IOAPI
+            uf = unzOpen2(filename_try,&ffunc);
+#            else
+            uf = unzOpen(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)
+        return do_list(uf);
+    else if (opt_do_extract==1)
+    {
+        if (opt_extractdir && chdir(dirname)) 
+        {
+          printf("Error changing into %s, aborting\n", dirname);
+          exit(-1);
+        }
+
+        if (filename_to_extract == NULL)
+            return do_extract(uf,opt_do_extract_withoutpath,opt_overwrite,password);
+        else
+            return do_extract_onefile(uf,filename_to_extract,
+                                      opt_do_extract_withoutpath,opt_overwrite,password);
+    }
+    unzCloseCurrentFile(uf);
+
+    return 0;
+}
diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c
index 70fee02..f2dfecd 100644
--- a/contrib/minizip/minizip.c
+++ b/contrib/minizip/minizip.c
@@ -1,420 +1,420 @@
-/*

-   minizip.c

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#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

-

-#include "zip.h"

-

-#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_DATA  ff32;

-

-      hFind = FindFirstFile(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 = fopen(filename,"rb");

-    if (ftestexist==NULL)

-        ret = 0;

-    else

-        fclose(ftestexist);

-    return ret;

-}

-

-void do_banner()

-{

-    printf("MiniZip 1.01b, demo of zLib + Zip package written by Gilles Vollant\n");

-    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");

-}

-

-void do_help()

-{

-    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] 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");

-}

-

-/* 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 = fopen(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 %x\n",filenameinzip,calculate_crc);

-    return err;

-}

-

-int main(argc,argv)

-    int argc;

-    char *argv[];

-{

-    int i;

-    int opt_overwrite=0;

-    int opt_compress_level=Z_DEFAULT_COMPRESSION;

-    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=='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_filefunc_def ffunc;

-        fill_win32_filefunc(&ffunc);

-        zf = zipOpen2(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);

-#        else

-        zf = zipOpen(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];

-                zip_fileinfo zi;

-                unsigned long crcFile=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);

-

-                err = zipOpenNewFileInZip3(zf,filenameinzip,&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);

-

-                if (err != ZIP_OK)

-                    printf("error in opening %s in zipfile\n",filenameinzip);

-                else

-                {

-                    fin = fopen(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;

-}

+/*
+   minizip.c
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+*/
+
+#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
+
+#include "zip.h"
+
+#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_DATA  ff32;
+
+      hFind = FindFirstFile(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 = fopen(filename,"rb");
+    if (ftestexist==NULL)
+        ret = 0;
+    else
+        fclose(ftestexist);
+    return ret;
+}
+
+void do_banner()
+{
+    printf("MiniZip 1.01b, demo of zLib + Zip package written by Gilles Vollant\n");
+    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
+}
+
+void do_help()
+{
+    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] 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");
+}
+
+/* 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 = fopen(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 %x\n",filenameinzip,calculate_crc);
+    return err;
+}
+
+int main(argc,argv)
+    int argc;
+    char *argv[];
+{
+    int i;
+    int opt_overwrite=0;
+    int opt_compress_level=Z_DEFAULT_COMPRESSION;
+    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=='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_filefunc_def ffunc;
+        fill_win32_filefunc(&ffunc);
+        zf = zipOpen2(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
+#        else
+        zf = zipOpen(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];
+                zip_fileinfo zi;
+                unsigned long crcFile=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);
+
+                err = zipOpenNewFileInZip3(zf,filenameinzip,&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);
+
+                if (err != ZIP_OK)
+                    printf("error in opening %s in zipfile\n",filenameinzip);
+                else
+                {
+                    fin = fopen(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/minizip/mztools.c b/contrib/minizip/mztools.c
index bc5c798..8a50ee4 100644
--- a/contrib/minizip/mztools.c
+++ b/contrib/minizip/mztools.c
@@ -1,281 +1,281 @@
-/*

-  Additional tools for Minizip

-  Code: Xavier Roche '2004

-  License: Same as ZLIB (www.gzip.org)

-*/

-

-/* Code */

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include "zlib.h"

-#include "unzip.h"

-

-#define READ_8(adr)  ((unsigned char)*(adr))

-#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )

-#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )

-

-#define WRITE_8(buff, n) do { \

-  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \

-} while(0)

-#define WRITE_16(buff, n) do { \

-  WRITE_8((unsigned char*)(buff), n); \

-  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \

-} while(0)

-#define WRITE_32(buff, n) do { \

-  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \

-  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \

-} while(0)

-

-extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)

-const char* file;

-const char* fileOut;

-const char* fileOutTmp;

-uLong* nRecovered;

-uLong* bytesRecovered;

-{

-  int err = Z_OK;

-  FILE* fpZip = fopen(file, "rb");

-  FILE* fpOut = fopen(fileOut, "wb");

-  FILE* fpOutCD = fopen(fileOutTmp, "wb");

-  if (fpZip != NULL &&  fpOut != NULL) {

-    int entries = 0;

-    uLong totalBytes = 0;

-    char header[30];

-    char filename[256];

-    char extra[1024];

-    int offset = 0;

-    int offsetCD = 0;

-    while ( fread(header, 1, 30, fpZip) == 30 ) {

-      int currentOffset = offset;

-

-      /* File entry */

-      if (READ_32(header) == 0x04034b50) {

-        unsigned int version = READ_16(header + 4);

-        unsigned int gpflag = READ_16(header + 6);

-        unsigned int method = READ_16(header + 8);

-        unsigned int filetime = READ_16(header + 10);

-        unsigned int filedate = READ_16(header + 12);

-        unsigned int crc = READ_32(header + 14); /* crc */

-        unsigned int cpsize = READ_32(header + 18); /* compressed size */

-        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */

-        unsigned int fnsize = READ_16(header + 26); /* file name length */

-        unsigned int extsize = READ_16(header + 28); /* extra field length */

-        filename[0] = extra[0] = '\0';

-        

-        /* Header */

-        if (fwrite(header, 1, 30, fpOut) == 30) {

-          offset += 30;

-        } else {

-          err = Z_ERRNO;

-          break;

-        }

-        

-        /* Filename */

-        if (fnsize > 0) {

-          if (fread(filename, 1, fnsize, fpZip) == fnsize) {

-            if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {

-              offset += fnsize;

-            } else {

-              err = Z_ERRNO;

-              break;

-            }

-          } else {

-            err = Z_ERRNO;

-            break;

-          }

-        } else {

-          err = Z_STREAM_ERROR;

-          break;

-        }

-

-        /* Extra field */

-        if (extsize > 0) {

-          if (fread(extra, 1, extsize, fpZip) == extsize) {

-            if (fwrite(extra, 1, extsize, fpOut) == extsize) {

-              offset += extsize;

-            } else {

-              err = Z_ERRNO;

-              break;

-            }

-          } else {

-            err = Z_ERRNO;

-            break;

-          }

-        }

-        

-        /* Data */

-        {

-          int dataSize = cpsize;

-          if (dataSize == 0) {

-            dataSize = uncpsize;

-          }

-          if (dataSize > 0) {

-            char* data = malloc(dataSize);

-            if (data != NULL) {

-              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {

-                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {

-                  offset += dataSize;

-                  totalBytes += dataSize;

-                } else {

-                  err = Z_ERRNO;

-                }

-              } else {

-                err = Z_ERRNO;

-              }

-              free(data);

-              if (err != Z_OK) {

-                break;

-              }

-            } else {

-              err = Z_MEM_ERROR;

-              break;

-            }

-          }

-        }

-        

-        /* Central directory entry */

-        {

-          char header[46];

-          char* comment = "";

-          int comsize = (int) strlen(comment);

-          WRITE_32(header, 0x02014b50);

-          WRITE_16(header + 4, version);

-          WRITE_16(header + 6, version);

-          WRITE_16(header + 8, gpflag);

-          WRITE_16(header + 10, method);

-          WRITE_16(header + 12, filetime);

-          WRITE_16(header + 14, filedate);

-          WRITE_32(header + 16, crc);

-          WRITE_32(header + 20, cpsize);

-          WRITE_32(header + 24, uncpsize);

-          WRITE_16(header + 28, fnsize);

-          WRITE_16(header + 30, extsize);

-          WRITE_16(header + 32, comsize);

-          WRITE_16(header + 34, 0);     /* disk # */

-          WRITE_16(header + 36, 0);     /* int attrb */

-          WRITE_32(header + 38, 0);     /* ext attrb */

-          WRITE_32(header + 42, currentOffset);

-          /* Header */

-          if (fwrite(header, 1, 46, fpOutCD) == 46) {

-            offsetCD += 46;

-            

-            /* Filename */

-            if (fnsize > 0) {

-              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {

-                offsetCD += fnsize;

-              } else {

-                err = Z_ERRNO;

-                break;

-              }

-            } else {

-              err = Z_STREAM_ERROR;

-              break;

-            }

-            

-            /* Extra field */

-            if (extsize > 0) {

-              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {

-                offsetCD += extsize;

-              } else {

-                err = Z_ERRNO;

-                break;

-              }

-            }

-            

-            /* Comment field */

-            if (comsize > 0) {

-              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {

-                offsetCD += comsize;

-              } else {

-                err = Z_ERRNO;

-                break;

-              }

-            }

-            

-            

-          } else {

-            err = Z_ERRNO;

-            break;

-          }

-        }

-

-        /* Success */

-        entries++;

-

-      } else {

-        break;

-      }

-    }

-

-    /* Final central directory  */

-    {

-      int entriesZip = entries;

-      char header[22];

-      char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";

-      int comsize = (int) strlen(comment);

-      if (entriesZip > 0xffff) {

-        entriesZip = 0xffff;

-      }

-      WRITE_32(header, 0x06054b50);

-      WRITE_16(header + 4, 0);    /* disk # */

-      WRITE_16(header + 6, 0);    /* disk # */

-      WRITE_16(header + 8, entriesZip);   /* hack */

-      WRITE_16(header + 10, entriesZip);  /* hack */

-      WRITE_32(header + 12, offsetCD);    /* size of CD */

-      WRITE_32(header + 16, offset);      /* offset to CD */

-      WRITE_16(header + 20, comsize);     /* comment */

-      

-      /* Header */

-      if (fwrite(header, 1, 22, fpOutCD) == 22) {

-        

-        /* Comment field */

-        if (comsize > 0) {

-          if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {

-            err = Z_ERRNO;

-          }

-        }

-        

-      } else {

-        err = Z_ERRNO;

-      }

-    }

-

-    /* Final merge (file + central directory) */

-    fclose(fpOutCD);

-    if (err == Z_OK) {

-      fpOutCD = fopen(fileOutTmp, "rb");

-      if (fpOutCD != NULL) {

-        int nRead;

-        char buffer[8192];

-        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {

-          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {

-            err = Z_ERRNO;

-            break;

-          }

-        }

-        fclose(fpOutCD);

-      }

-    }

-    

-    /* Close */

-    fclose(fpZip);

-    fclose(fpOut);

-    

-    /* Wipe temporary file */

-    (void)remove(fileOutTmp);

-    

-    /* Number of recovered entries */

-    if (err == Z_OK) {

-      if (nRecovered != NULL) {

-        *nRecovered = entries;

-      }

-      if (bytesRecovered != NULL) {

-        *bytesRecovered = totalBytes;

-      }

-    }

-  } else {

-    err = Z_STREAM_ERROR;

-  }

-  return err;

-}

+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+/* Code */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "zlib.h"
+#include "unzip.h"
+
+#define READ_8(adr)  ((unsigned char)*(adr))
+#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
+#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
+
+#define WRITE_8(buff, n) do { \
+  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
+} while(0)
+#define WRITE_16(buff, n) do { \
+  WRITE_8((unsigned char*)(buff), n); \
+  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
+} while(0)
+#define WRITE_32(buff, n) do { \
+  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
+  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
+} while(0)
+
+extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
+const char* file;
+const char* fileOut;
+const char* fileOutTmp;
+uLong* nRecovered;
+uLong* bytesRecovered;
+{
+  int err = Z_OK;
+  FILE* fpZip = fopen(file, "rb");
+  FILE* fpOut = fopen(fileOut, "wb");
+  FILE* fpOutCD = fopen(fileOutTmp, "wb");
+  if (fpZip != NULL &&  fpOut != NULL) {
+    int entries = 0;
+    uLong totalBytes = 0;
+    char header[30];
+    char filename[256];
+    char extra[1024];
+    int offset = 0;
+    int offsetCD = 0;
+    while ( fread(header, 1, 30, fpZip) == 30 ) {
+      int currentOffset = offset;
+
+      /* File entry */
+      if (READ_32(header) == 0x04034b50) {
+        unsigned int version = READ_16(header + 4);
+        unsigned int gpflag = READ_16(header + 6);
+        unsigned int method = READ_16(header + 8);
+        unsigned int filetime = READ_16(header + 10);
+        unsigned int filedate = READ_16(header + 12);
+        unsigned int crc = READ_32(header + 14); /* crc */
+        unsigned int cpsize = READ_32(header + 18); /* compressed size */
+        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
+        unsigned int fnsize = READ_16(header + 26); /* file name length */
+        unsigned int extsize = READ_16(header + 28); /* extra field length */
+        filename[0] = extra[0] = '\0';
+        
+        /* Header */
+        if (fwrite(header, 1, 30, fpOut) == 30) {
+          offset += 30;
+        } else {
+          err = Z_ERRNO;
+          break;
+        }
+        
+        /* Filename */
+        if (fnsize > 0) {
+          if (fread(filename, 1, fnsize, fpZip) == fnsize) {
+            if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
+              offset += fnsize;
+            } else {
+              err = Z_ERRNO;
+              break;
+            }
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        } else {
+          err = Z_STREAM_ERROR;
+          break;
+        }
+
+        /* Extra field */
+        if (extsize > 0) {
+          if (fread(extra, 1, extsize, fpZip) == extsize) {
+            if (fwrite(extra, 1, extsize, fpOut) == extsize) {
+              offset += extsize;
+            } else {
+              err = Z_ERRNO;
+              break;
+            }
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+        
+        /* Data */
+        {
+          int dataSize = cpsize;
+          if (dataSize == 0) {
+            dataSize = uncpsize;
+          }
+          if (dataSize > 0) {
+            char* data = malloc(dataSize);
+            if (data != NULL) {
+              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
+                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
+                  offset += dataSize;
+                  totalBytes += dataSize;
+                } else {
+                  err = Z_ERRNO;
+                }
+              } else {
+                err = Z_ERRNO;
+              }
+              free(data);
+              if (err != Z_OK) {
+                break;
+              }
+            } else {
+              err = Z_MEM_ERROR;
+              break;
+            }
+          }
+        }
+        
+        /* Central directory entry */
+        {
+          char header[46];
+          char* comment = "";
+          int comsize = (int) strlen(comment);
+          WRITE_32(header, 0x02014b50);
+          WRITE_16(header + 4, version);
+          WRITE_16(header + 6, version);
+          WRITE_16(header + 8, gpflag);
+          WRITE_16(header + 10, method);
+          WRITE_16(header + 12, filetime);
+          WRITE_16(header + 14, filedate);
+          WRITE_32(header + 16, crc);
+          WRITE_32(header + 20, cpsize);
+          WRITE_32(header + 24, uncpsize);
+          WRITE_16(header + 28, fnsize);
+          WRITE_16(header + 30, extsize);
+          WRITE_16(header + 32, comsize);
+          WRITE_16(header + 34, 0);     /* disk # */
+          WRITE_16(header + 36, 0);     /* int attrb */
+          WRITE_32(header + 38, 0);     /* ext attrb */
+          WRITE_32(header + 42, currentOffset);
+          /* Header */
+          if (fwrite(header, 1, 46, fpOutCD) == 46) {
+            offsetCD += 46;
+            
+            /* Filename */
+            if (fnsize > 0) {
+              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
+                offsetCD += fnsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            } else {
+              err = Z_STREAM_ERROR;
+              break;
+            }
+            
+            /* Extra field */
+            if (extsize > 0) {
+              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
+                offsetCD += extsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            }
+            
+            /* Comment field */
+            if (comsize > 0) {
+              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
+                offsetCD += comsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            }
+            
+            
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+
+        /* Success */
+        entries++;
+
+      } else {
+        break;
+      }
+    }
+
+    /* Final central directory  */
+    {
+      int entriesZip = entries;
+      char header[22];
+      char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
+      int comsize = (int) strlen(comment);
+      if (entriesZip > 0xffff) {
+        entriesZip = 0xffff;
+      }
+      WRITE_32(header, 0x06054b50);
+      WRITE_16(header + 4, 0);    /* disk # */
+      WRITE_16(header + 6, 0);    /* disk # */
+      WRITE_16(header + 8, entriesZip);   /* hack */
+      WRITE_16(header + 10, entriesZip);  /* hack */
+      WRITE_32(header + 12, offsetCD);    /* size of CD */
+      WRITE_32(header + 16, offset);      /* offset to CD */
+      WRITE_16(header + 20, comsize);     /* comment */
+      
+      /* Header */
+      if (fwrite(header, 1, 22, fpOutCD) == 22) {
+        
+        /* Comment field */
+        if (comsize > 0) {
+          if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
+            err = Z_ERRNO;
+          }
+        }
+        
+      } else {
+        err = Z_ERRNO;
+      }
+    }
+
+    /* Final merge (file + central directory) */
+    fclose(fpOutCD);
+    if (err == Z_OK) {
+      fpOutCD = fopen(fileOutTmp, "rb");
+      if (fpOutCD != NULL) {
+        int nRead;
+        char buffer[8192];
+        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
+          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+        fclose(fpOutCD);
+      }
+    }
+    
+    /* Close */
+    fclose(fpZip);
+    fclose(fpOut);
+    
+    /* Wipe temporary file */
+    (void)remove(fileOutTmp);
+    
+    /* Number of recovered entries */
+    if (err == Z_OK) {
+      if (nRecovered != NULL) {
+        *nRecovered = entries;
+      }
+      if (bytesRecovered != NULL) {
+        *bytesRecovered = totalBytes;
+      }
+    }
+  } else {
+    err = Z_STREAM_ERROR;
+  }
+  return err;
+}
diff --git a/contrib/minizip/mztools.h b/contrib/minizip/mztools.h
index 82d1597..eee78dc 100644
--- a/contrib/minizip/mztools.h
+++ b/contrib/minizip/mztools.h
@@ -1,31 +1,31 @@
-/*

-  Additional tools for Minizip

-  Code: Xavier Roche '2004

-  License: Same as ZLIB (www.gzip.org)

-*/

-

-#ifndef _zip_tools_H

-#define _zip_tools_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#ifndef _ZLIB_H

-#include "zlib.h"

-#endif

-

-#include "unzip.h"

-

-/* Repair a ZIP file (missing central directory) 

-   file: file to recover

-   fileOut: output file after recovery

-   fileOutTmp: temporary file name used for recovery

-*/

-extern int ZEXPORT unzRepair(const char* file, 

-                             const char* fileOut, 

-                             const char* fileOutTmp, 

-                             uLong* nRecovered,

-                             uLong* bytesRecovered);

-

-#endif

+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+#ifndef _zip_tools_H
+#define _zip_tools_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#include "unzip.h"
+
+/* Repair a ZIP file (missing central directory) 
+   file: file to recover
+   fileOut: output file after recovery
+   fileOutTmp: temporary file name used for recovery
+*/
+extern int ZEXPORT unzRepair(const char* file, 
+                             const char* fileOut, 
+                             const char* fileOutTmp, 
+                             uLong* nRecovered,
+                             uLong* bytesRecovered);
+
+#endif
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index 3a70629..9ad4766 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -1,1598 +1,1598 @@
-/* unzip.c -- IO for uncompress .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   Read unzip.h for more info

-*/

-

-/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of

-compatibility with older software. The following is from the original crypt.c. Code

-woven in by Terry Thorsen 1/2003.

-*/

-/*

-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.

-

-  See the accompanying file LICENSE, version 2000-Apr-09 or later

-  (the contents of which are also included in zip.h) for terms of use.

-  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]

-

-  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

-  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).

- */

-

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include "zlib.h"

-#include "unzip.h"

-

-#ifdef STDC

-#  include <stddef.h>

-#  include <string.h>

-#  include <stdlib.h>

-#endif

-#ifdef NO_ERRNO_H

-    extern int errno;

-#else

-#   include <errno.h>

-#endif

-

-

-#ifndef local

-#  define local static

-#endif

-/* compile with -Dlocal if your debugger can't find static symbols */

-

-

-#ifndef CASESENSITIVITYDEFAULT_NO

-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)

-#    define CASESENSITIVITYDEFAULT_NO

-#  endif

-#endif

-

-

-#ifndef UNZ_BUFSIZE

-#define UNZ_BUFSIZE (16384)

-#endif

-

-#ifndef UNZ_MAXFILENAMEINZIP

-#define UNZ_MAXFILENAMEINZIP (256)

-#endif

-

-#ifndef ALLOC

-# define ALLOC(size) (malloc(size))

-#endif

-#ifndef TRYFREE

-# define TRYFREE(p) {if (p) free(p);}

-#endif

-

-#define SIZECENTRALDIRITEM (0x2e)

-#define SIZEZIPLOCALHEADER (0x1e)

-

-

-

-

-const char unz_copyright[] =

-   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";

-

-/* unz_file_info_interntal contain internal info about a file in zipfile*/

-typedef struct unz_file_info_internal_s

-{

-    uLong offset_curfile;/* relative offset of local header 4 bytes */

-} unz_file_info_internal;

-

-

-/* file_in_zip_read_info_s contain internal information about a file in zipfile,

-    when reading and decompress it */

-typedef struct

-{

-    char  *read_buffer;         /* internal buffer for compressed data */

-    z_stream stream;            /* zLib stream structure for inflate */

-

-    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/

-    uLong stream_initialised;   /* flag set if stream structure is initialised*/

-

-    uLong offset_local_extrafield;/* offset of the local extra field */

-    uInt  size_local_extrafield;/* size of the local extra field */

-    uLong pos_local_extrafield;   /* position in the local extra field in read*/

-

-    uLong crc32;                /* crc32 of all data uncompressed */

-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */

-    uLong rest_read_compressed; /* number of byte to be decompressed */

-    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/

-    zlib_filefunc_def z_filefunc;

-    voidpf filestream;        /* io structore of the zipfile */

-    uLong compression_method;   /* compression method (0==store) */

-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/

-    int   raw;

-} file_in_zip_read_info_s;

-

-

-/* unz_s contain internal information about the zipfile

-*/

-typedef struct

-{

-    zlib_filefunc_def z_filefunc;

-    voidpf filestream;        /* io structore of the zipfile */

-    unz_global_info gi;       /* public global information */

-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/

-    uLong num_file;             /* number of the current file in the zipfile*/

-    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/

-    uLong current_file_ok;      /* flag about the usability of the current file*/

-    uLong central_pos;          /* position of the beginning of the central dir*/

-

-    uLong size_central_dir;     /* size of the central directory  */

-    uLong offset_central_dir;   /* offset of start of central directory with

-                                   respect to the starting disk number */

-

-    unz_file_info cur_file_info; /* public info about the current file in zip*/

-    unz_file_info_internal cur_file_info_internal; /* private info about it*/

-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current

-                                        file if we are decompressing it */

-    int encrypted;

-#    ifndef NOUNCRYPT

-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */

-    const unsigned long* pcrc_32_tab;

-#    endif

-} unz_s;

-

-

-#ifndef NOUNCRYPT

-#include "crypt.h"

-#endif

-

-/* ===========================================================================

-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF

-   for end of file.

-   IN assertion: the stream s has been sucessfully opened for reading.

-*/

-

-

-local int unzlocal_getByte OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    int *pi));

-

-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    int *pi;

-{

-    unsigned char c;

-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);

-    if (err==1)

-    {

-        *pi = (int)c;

-        return UNZ_OK;

-    }

-    else

-    {

-        if (ZERROR(*pzlib_filefunc_def,filestream))

-            return UNZ_ERRNO;

-        else

-            return UNZ_EOF;

-    }

-}

-

-

-/* ===========================================================================

-   Reads a long in LSB order from the given gz_stream. Sets

-*/

-local int unzlocal_getShort OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong *pX;

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==UNZ_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-local int unzlocal_getLong OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong *pX;

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<16;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<24;

-

-    if (err==UNZ_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-

-/* My own strcmpi / strcasecmp */

-local int strcmpcasenosensitive_internal (fileName1,fileName2)

-    const char* fileName1;

-    const char* fileName2;

-{

-    for (;;)

-    {

-        char c1=*(fileName1++);

-        char c2=*(fileName2++);

-        if ((c1>='a') && (c1<='z'))

-            c1 -= 0x20;

-        if ((c2>='a') && (c2<='z'))

-            c2 -= 0x20;

-        if (c1=='\0')

-            return ((c2=='\0') ? 0 : -1);

-        if (c2=='\0')

-            return 1;

-        if (c1<c2)

-            return -1;

-        if (c1>c2)

-            return 1;

-    }

-}

-

-

-#ifdef  CASESENSITIVITYDEFAULT_NO

-#define CASESENSITIVITYDEFAULTVALUE 2

-#else

-#define CASESENSITIVITYDEFAULTVALUE 1

-#endif

-

-#ifndef STRCMPCASENOSENTIVEFUNCTION

-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal

-#endif

-

-/*

-   Compare two filename (fileName1,fileName2).

-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)

-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi

-                                                                or strcasecmp)

-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system

-        (like 1 on Unix, 2 on Windows)

-

-*/

-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)

-    const char* fileName1;

-    const char* fileName2;

-    int iCaseSensitivity;

-{

-    if (iCaseSensitivity==0)

-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;

-

-    if (iCaseSensitivity==1)

-        return strcmp(fileName1,fileName2);

-

-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);

-}

-

-#ifndef BUFREADCOMMENT

-#define BUFREADCOMMENT (0x400)

-#endif

-

-/*

-  Locate the Central directory of a zipfile (at the end, just before

-    the global comment)

-*/

-local uLong unzlocal_SearchCentralDir OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream));

-

-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-{

-    unsigned char* buf;

-    uLong uSizeFile;

-    uLong uBackRead;

-    uLong uMaxBack=0xffff; /* maximum size of global comment */

-    uLong uPosFound=0;

-

-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)

-        return 0;

-

-

-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);

-

-    if (uMaxBack>uSizeFile)

-        uMaxBack = uSizeFile;

-

-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);

-    if (buf==NULL)

-        return 0;

-

-    uBackRead = 4;

-    while (uBackRead<uMaxBack)

-    {

-        uLong uReadSize,uReadPos ;

-        int i;

-        if (uBackRead+BUFREADCOMMENT>uMaxBack)

-            uBackRead = uMaxBack;

-        else

-            uBackRead+=BUFREADCOMMENT;

-        uReadPos = uSizeFile-uBackRead ;

-

-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?

-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);

-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            break;

-

-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)

-            break;

-

-        for (i=(int)uReadSize-3; (i--)>0;)

-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&

-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))

-            {

-                uPosFound = uReadPos+i;

-                break;

-            }

-

-        if (uPosFound!=0)

-            break;

-    }

-    TRYFREE(buf);

-    return uPosFound;

-}

-

-/*

-  Open a Zip file. path contain the full pathname (by example,

-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer

-     "zlib/zlib114.zip".

-     If the zipfile cannot be opened (file doesn't exist or in not valid), the

-       return value is NULL.

-     Else, the return value is a unzFile Handle, usable with other function

-       of this unzip package.

-*/

-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)

-    const char *path;

-    zlib_filefunc_def* pzlib_filefunc_def;

-{

-    unz_s us;

-    unz_s *s;

-    uLong central_pos,uL;

-

-    uLong number_disk;          /* number of the current dist, used for

-                                   spaning ZIP, unsupported, always 0*/

-    uLong number_disk_with_CD;  /* number the the disk with central dir, used

-                                   for spaning ZIP, unsupported, always 0*/

-    uLong number_entry_CD;      /* total number of entries in

-                                   the central dir

-                                   (same than number_entry on nospan) */

-

-    int err=UNZ_OK;

-

-    if (unz_copyright[0]!=' ')

-        return NULL;

-

-    if (pzlib_filefunc_def==NULL)

-        fill_fopen_filefunc(&us.z_filefunc);

-    else

-        us.z_filefunc = *pzlib_filefunc_def;

-

-    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,

-                                                 path,

-                                                 ZLIB_FILEFUNC_MODE_READ |

-                                                 ZLIB_FILEFUNC_MODE_EXISTING);

-    if (us.filestream==NULL)

-        return NULL;

-

-    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);

-    if (central_pos==0)

-        err=UNZ_ERRNO;

-

-    if (ZSEEK(us.z_filefunc, us.filestream,

-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-        err=UNZ_ERRNO;

-

-    /* the signature, already checked */

-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* number of this disk */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* number of the disk with the start of the central directory */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* total number of entries in the central dir on this disk */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* total number of entries in the central dir */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if ((number_entry_CD!=us.gi.number_entry) ||

-        (number_disk_with_CD!=0) ||

-        (number_disk!=0))

-        err=UNZ_BADZIPFILE;

-

-    /* size of the central directory */

-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* offset of start of central directory with respect to the

-          starting disk number */

-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* zipfile comment length */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&

-        (err==UNZ_OK))

-        err=UNZ_BADZIPFILE;

-

-    if (err!=UNZ_OK)

-    {

-        ZCLOSE(us.z_filefunc, us.filestream);

-        return NULL;

-    }

-

-    us.byte_before_the_zipfile = central_pos -

-                            (us.offset_central_dir+us.size_central_dir);

-    us.central_pos = central_pos;

-    us.pfile_in_zip_read = NULL;

-    us.encrypted = 0;

-

-

-    s=(unz_s*)ALLOC(sizeof(unz_s));

-    *s=us;

-    unzGoToFirstFile((unzFile)s);

-    return (unzFile)s;

-}

-

-

-extern unzFile ZEXPORT unzOpen (path)

-    const char *path;

-{

-    return unzOpen2(path, NULL);

-}

-

-/*

-  Close a ZipFile opened with unzipOpen.

-  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),

-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.

-  return UNZ_OK if there is no problem. */

-extern int ZEXPORT unzClose (file)

-    unzFile file;

-{

-    unz_s* s;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    if (s->pfile_in_zip_read!=NULL)

-        unzCloseCurrentFile(file);

-

-    ZCLOSE(s->z_filefunc, s->filestream);

-    TRYFREE(s);

-    return UNZ_OK;

-}

-

-

-/*

-  Write info about the ZipFile in the *pglobal_info structure.

-  No preparation of the structure is needed

-  return UNZ_OK if there is no problem. */

-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)

-    unzFile file;

-    unz_global_info *pglobal_info;

-{

-    unz_s* s;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    *pglobal_info=s->gi;

-    return UNZ_OK;

-}

-

-

-/*

-   Translate date/time from Dos format to tm_unz (readable more easilty)

-*/

-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)

-    uLong ulDosDate;

-    tm_unz* ptm;

-{

-    uLong uDate;

-    uDate = (uLong)(ulDosDate>>16);

-    ptm->tm_mday = (uInt)(uDate&0x1f) ;

-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;

-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;

-

-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);

-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;

-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;

-}

-

-/*

-  Get Info about the current file in the zipfile, with internal only info

-*/

-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,

-                                                  unz_file_info *pfile_info,

-                                                  unz_file_info_internal

-                                                  *pfile_info_internal,

-                                                  char *szFileName,

-                                                  uLong fileNameBufferSize,

-                                                  void *extraField,

-                                                  uLong extraFieldBufferSize,

-                                                  char *szComment,

-                                                  uLong commentBufferSize));

-

-local int unzlocal_GetCurrentFileInfoInternal (file,

-                                              pfile_info,

-                                              pfile_info_internal,

-                                              szFileName, fileNameBufferSize,

-                                              extraField, extraFieldBufferSize,

-                                              szComment,  commentBufferSize)

-    unzFile file;

-    unz_file_info *pfile_info;

-    unz_file_info_internal *pfile_info_internal;

-    char *szFileName;

-    uLong fileNameBufferSize;

-    void *extraField;

-    uLong extraFieldBufferSize;

-    char *szComment;

-    uLong commentBufferSize;

-{

-    unz_s* s;

-    unz_file_info file_info;

-    unz_file_info_internal file_info_internal;

-    int err=UNZ_OK;

-    uLong uMagic;

-    long lSeek=0;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (ZSEEK(s->z_filefunc, s->filestream,

-              s->pos_in_central_dir+s->byte_before_the_zipfile,

-              ZLIB_FILEFUNC_SEEK_SET)!=0)

-        err=UNZ_ERRNO;

-

-

-    /* we check the magic */

-    if (err==UNZ_OK)

-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)

-            err=UNZ_ERRNO;

-        else if (uMagic!=0x02014b50)

-            err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    lSeek+=file_info.size_filename;

-    if ((err==UNZ_OK) && (szFileName!=NULL))

-    {

-        uLong uSizeRead ;

-        if (file_info.size_filename<fileNameBufferSize)

-        {

-            *(szFileName+file_info.size_filename)='\0';

-            uSizeRead = file_info.size_filename;

-        }

-        else

-            uSizeRead = fileNameBufferSize;

-

-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))

-            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)

-                err=UNZ_ERRNO;

-        lSeek -= uSizeRead;

-    }

-

-

-    if ((err==UNZ_OK) && (extraField!=NULL))

-    {

-        uLong uSizeRead ;

-        if (file_info.size_file_extra<extraFieldBufferSize)

-            uSizeRead = file_info.size_file_extra;

-        else

-            uSizeRead = extraFieldBufferSize;

-

-        if (lSeek!=0)

-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)

-                lSeek=0;

-            else

-                err=UNZ_ERRNO;

-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))

-            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)

-                err=UNZ_ERRNO;

-        lSeek += file_info.size_file_extra - uSizeRead;

-    }

-    else

-        lSeek+=file_info.size_file_extra;

-

-

-    if ((err==UNZ_OK) && (szComment!=NULL))

-    {

-        uLong uSizeRead ;

-        if (file_info.size_file_comment<commentBufferSize)

-        {

-            *(szComment+file_info.size_file_comment)='\0';

-            uSizeRead = file_info.size_file_comment;

-        }

-        else

-            uSizeRead = commentBufferSize;

-

-        if (lSeek!=0)

-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)

-                lSeek=0;

-            else

-                err=UNZ_ERRNO;

-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))

-            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)

-                err=UNZ_ERRNO;

-        lSeek+=file_info.size_file_comment - uSizeRead;

-    }

-    else

-        lSeek+=file_info.size_file_comment;

-

-    if ((err==UNZ_OK) && (pfile_info!=NULL))

-        *pfile_info=file_info;

-

-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))

-        *pfile_info_internal=file_info_internal;

-

-    return err;

-}

-

-

-

-/*

-  Write info about the ZipFile in the *pglobal_info structure.

-  No preparation of the structure is needed

-  return UNZ_OK if there is no problem.

-*/

-extern int ZEXPORT unzGetCurrentFileInfo (file,

-                                          pfile_info,

-                                          szFileName, fileNameBufferSize,

-                                          extraField, extraFieldBufferSize,

-                                          szComment,  commentBufferSize)

-    unzFile file;

-    unz_file_info *pfile_info;

-    char *szFileName;

-    uLong fileNameBufferSize;

-    void *extraField;

-    uLong extraFieldBufferSize;

-    char *szComment;

-    uLong commentBufferSize;

-{

-    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,

-                                                szFileName,fileNameBufferSize,

-                                                extraField,extraFieldBufferSize,

-                                                szComment,commentBufferSize);

-}

-

-/*

-  Set the current file of the zipfile to the first file.

-  return UNZ_OK if there is no problem

-*/

-extern int ZEXPORT unzGoToFirstFile (file)

-    unzFile file;

-{

-    int err=UNZ_OK;

-    unz_s* s;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    s->pos_in_central_dir=s->offset_central_dir;

-    s->num_file=0;

-    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                             &s->cur_file_info_internal,

-                                             NULL,0,NULL,0,NULL,0);

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

-

-/*

-  Set the current file of the zipfile to the next file.

-  return UNZ_OK if there is no problem

-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.

-*/

-extern int ZEXPORT unzGoToNextFile (file)

-    unzFile file;

-{

-    unz_s* s;

-    int err;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_END_OF_LIST_OF_FILE;

-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */

-      if (s->num_file+1==s->gi.number_entry)

-        return UNZ_END_OF_LIST_OF_FILE;

-

-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +

-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;

-    s->num_file++;

-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                               &s->cur_file_info_internal,

-                                               NULL,0,NULL,0,NULL,0);

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

-

-

-/*

-  Try locate the file szFileName in the zipfile.

-  For the iCaseSensitivity signification, see unzipStringFileNameCompare

-

-  return value :

-  UNZ_OK if the file is found. It becomes the current file.

-  UNZ_END_OF_LIST_OF_FILE if the file is not found

-*/

-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)

-    unzFile file;

-    const char *szFileName;

-    int iCaseSensitivity;

-{

-    unz_s* s;

-    int err;

-

-    /* We remember the 'current' position in the file so that we can jump

-     * back there if we fail.

-     */

-    unz_file_info cur_file_infoSaved;

-    unz_file_info_internal cur_file_info_internalSaved;

-    uLong num_fileSaved;

-    uLong pos_in_central_dirSaved;

-

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-

-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)

-        return UNZ_PARAMERROR;

-

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_END_OF_LIST_OF_FILE;

-

-    /* Save the current state */

-    num_fileSaved = s->num_file;

-    pos_in_central_dirSaved = s->pos_in_central_dir;

-    cur_file_infoSaved = s->cur_file_info;

-    cur_file_info_internalSaved = s->cur_file_info_internal;

-

-    err = unzGoToFirstFile(file);

-

-    while (err == UNZ_OK)

-    {

-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];

-        err = unzGetCurrentFileInfo(file,NULL,

-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,

-                                    NULL,0,NULL,0);

-        if (err == UNZ_OK)

-        {

-            if (unzStringFileNameCompare(szCurrentFileName,

-                                            szFileName,iCaseSensitivity)==0)

-                return UNZ_OK;

-            err = unzGoToNextFile(file);

-        }

-    }

-

-    /* We failed, so restore the state of the 'current file' to where we

-     * were.

-     */

-    s->num_file = num_fileSaved ;

-    s->pos_in_central_dir = pos_in_central_dirSaved ;

-    s->cur_file_info = cur_file_infoSaved;

-    s->cur_file_info_internal = cur_file_info_internalSaved;

-    return err;

-}

-

-

-/*

-///////////////////////////////////////////

-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)

-// I need random access

-//

-// Further optimization could be realized by adding an ability

-// to cache the directory in memory. The goal being a single

-// comprehensive file read to put the file I need in a memory.

-*/

-

-/*

-typedef struct unz_file_pos_s

-{

-    uLong pos_in_zip_directory;   // offset in file

-    uLong num_of_file;            // # of file

-} unz_file_pos;

-*/

-

-extern int ZEXPORT unzGetFilePos(file, file_pos)

-    unzFile file;

-    unz_file_pos* file_pos;

-{

-    unz_s* s;

-

-    if (file==NULL || file_pos==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_END_OF_LIST_OF_FILE;

-

-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;

-    file_pos->num_of_file           = s->num_file;

-

-    return UNZ_OK;

-}

-

-extern int ZEXPORT unzGoToFilePos(file, file_pos)

-    unzFile file;

-    unz_file_pos* file_pos;

-{

-    unz_s* s;

-    int err;

-

-    if (file==NULL || file_pos==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    /* jump to the right spot */

-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;

-    s->num_file           = file_pos->num_of_file;

-

-    /* set the current file */

-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                               &s->cur_file_info_internal,

-                                               NULL,0,NULL,0,NULL,0);

-    /* return results */

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

-

-/*

-// Unzip Helper Functions - should be here?

-///////////////////////////////////////////

-*/

-

-/*

-  Read the local header of the current zipfile

-  Check the coherency of the local header and info in the end of central

-        directory about this file

-  store in *piSizeVar the size of extra info in local header

-        (filename and size of extra field data)

-*/

-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,

-                                                    poffset_local_extrafield,

-                                                    psize_local_extrafield)

-    unz_s* s;

-    uInt* piSizeVar;

-    uLong *poffset_local_extrafield;

-    uInt  *psize_local_extrafield;

-{

-    uLong uMagic,uData,uFlags;

-    uLong size_filename;

-    uLong size_extra_field;

-    int err=UNZ_OK;

-

-    *piSizeVar = 0;

-    *poffset_local_extrafield = 0;

-    *psize_local_extrafield = 0;

-

-    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +

-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)

-        return UNZ_ERRNO;

-

-

-    if (err==UNZ_OK)

-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)

-            err=UNZ_ERRNO;

-        else if (uMagic!=0x04034b50)

-            err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)

-        err=UNZ_ERRNO;

-/*

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))

-        err=UNZ_BADZIPFILE;

-*/

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))

-        err=UNZ_BADZIPFILE;

-

-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&

-                         (s->cur_file_info.compression_method!=Z_DEFLATED))

-        err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&

-                              ((uFlags & 8)==0))

-        err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&

-                              ((uFlags & 8)==0))

-        err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&

-                              ((uFlags & 8)==0))

-        err=UNZ_BADZIPFILE;

-

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))

-        err=UNZ_BADZIPFILE;

-

-    *piSizeVar += (uInt)size_filename;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)

-        err=UNZ_ERRNO;

-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +

-                                    SIZEZIPLOCALHEADER + size_filename;

-    *psize_local_extrafield = (uInt)size_extra_field;

-

-    *piSizeVar += (uInt)size_extra_field;

-

-    return err;

-}

-

-/*

-  Open for reading data the current file in the zipfile.

-  If there is no error and the file is opened, the return value is UNZ_OK.

-*/

-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)

-    unzFile file;

-    int* method;

-    int* level;

-    int raw;

-    const char* password;

-{

-    int err=UNZ_OK;

-    uInt iSizeVar;

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    uLong offset_local_extrafield;  /* offset of the local extra field */

-    uInt  size_local_extrafield;    /* size of the local extra field */

-#    ifndef NOUNCRYPT

-    char source[12];

-#    else

-    if (password != NULL)

-        return UNZ_PARAMERROR;

-#    endif

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_PARAMERROR;

-

-    if (s->pfile_in_zip_read != NULL)

-        unzCloseCurrentFile(file);

-

-    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,

-                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)

-        return UNZ_BADZIPFILE;

-

-    pfile_in_zip_read_info = (file_in_zip_read_info_s*)

-                                        ALLOC(sizeof(file_in_zip_read_info_s));

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_INTERNALERROR;

-

-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);

-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;

-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;

-    pfile_in_zip_read_info->pos_local_extrafield=0;

-    pfile_in_zip_read_info->raw=raw;

-

-    if (pfile_in_zip_read_info->read_buffer==NULL)

-    {

-        TRYFREE(pfile_in_zip_read_info);

-        return UNZ_INTERNALERROR;

-    }

-

-    pfile_in_zip_read_info->stream_initialised=0;

-

-    if (method!=NULL)

-        *method = (int)s->cur_file_info.compression_method;

-

-    if (level!=NULL)

-    {

-        *level = 6;

-        switch (s->cur_file_info.flag & 0x06)

-        {

-          case 6 : *level = 1; break;

-          case 4 : *level = 2; break;

-          case 2 : *level = 9; break;

-        }

-    }

-

-    if ((s->cur_file_info.compression_method!=0) &&

-        (s->cur_file_info.compression_method!=Z_DEFLATED))

-        err=UNZ_BADZIPFILE;

-

-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;

-    pfile_in_zip_read_info->crc32=0;

-    pfile_in_zip_read_info->compression_method =

-            s->cur_file_info.compression_method;

-    pfile_in_zip_read_info->filestream=s->filestream;

-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;

-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;

-

-    pfile_in_zip_read_info->stream.total_out = 0;

-

-    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&

-        (!raw))

-    {

-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;

-      pfile_in_zip_read_info->stream.zfree = (free_func)0;

-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;

-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;

-      pfile_in_zip_read_info->stream.avail_in = 0;

-

-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);

-      if (err == Z_OK)

-        pfile_in_zip_read_info->stream_initialised=1;

-      else

-      {

-        TRYFREE(pfile_in_zip_read_info);

-        return err;

-      }

-        /* windowBits is passed < 0 to tell that there is no zlib header.

-         * Note that in this case inflate *requires* an extra "dummy" byte

-         * after the compressed stream in order to complete decompression and

-         * return Z_STREAM_END.

-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the

-         * size of both compressed and uncompressed data

-         */

-    }

-    pfile_in_zip_read_info->rest_read_compressed =

-            s->cur_file_info.compressed_size ;

-    pfile_in_zip_read_info->rest_read_uncompressed =

-            s->cur_file_info.uncompressed_size ;

-

-

-    pfile_in_zip_read_info->pos_in_zipfile =

-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +

-              iSizeVar;

-

-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;

-

-    s->pfile_in_zip_read = pfile_in_zip_read_info;

-

-#    ifndef NOUNCRYPT

-    if (password != NULL)

-    {

-        int i;

-        s->pcrc_32_tab = get_crc_table();

-        init_keys(password,s->keys,s->pcrc_32_tab);

-        if (ZSEEK(s->z_filefunc, s->filestream,

-                  s->pfile_in_zip_read->pos_in_zipfile +

-                     s->pfile_in_zip_read->byte_before_the_zipfile,

-                  SEEK_SET)!=0)

-            return UNZ_INTERNALERROR;

-        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)

-            return UNZ_INTERNALERROR;

-

-        for (i = 0; i<12; i++)

-            zdecode(s->keys,s->pcrc_32_tab,source[i]);

-

-        s->pfile_in_zip_read->pos_in_zipfile+=12;

-        s->encrypted=1;

-    }

-#    endif

-

-

-    return UNZ_OK;

-}

-

-extern int ZEXPORT unzOpenCurrentFile (file)

-    unzFile file;

-{

-    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);

-}

-

-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)

-    unzFile file;

-    const char* password;

-{

-    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);

-}

-

-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)

-    unzFile file;

-    int* method;

-    int* level;

-    int raw;

-{

-    return unzOpenCurrentFile3(file, method, level, raw, NULL);

-}

-

-/*

-  Read bytes from the current file.

-  buf contain buffer where data must be copied

-  len the size of buf.

-

-  return the number of byte copied if somes bytes are copied

-  return 0 if the end of file was reached

-  return <0 with error code if there is an error

-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)

-*/

-extern int ZEXPORT unzReadCurrentFile  (file, buf, len)

-    unzFile file;

-    voidp buf;

-    unsigned len;

-{

-    int err=UNZ_OK;

-    uInt iRead = 0;

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-

-    if ((pfile_in_zip_read_info->read_buffer == NULL))

-        return UNZ_END_OF_LIST_OF_FILE;

-    if (len==0)

-        return 0;

-

-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;

-

-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;

-

-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&

-        (!(pfile_in_zip_read_info->raw)))

-        pfile_in_zip_read_info->stream.avail_out =

-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;

-

-    if ((len>pfile_in_zip_read_info->rest_read_compressed+

-           pfile_in_zip_read_info->stream.avail_in) &&

-         (pfile_in_zip_read_info->raw))

-        pfile_in_zip_read_info->stream.avail_out =

-            (uInt)pfile_in_zip_read_info->rest_read_compressed+

-            pfile_in_zip_read_info->stream.avail_in;

-

-    while (pfile_in_zip_read_info->stream.avail_out>0)

-    {

-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&

-            (pfile_in_zip_read_info->rest_read_compressed>0))

-        {

-            uInt uReadThis = UNZ_BUFSIZE;

-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)

-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;

-            if (uReadThis == 0)

-                return UNZ_EOF;

-            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,

-                      pfile_in_zip_read_info->filestream,

-                      pfile_in_zip_read_info->pos_in_zipfile +

-                         pfile_in_zip_read_info->byte_before_the_zipfile,

-                         ZLIB_FILEFUNC_SEEK_SET)!=0)

-                return UNZ_ERRNO;

-            if (ZREAD(pfile_in_zip_read_info->z_filefunc,

-                      pfile_in_zip_read_info->filestream,

-                      pfile_in_zip_read_info->read_buffer,

-                      uReadThis)!=uReadThis)

-                return UNZ_ERRNO;

-

-

-#            ifndef NOUNCRYPT

-            if(s->encrypted)

-            {

-                uInt i;

-                for(i=0;i<uReadThis;i++)

-                  pfile_in_zip_read_info->read_buffer[i] =

-                      zdecode(s->keys,s->pcrc_32_tab,

-                              pfile_in_zip_read_info->read_buffer[i]);

-            }

-#            endif

-

-

-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;

-

-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;

-

-            pfile_in_zip_read_info->stream.next_in =

-                (Bytef*)pfile_in_zip_read_info->read_buffer;

-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;

-        }

-

-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))

-        {

-            uInt uDoCopy,i ;

-

-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&

-                (pfile_in_zip_read_info->rest_read_compressed == 0))

-                return (iRead==0) ? UNZ_EOF : iRead;

-

-            if (pfile_in_zip_read_info->stream.avail_out <

-                            pfile_in_zip_read_info->stream.avail_in)

-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;

-            else

-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;

-

-            for (i=0;i<uDoCopy;i++)

-                *(pfile_in_zip_read_info->stream.next_out+i) =

-                        *(pfile_in_zip_read_info->stream.next_in+i);

-

-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,

-                                pfile_in_zip_read_info->stream.next_out,

-                                uDoCopy);

-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;

-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;

-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;

-            pfile_in_zip_read_info->stream.next_out += uDoCopy;

-            pfile_in_zip_read_info->stream.next_in += uDoCopy;

-            pfile_in_zip_read_info->stream.total_out += uDoCopy;

-            iRead += uDoCopy;

-        }

-        else

-        {

-            uLong uTotalOutBefore,uTotalOutAfter;

-            const Bytef *bufBefore;

-            uLong uOutThis;

-            int flush=Z_SYNC_FLUSH;

-

-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;

-            bufBefore = pfile_in_zip_read_info->stream.next_out;

-

-            /*

-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==

-                     pfile_in_zip_read_info->stream.avail_out) &&

-                (pfile_in_zip_read_info->rest_read_compressed == 0))

-                flush = Z_FINISH;

-            */

-            err=inflate(&pfile_in_zip_read_info->stream,flush);

-

-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))

-              err = Z_DATA_ERROR;

-

-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;

-            uOutThis = uTotalOutAfter-uTotalOutBefore;

-

-            pfile_in_zip_read_info->crc32 =

-                crc32(pfile_in_zip_read_info->crc32,bufBefore,

-                        (uInt)(uOutThis));

-

-            pfile_in_zip_read_info->rest_read_uncompressed -=

-                uOutThis;

-

-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);

-

-            if (err==Z_STREAM_END)

-                return (iRead==0) ? UNZ_EOF : iRead;

-            if (err!=Z_OK)

-                break;

-        }

-    }

-

-    if (err==Z_OK)

-        return iRead;

-    return err;

-}

-

-

-/*

-  Give the current position in uncompressed data

-*/

-extern z_off_t ZEXPORT unztell (file)

-    unzFile file;

-{

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;

-}

-

-

-/*

-  return 1 if the end of file was reached, 0 elsewhere

-*/

-extern int ZEXPORT unzeof (file)

-    unzFile file;

-{

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)

-        return 1;

-    else

-        return 0;

-}

-

-

-

-/*

-  Read extra field from the current file (opened by unzOpenCurrentFile)

-  This is the local-header version of the extra field (sometimes, there is

-    more info in the local-header version than in the central-header)

-

-  if buf==NULL, it return the size of the local extra field that can be read

-

-  if buf!=NULL, len is the size of the buffer, the extra header is copied in

-    buf.

-  the return value is the number of bytes copied in buf, or (if <0)

-    the error code

-*/

-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)

-    unzFile file;

-    voidp buf;

-    unsigned len;

-{

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    uInt read_now;

-    uLong size_to_read;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -

-                pfile_in_zip_read_info->pos_local_extrafield);

-

-    if (buf==NULL)

-        return (int)size_to_read;

-

-    if (len>size_to_read)

-        read_now = (uInt)size_to_read;

-    else

-        read_now = (uInt)len ;

-

-    if (read_now==0)

-        return 0;

-

-    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,

-              pfile_in_zip_read_info->filestream,

-              pfile_in_zip_read_info->offset_local_extrafield +

-              pfile_in_zip_read_info->pos_local_extrafield,

-              ZLIB_FILEFUNC_SEEK_SET)!=0)

-        return UNZ_ERRNO;

-

-    if (ZREAD(pfile_in_zip_read_info->z_filefunc,

-              pfile_in_zip_read_info->filestream,

-              buf,read_now)!=read_now)

-        return UNZ_ERRNO;

-

-    return (int)read_now;

-}

-

-/*

-  Close the file in zip opened with unzipOpenCurrentFile

-  Return UNZ_CRCERROR if all the file was read but the CRC is not good

-*/

-extern int ZEXPORT unzCloseCurrentFile (file)

-    unzFile file;

-{

-    int err=UNZ_OK;

-

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-

-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&

-        (!pfile_in_zip_read_info->raw))

-    {

-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)

-            err=UNZ_CRCERROR;

-    }

-

-

-    TRYFREE(pfile_in_zip_read_info->read_buffer);

-    pfile_in_zip_read_info->read_buffer = NULL;

-    if (pfile_in_zip_read_info->stream_initialised)

-        inflateEnd(&pfile_in_zip_read_info->stream);

-

-    pfile_in_zip_read_info->stream_initialised = 0;

-    TRYFREE(pfile_in_zip_read_info);

-

-    s->pfile_in_zip_read=NULL;

-

-    return err;

-}

-

-

-/*

-  Get the global comment string of the ZipFile, in the szComment buffer.

-  uSizeBuf is the size of the szComment buffer.

-  return the number of byte copied or an error code <0

-*/

-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)

-    unzFile file;

-    char *szComment;

-    uLong uSizeBuf;

-{

-    int err=UNZ_OK;

-    unz_s* s;

-    uLong uReadThis ;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    uReadThis = uSizeBuf;

-    if (uReadThis>s->gi.size_comment)

-        uReadThis = s->gi.size_comment;

-

-    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)

-        return UNZ_ERRNO;

-

-    if (uReadThis>0)

-    {

-      *szComment='\0';

-      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)

-        return UNZ_ERRNO;

-    }

-

-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))

-        *(szComment+s->gi.size_comment)='\0';

-    return (int)uReadThis;

-}

-

-/* Additions by RX '2004 */

-extern uLong ZEXPORT unzGetOffset (file)

-    unzFile file;

-{

-    unz_s* s;

-

-    if (file==NULL)

-          return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-      return 0;

-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)

-      if (s->num_file==s->gi.number_entry)

-         return 0;

-    return s->pos_in_central_dir;

-}

-

-extern int ZEXPORT unzSetOffset (file, pos)

-        unzFile file;

-        uLong pos;

-{

-    unz_s* s;

-    int err;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    s->pos_in_central_dir = pos;

-    s->num_file = s->gi.number_entry;      /* hack */

-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                              &s->cur_file_info_internal,

-                                              NULL,0,NULL,0,NULL,0);

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

+/* unzip.c -- IO for uncompress .zip files using zlib
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   Read unzip.h for more info
+*/
+
+/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
+compatibility with older software. The following is from the original crypt.c. Code
+woven in by Terry Thorsen 1/2003.
+*/
+/*
+  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
+
+  See the accompanying file LICENSE, version 2000-Apr-09 or later
+  (the contents of which are also included in zip.h) for terms of use.
+  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]
+
+  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
+  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).
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "zlib.h"
+#include "unzip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+
+#ifndef CASESENSITIVITYDEFAULT_NO
+#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
+#    define CASESENSITIVITYDEFAULT_NO
+#  endif
+#endif
+
+
+#ifndef UNZ_BUFSIZE
+#define UNZ_BUFSIZE (16384)
+#endif
+
+#ifndef UNZ_MAXFILENAMEINZIP
+#define UNZ_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+
+
+
+
+const char unz_copyright[] =
+   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+/* unz_file_info_interntal contain internal info about a file in zipfile*/
+typedef struct unz_file_info_internal_s
+{
+    uLong offset_curfile;/* relative offset of local header 4 bytes */
+} unz_file_info_internal;
+
+
+/* file_in_zip_read_info_s contain internal information about a file in zipfile,
+    when reading and decompress it */
+typedef struct
+{
+    char  *read_buffer;         /* internal buffer for compressed data */
+    z_stream stream;            /* zLib stream structure for inflate */
+
+    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
+    uLong stream_initialised;   /* flag set if stream structure is initialised*/
+
+    uLong offset_local_extrafield;/* offset of the local extra field */
+    uInt  size_local_extrafield;/* size of the local extra field */
+    uLong pos_local_extrafield;   /* position in the local extra field in read*/
+
+    uLong crc32;                /* crc32 of all data uncompressed */
+    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
+    uLong rest_read_compressed; /* number of byte to be decompressed */
+    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
+    zlib_filefunc_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    uLong compression_method;   /* compression method (0==store) */
+    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    int   raw;
+} file_in_zip_read_info_s;
+
+
+/* unz_s contain internal information about the zipfile
+*/
+typedef struct
+{
+    zlib_filefunc_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    unz_global_info gi;       /* public global information */
+    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    uLong num_file;             /* number of the current file in the zipfile*/
+    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
+    uLong current_file_ok;      /* flag about the usability of the current file*/
+    uLong central_pos;          /* position of the beginning of the central dir*/
+
+    uLong size_central_dir;     /* size of the central directory  */
+    uLong offset_central_dir;   /* offset of start of central directory with
+                                   respect to the starting disk number */
+
+    unz_file_info cur_file_info; /* public info about the current file in zip*/
+    unz_file_info_internal cur_file_info_internal; /* private info about it*/
+    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
+                                        file if we are decompressing it */
+    int encrypted;
+#    ifndef NOUNCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const unsigned long* pcrc_32_tab;
+#    endif
+} unz_s;
+
+
+#ifndef NOUNCRYPT
+#include "crypt.h"
+#endif
+
+/* ===========================================================================
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+   for end of file.
+   IN assertion: the stream s has been sucessfully opened for reading.
+*/
+
+
+local int unzlocal_getByte OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    int *pi));
+
+local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    int *pi;
+{
+    unsigned char c;
+    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return UNZ_OK;
+    }
+    else
+    {
+        if (ZERROR(*pzlib_filefunc_def,filestream))
+            return UNZ_ERRNO;
+        else
+            return UNZ_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int unzlocal_getShort OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong *pX;
+{
+    uLong x ;
+    int i;
+    int err;
+
+    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int unzlocal_getLong OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong *pX;
+{
+    uLong x ;
+    int i;
+    int err;
+
+    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+
+/* My own strcmpi / strcasecmp */
+local int strcmpcasenosensitive_internal (fileName1,fileName2)
+    const char* fileName1;
+    const char* fileName2;
+{
+    for (;;)
+    {
+        char c1=*(fileName1++);
+        char c2=*(fileName2++);
+        if ((c1>='a') && (c1<='z'))
+            c1 -= 0x20;
+        if ((c2>='a') && (c2<='z'))
+            c2 -= 0x20;
+        if (c1=='\0')
+            return ((c2=='\0') ? 0 : -1);
+        if (c2=='\0')
+            return 1;
+        if (c1<c2)
+            return -1;
+        if (c1>c2)
+            return 1;
+    }
+}
+
+
+#ifdef  CASESENSITIVITYDEFAULT_NO
+#define CASESENSITIVITYDEFAULTVALUE 2
+#else
+#define CASESENSITIVITYDEFAULTVALUE 1
+#endif
+
+#ifndef STRCMPCASENOSENTIVEFUNCTION
+#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
+#endif
+
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+        (like 1 on Unix, 2 on Windows)
+
+*/
+extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
+    const char* fileName1;
+    const char* fileName2;
+    int iCaseSensitivity;
+{
+    if (iCaseSensitivity==0)
+        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
+
+    if (iCaseSensitivity==1)
+        return strcmp(fileName1,fileName2);
+
+    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local uLong unzlocal_SearchCentralDir OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream));
+
+local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+{
+    unsigned char* buf;
+    uLong uSizeFile;
+    uLong uBackRead;
+    uLong uMaxBack=0xffff; /* maximum size of global comment */
+    uLong uPosFound=0;
+
+    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize,uReadPos ;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
+        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    return uPosFound;
+}
+
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
+     "zlib/zlib114.zip".
+     If the zipfile cannot be opened (file doesn't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+*/
+extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
+    const char *path;
+    zlib_filefunc_def* pzlib_filefunc_def;
+{
+    unz_s us;
+    unz_s *s;
+    uLong central_pos,uL;
+
+    uLong number_disk;          /* number of the current dist, used for
+                                   spaning ZIP, unsupported, always 0*/
+    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                                   for spaning ZIP, unsupported, always 0*/
+    uLong number_entry_CD;      /* total number of entries in
+                                   the central dir
+                                   (same than number_entry on nospan) */
+
+    int err=UNZ_OK;
+
+    if (unz_copyright[0]!=' ')
+        return NULL;
+
+    if (pzlib_filefunc_def==NULL)
+        fill_fopen_filefunc(&us.z_filefunc);
+    else
+        us.z_filefunc = *pzlib_filefunc_def;
+
+    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
+                                                 path,
+                                                 ZLIB_FILEFUNC_MODE_READ |
+                                                 ZLIB_FILEFUNC_MODE_EXISTING);
+    if (us.filestream==NULL)
+        return NULL;
+
+    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
+    if (central_pos==0)
+        err=UNZ_ERRNO;
+
+    if (ZSEEK(us.z_filefunc, us.filestream,
+                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+    /* the signature, already checked */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* number of this disk */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* total number of entries in the central dir on this disk */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* total number of entries in the central dir */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if ((number_entry_CD!=us.gi.number_entry) ||
+        (number_disk_with_CD!=0) ||
+        (number_disk!=0))
+        err=UNZ_BADZIPFILE;
+
+    /* size of the central directory */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* offset of start of central directory with respect to the
+          starting disk number */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* zipfile comment length */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
+        (err==UNZ_OK))
+        err=UNZ_BADZIPFILE;
+
+    if (err!=UNZ_OK)
+    {
+        ZCLOSE(us.z_filefunc, us.filestream);
+        return NULL;
+    }
+
+    us.byte_before_the_zipfile = central_pos -
+                            (us.offset_central_dir+us.size_central_dir);
+    us.central_pos = central_pos;
+    us.pfile_in_zip_read = NULL;
+    us.encrypted = 0;
+
+
+    s=(unz_s*)ALLOC(sizeof(unz_s));
+    *s=us;
+    unzGoToFirstFile((unzFile)s);
+    return (unzFile)s;
+}
+
+
+extern unzFile ZEXPORT unzOpen (path)
+    const char *path;
+{
+    return unzOpen2(path, NULL);
+}
+
+/*
+  Close a ZipFile opened with unzipOpen.
+  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
+    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzClose (file)
+    unzFile file;
+{
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+
+    if (s->pfile_in_zip_read!=NULL)
+        unzCloseCurrentFile(file);
+
+    ZCLOSE(s->z_filefunc, s->filestream);
+    TRYFREE(s);
+    return UNZ_OK;
+}
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
+    unzFile file;
+    unz_global_info *pglobal_info;
+{
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    *pglobal_info=s->gi;
+    return UNZ_OK;
+}
+
+
+/*
+   Translate date/time from Dos format to tm_unz (readable more easilty)
+*/
+local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
+    uLong ulDosDate;
+    tm_unz* ptm;
+{
+    uLong uDate;
+    uDate = (uLong)(ulDosDate>>16);
+    ptm->tm_mday = (uInt)(uDate&0x1f) ;
+    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
+    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
+
+    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
+    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
+    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
+}
+
+/*
+  Get Info about the current file in the zipfile, with internal only info
+*/
+local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
+                                                  unz_file_info *pfile_info,
+                                                  unz_file_info_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize));
+
+local int unzlocal_GetCurrentFileInfoInternal (file,
+                                              pfile_info,
+                                              pfile_info_internal,
+                                              szFileName, fileNameBufferSize,
+                                              extraField, extraFieldBufferSize,
+                                              szComment,  commentBufferSize)
+    unzFile file;
+    unz_file_info *pfile_info;
+    unz_file_info_internal *pfile_info_internal;
+    char *szFileName;
+    uLong fileNameBufferSize;
+    void *extraField;
+    uLong extraFieldBufferSize;
+    char *szComment;
+    uLong commentBufferSize;
+{
+    unz_s* s;
+    unz_file_info file_info;
+    unz_file_info_internal file_info_internal;
+    int err=UNZ_OK;
+    uLong uMagic;
+    long lSeek=0;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (ZSEEK(s->z_filefunc, s->filestream,
+              s->pos_in_central_dir+s->byte_before_the_zipfile,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+
+    /* we check the magic */
+    if (err==UNZ_OK)
+        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x02014b50)
+            err=UNZ_BADZIPFILE;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    lSeek+=file_info.size_filename;
+    if ((err==UNZ_OK) && (szFileName!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_filename<fileNameBufferSize)
+        {
+            *(szFileName+file_info.size_filename)='\0';
+            uSizeRead = file_info.size_filename;
+        }
+        else
+            uSizeRead = fileNameBufferSize;
+
+        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek -= uSizeRead;
+    }
+
+
+    if ((err==UNZ_OK) && (extraField!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_extra<extraFieldBufferSize)
+            uSizeRead = file_info.size_file_extra;
+        else
+            uSizeRead = extraFieldBufferSize;
+
+        if (lSeek!=0)
+            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek += file_info.size_file_extra - uSizeRead;
+    }
+    else
+        lSeek+=file_info.size_file_extra;
+
+
+    if ((err==UNZ_OK) && (szComment!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_comment<commentBufferSize)
+        {
+            *(szComment+file_info.size_file_comment)='\0';
+            uSizeRead = file_info.size_file_comment;
+        }
+        else
+            uSizeRead = commentBufferSize;
+
+        if (lSeek!=0)
+            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek+=file_info.size_file_comment - uSizeRead;
+    }
+    else
+        lSeek+=file_info.size_file_comment;
+
+    if ((err==UNZ_OK) && (pfile_info!=NULL))
+        *pfile_info=file_info;
+
+    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
+        *pfile_info_internal=file_info_internal;
+
+    return err;
+}
+
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem.
+*/
+extern int ZEXPORT unzGetCurrentFileInfo (file,
+                                          pfile_info,
+                                          szFileName, fileNameBufferSize,
+                                          extraField, extraFieldBufferSize,
+                                          szComment,  commentBufferSize)
+    unzFile file;
+    unz_file_info *pfile_info;
+    char *szFileName;
+    uLong fileNameBufferSize;
+    void *extraField;
+    uLong extraFieldBufferSize;
+    char *szComment;
+    uLong commentBufferSize;
+{
+    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+}
+
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+extern int ZEXPORT unzGoToFirstFile (file)
+    unzFile file;
+{
+    int err=UNZ_OK;
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    s->pos_in_central_dir=s->offset_central_dir;
+    s->num_file=0;
+    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                             &s->cur_file_info_internal,
+                                             NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+extern int ZEXPORT unzGoToNextFile (file)
+    unzFile file;
+{
+    unz_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
+      if (s->num_file+1==s->gi.number_entry)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
+            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
+    s->num_file++;
+    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzipStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
+    unzFile file;
+    const char *szFileName;
+    int iCaseSensitivity;
+{
+    unz_s* s;
+    int err;
+
+    /* We remember the 'current' position in the file so that we can jump
+     * back there if we fail.
+     */
+    unz_file_info cur_file_infoSaved;
+    unz_file_info_internal cur_file_info_internalSaved;
+    uLong num_fileSaved;
+    uLong pos_in_central_dirSaved;
+
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+
+    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
+        return UNZ_PARAMERROR;
+
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    /* Save the current state */
+    num_fileSaved = s->num_file;
+    pos_in_central_dirSaved = s->pos_in_central_dir;
+    cur_file_infoSaved = s->cur_file_info;
+    cur_file_info_internalSaved = s->cur_file_info_internal;
+
+    err = unzGoToFirstFile(file);
+
+    while (err == UNZ_OK)
+    {
+        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
+        err = unzGetCurrentFileInfo(file,NULL,
+                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
+                                    NULL,0,NULL,0);
+        if (err == UNZ_OK)
+        {
+            if (unzStringFileNameCompare(szCurrentFileName,
+                                            szFileName,iCaseSensitivity)==0)
+                return UNZ_OK;
+            err = unzGoToNextFile(file);
+        }
+    }
+
+    /* We failed, so restore the state of the 'current file' to where we
+     * were.
+     */
+    s->num_file = num_fileSaved ;
+    s->pos_in_central_dir = pos_in_central_dirSaved ;
+    s->cur_file_info = cur_file_infoSaved;
+    s->cur_file_info_internal = cur_file_info_internalSaved;
+    return err;
+}
+
+
+/*
+///////////////////////////////////////////
+// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
+// I need random access
+//
+// Further optimization could be realized by adding an ability
+// to cache the directory in memory. The goal being a single
+// comprehensive file read to put the file I need in a memory.
+*/
+
+/*
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   // offset in file
+    uLong num_of_file;            // # of file
+} unz_file_pos;
+*/
+
+extern int ZEXPORT unzGetFilePos(file, file_pos)
+    unzFile file;
+    unz_file_pos* file_pos;
+{
+    unz_s* s;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
+    file_pos->num_of_file           = s->num_file;
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGoToFilePos(file, file_pos)
+    unzFile file;
+    unz_file_pos* file_pos;
+{
+    unz_s* s;
+    int err;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+
+    /* jump to the right spot */
+    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
+    s->num_file           = file_pos->num_of_file;
+
+    /* set the current file */
+    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    /* return results */
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+/*
+// Unzip Helper Functions - should be here?
+///////////////////////////////////////////
+*/
+
+/*
+  Read the local header of the current zipfile
+  Check the coherency of the local header and info in the end of central
+        directory about this file
+  store in *piSizeVar the size of extra info in local header
+        (filename and size of extra field data)
+*/
+local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
+                                                    poffset_local_extrafield,
+                                                    psize_local_extrafield)
+    unz_s* s;
+    uInt* piSizeVar;
+    uLong *poffset_local_extrafield;
+    uInt  *psize_local_extrafield;
+{
+    uLong uMagic,uData,uFlags;
+    uLong size_filename;
+    uLong size_extra_field;
+    int err=UNZ_OK;
+
+    *piSizeVar = 0;
+    *poffset_local_extrafield = 0;
+    *psize_local_extrafield = 0;
+
+    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
+                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+
+    if (err==UNZ_OK)
+        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x04034b50)
+            err=UNZ_BADZIPFILE;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+/*
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
+        err=UNZ_BADZIPFILE;
+*/
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
+        err=UNZ_BADZIPFILE;
+
+    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
+                         (s->cur_file_info.compression_method!=Z_DEFLATED))
+        err=UNZ_BADZIPFILE;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
+        err=UNZ_BADZIPFILE;
+
+    *piSizeVar += (uInt)size_filename;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
+        err=UNZ_ERRNO;
+    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
+                                    SIZEZIPLOCALHEADER + size_filename;
+    *psize_local_extrafield = (uInt)size_extra_field;
+
+    *piSizeVar += (uInt)size_extra_field;
+
+    return err;
+}
+
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error and the file is opened, the return value is UNZ_OK.
+*/
+extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
+    unzFile file;
+    int* method;
+    int* level;
+    int raw;
+    const char* password;
+{
+    int err=UNZ_OK;
+    uInt iSizeVar;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    uLong offset_local_extrafield;  /* offset of the local extra field */
+    uInt  size_local_extrafield;    /* size of the local extra field */
+#    ifndef NOUNCRYPT
+    char source[12];
+#    else
+    if (password != NULL)
+        return UNZ_PARAMERROR;
+#    endif
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_PARAMERROR;
+
+    if (s->pfile_in_zip_read != NULL)
+        unzCloseCurrentFile(file);
+
+    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
+                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+        return UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
+                                        ALLOC(sizeof(file_in_zip_read_info_s));
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_INTERNALERROR;
+
+    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
+    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
+    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
+    pfile_in_zip_read_info->pos_local_extrafield=0;
+    pfile_in_zip_read_info->raw=raw;
+
+    if (pfile_in_zip_read_info->read_buffer==NULL)
+    {
+        TRYFREE(pfile_in_zip_read_info);
+        return UNZ_INTERNALERROR;
+    }
+
+    pfile_in_zip_read_info->stream_initialised=0;
+
+    if (method!=NULL)
+        *method = (int)s->cur_file_info.compression_method;
+
+    if (level!=NULL)
+    {
+        *level = 6;
+        switch (s->cur_file_info.flag & 0x06)
+        {
+          case 6 : *level = 1; break;
+          case 4 : *level = 2; break;
+          case 2 : *level = 9; break;
+        }
+    }
+
+    if ((s->cur_file_info.compression_method!=0) &&
+        (s->cur_file_info.compression_method!=Z_DEFLATED))
+        err=UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
+    pfile_in_zip_read_info->crc32=0;
+    pfile_in_zip_read_info->compression_method =
+            s->cur_file_info.compression_method;
+    pfile_in_zip_read_info->filestream=s->filestream;
+    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
+    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
+
+    pfile_in_zip_read_info->stream.total_out = 0;
+
+    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
+        (!raw))
+    {
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=1;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+        /* windowBits is passed < 0 to tell that there is no zlib header.
+         * Note that in this case inflate *requires* an extra "dummy" byte
+         * after the compressed stream in order to complete decompression and
+         * return Z_STREAM_END.
+         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+         * size of both compressed and uncompressed data
+         */
+    }
+    pfile_in_zip_read_info->rest_read_compressed =
+            s->cur_file_info.compressed_size ;
+    pfile_in_zip_read_info->rest_read_uncompressed =
+            s->cur_file_info.uncompressed_size ;
+
+
+    pfile_in_zip_read_info->pos_in_zipfile =
+            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
+              iSizeVar;
+
+    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+    s->pfile_in_zip_read = pfile_in_zip_read_info;
+
+#    ifndef NOUNCRYPT
+    if (password != NULL)
+    {
+        int i;
+        s->pcrc_32_tab = get_crc_table();
+        init_keys(password,s->keys,s->pcrc_32_tab);
+        if (ZSEEK(s->z_filefunc, s->filestream,
+                  s->pfile_in_zip_read->pos_in_zipfile +
+                     s->pfile_in_zip_read->byte_before_the_zipfile,
+                  SEEK_SET)!=0)
+            return UNZ_INTERNALERROR;
+        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
+            return UNZ_INTERNALERROR;
+
+        for (i = 0; i<12; i++)
+            zdecode(s->keys,s->pcrc_32_tab,source[i]);
+
+        s->pfile_in_zip_read->pos_in_zipfile+=12;
+        s->encrypted=1;
+    }
+#    endif
+
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzOpenCurrentFile (file)
+    unzFile file;
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
+}
+
+extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
+    unzFile file;
+    const char* password;
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
+}
+
+extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
+    unzFile file;
+    int* method;
+    int* level;
+    int raw;
+{
+    return unzOpenCurrentFile3(file, method, level, raw, NULL);
+}
+
+/*
+  Read bytes from the current file.
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
+    unzFile file;
+    voidp buf;
+    unsigned len;
+{
+    int err=UNZ_OK;
+    uInt iRead = 0;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if ((pfile_in_zip_read_info->read_buffer == NULL))
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (len==0)
+        return 0;
+
+    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
+
+    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
+
+    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+        (!(pfile_in_zip_read_info->raw)))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+
+    if ((len>pfile_in_zip_read_info->rest_read_compressed+
+           pfile_in_zip_read_info->stream.avail_in) &&
+         (pfile_in_zip_read_info->raw))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_compressed+
+            pfile_in_zip_read_info->stream.avail_in;
+
+    while (pfile_in_zip_read_info->stream.avail_out>0)
+    {
+        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
+            (pfile_in_zip_read_info->rest_read_compressed>0))
+        {
+            uInt uReadThis = UNZ_BUFSIZE;
+            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
+                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
+            if (uReadThis == 0)
+                return UNZ_EOF;
+            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile,
+                         ZLIB_FILEFUNC_SEEK_SET)!=0)
+                return UNZ_ERRNO;
+            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->read_buffer,
+                      uReadThis)!=uReadThis)
+                return UNZ_ERRNO;
+
+
+#            ifndef NOUNCRYPT
+            if(s->encrypted)
+            {
+                uInt i;
+                for(i=0;i<uReadThis;i++)
+                  pfile_in_zip_read_info->read_buffer[i] =
+                      zdecode(s->keys,s->pcrc_32_tab,
+                              pfile_in_zip_read_info->read_buffer[i]);
+            }
+#            endif
+
+
+            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+
+            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
+
+            pfile_in_zip_read_info->stream.next_in =
+                (Bytef*)pfile_in_zip_read_info->read_buffer;
+            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+        }
+
+        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
+        {
+            uInt uDoCopy,i ;
+
+            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                return (iRead==0) ? UNZ_EOF : iRead;
+
+            if (pfile_in_zip_read_info->stream.avail_out <
+                            pfile_in_zip_read_info->stream.avail_in)
+                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
+            else
+                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
+
+            for (i=0;i<uDoCopy;i++)
+                *(pfile_in_zip_read_info->stream.next_out+i) =
+                        *(pfile_in_zip_read_info->stream.next_in+i);
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
+                                pfile_in_zip_read_info->stream.next_out,
+                                uDoCopy);
+            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
+            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
+            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
+            pfile_in_zip_read_info->stream.next_out += uDoCopy;
+            pfile_in_zip_read_info->stream.next_in += uDoCopy;
+            pfile_in_zip_read_info->stream.total_out += uDoCopy;
+            iRead += uDoCopy;
+        }
+        else
+        {
+            uLong uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            uLong uOutThis;
+            int flush=Z_SYNC_FLUSH;
+
+            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
+            bufBefore = pfile_in_zip_read_info->stream.next_out;
+
+            /*
+            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
+                     pfile_in_zip_read_info->stream.avail_out) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                flush = Z_FINISH;
+            */
+            err=inflate(&pfile_in_zip_read_info->stream,flush);
+
+            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
+              err = Z_DATA_ERROR;
+
+            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->crc32 =
+                crc32(pfile_in_zip_read_info->crc32,bufBefore,
+                        (uInt)(uOutThis));
+
+            pfile_in_zip_read_info->rest_read_uncompressed -=
+                uOutThis;
+
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            if (err==Z_STREAM_END)
+                return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=Z_OK)
+                break;
+        }
+    }
+
+    if (err==Z_OK)
+        return iRead;
+    return err;
+}
+
+
+/*
+  Give the current position in uncompressed data
+*/
+extern z_off_t ZEXPORT unztell (file)
+    unzFile file;
+{
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
+}
+
+
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+extern int ZEXPORT unzeof (file)
+    unzFile file;
+{
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
+        return 1;
+    else
+        return 0;
+}
+
+
+
+/*
+  Read extra field from the current file (opened by unzOpenCurrentFile)
+  This is the local-header version of the extra field (sometimes, there is
+    more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field that can be read
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
+    unzFile file;
+    voidp buf;
+    unsigned len;
+{
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    uInt read_now;
+    uLong size_to_read;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
+                pfile_in_zip_read_info->pos_local_extrafield);
+
+    if (buf==NULL)
+        return (int)size_to_read;
+
+    if (len>size_to_read)
+        read_now = (uInt)size_to_read;
+    else
+        read_now = (uInt)len ;
+
+    if (read_now==0)
+        return 0;
+
+    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              pfile_in_zip_read_info->offset_local_extrafield +
+              pfile_in_zip_read_info->pos_local_extrafield,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              buf,read_now)!=read_now)
+        return UNZ_ERRNO;
+
+    return (int)read_now;
+}
+
+/*
+  Close the file in zip opened with unzipOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+extern int ZEXPORT unzCloseCurrentFile (file)
+    unzFile file;
+{
+    int err=UNZ_OK;
+
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
+        (!pfile_in_zip_read_info->raw))
+    {
+        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
+            err=UNZ_CRCERROR;
+    }
+
+
+    TRYFREE(pfile_in_zip_read_info->read_buffer);
+    pfile_in_zip_read_info->read_buffer = NULL;
+    if (pfile_in_zip_read_info->stream_initialised)
+        inflateEnd(&pfile_in_zip_read_info->stream);
+
+    pfile_in_zip_read_info->stream_initialised = 0;
+    TRYFREE(pfile_in_zip_read_info);
+
+    s->pfile_in_zip_read=NULL;
+
+    return err;
+}
+
+
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
+    unzFile file;
+    char *szComment;
+    uLong uSizeBuf;
+{
+    int err=UNZ_OK;
+    unz_s* s;
+    uLong uReadThis ;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+
+    uReadThis = uSizeBuf;
+    if (uReadThis>s->gi.size_comment)
+        uReadThis = s->gi.size_comment;
+
+    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (uReadThis>0)
+    {
+      *szComment='\0';
+      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
+        return UNZ_ERRNO;
+    }
+
+    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
+        *(szComment+s->gi.size_comment)='\0';
+    return (int)uReadThis;
+}
+
+/* Additions by RX '2004 */
+extern uLong ZEXPORT unzGetOffset (file)
+    unzFile file;
+{
+    unz_s* s;
+
+    if (file==NULL)
+          return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+      return 0;
+    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
+      if (s->num_file==s->gi.number_entry)
+         return 0;
+    return s->pos_in_central_dir;
+}
+
+extern int ZEXPORT unzSetOffset (file, pos)
+        unzFile file;
+        uLong pos;
+{
+    unz_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+
+    s->pos_in_central_dir = pos;
+    s->num_file = s->gi.number_entry;      /* hack */
+    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                              &s->cur_file_info_internal,
+                                              NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h
index c3206a0..b247937 100644
--- a/contrib/minizip/unzip.h
+++ b/contrib/minizip/unzip.h
@@ -1,354 +1,354 @@
-/* unzip.h -- IO for uncompress .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g

-     WinZip, InfoZip tools and compatible.

-

-   Multi volume ZipFile (span) are not supported.

-   Encryption compatible with pkzip 2.04g only supported

-   Old compressions used by old PKZip 1.x are not supported

-

-

-   I WAIT FEEDBACK at mail info@winimage.com

-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution

-

-   Condition of use and distribution are the same than zlib :

-

-  This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-

-*/

-

-/* for more info about .ZIP format, see

-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip

-      http://www.info-zip.org/pub/infozip/doc/

-   PkWare has also a specification at :

-      ftp://ftp.pkware.com/probdesc.zip

-*/

-

-#ifndef _unz_H

-#define _unz_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#ifndef _ZLIB_H

-#include "zlib.h"

-#endif

-

-#ifndef _ZLIBIOAPI_H

-#include "ioapi.h"

-#endif

-

-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)

-/* like the STRICT of WIN32, we define a pointer that cannot be converted

-    from (void*) without cast */

-typedef struct TagunzFile__ { int unused; } unzFile__;

-typedef unzFile__ *unzFile;

-#else

-typedef voidp unzFile;

-#endif

-

-

-#define UNZ_OK                          (0)

-#define UNZ_END_OF_LIST_OF_FILE         (-100)

-#define UNZ_ERRNO                       (Z_ERRNO)

-#define UNZ_EOF                         (0)

-#define UNZ_PARAMERROR                  (-102)

-#define UNZ_BADZIPFILE                  (-103)

-#define UNZ_INTERNALERROR               (-104)

-#define UNZ_CRCERROR                    (-105)

-

-/* tm_unz contain date/time info */

-typedef struct tm_unz_s

-{

-    uInt tm_sec;            /* seconds after the minute - [0,59] */

-    uInt tm_min;            /* minutes after the hour - [0,59] */

-    uInt tm_hour;           /* hours since midnight - [0,23] */

-    uInt tm_mday;           /* day of the month - [1,31] */

-    uInt tm_mon;            /* months since January - [0,11] */

-    uInt tm_year;           /* years - [1980..2044] */

-} tm_unz;

-

-/* unz_global_info structure contain global data about the ZIPfile

-   These data comes from the end of central dir */

-typedef struct unz_global_info_s

-{

-    uLong number_entry;         /* total number of entries in

-                       the central dir on this disk */

-    uLong size_comment;         /* size of the global comment of the zipfile */

-} unz_global_info;

-

-

-/* unz_file_info contain information about a file in the zipfile */

-typedef struct unz_file_info_s

-{

-    uLong version;              /* version made by                 2 bytes */

-    uLong version_needed;       /* version needed to extract       2 bytes */

-    uLong flag;                 /* general purpose bit flag        2 bytes */

-    uLong compression_method;   /* compression method              2 bytes */

-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */

-    uLong crc;                  /* crc-32                          4 bytes */

-    uLong compressed_size;      /* compressed size                 4 bytes */

-    uLong uncompressed_size;    /* uncompressed size               4 bytes */

-    uLong size_filename;        /* filename length                 2 bytes */

-    uLong size_file_extra;      /* extra field length              2 bytes */

-    uLong size_file_comment;    /* file comment length             2 bytes */

-

-    uLong disk_num_start;       /* disk number start               2 bytes */

-    uLong internal_fa;          /* internal file attributes        2 bytes */

-    uLong external_fa;          /* external file attributes        4 bytes */

-

-    tm_unz tmu_date;

-} unz_file_info;

-

-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,

-                                                 const char* fileName2,

-                                                 int iCaseSensitivity));

-/*

-   Compare two filename (fileName1,fileName2).

-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)

-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi

-                                or strcasecmp)

-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system

-    (like 1 on Unix, 2 on Windows)

-*/

-

-

-extern unzFile ZEXPORT unzOpen OF((const char *path));

-/*

-  Open a Zip file. path contain the full pathname (by example,

-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer

-     "zlib/zlib113.zip".

-     If the zipfile cannot be opened (file don't exist or in not valid), the

-       return value is NULL.

-     Else, the return value is a unzFile Handle, usable with other function

-       of this unzip package.

-*/

-

-extern unzFile ZEXPORT unzOpen2 OF((const char *path,

-                                    zlib_filefunc_def* pzlib_filefunc_def));

-/*

-   Open a Zip file, like unzOpen, but provide a set of file low level API

-      for read/write the zip file (see ioapi.h)

-*/

-

-extern int ZEXPORT unzClose OF((unzFile file));

-/*

-  Close a ZipFile opened with unzipOpen.

-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),

-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.

-  return UNZ_OK if there is no problem. */

-

-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,

-                                        unz_global_info *pglobal_info));

-/*

-  Write info about the ZipFile in the *pglobal_info structure.

-  No preparation of the structure is needed

-  return UNZ_OK if there is no problem. */

-

-

-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,

-                                           char *szComment,

-                                           uLong uSizeBuf));

-/*

-  Get the global comment string of the ZipFile, in the szComment buffer.

-  uSizeBuf is the size of the szComment buffer.

-  return the number of byte copied or an error code <0

-*/

-

-

-/***************************************************************************/

-/* Unzip package allow you browse the directory of the zipfile */

-

-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));

-/*

-  Set the current file of the zipfile to the first file.

-  return UNZ_OK if there is no problem

-*/

-

-extern int ZEXPORT unzGoToNextFile OF((unzFile file));

-/*

-  Set the current file of the zipfile to the next file.

-  return UNZ_OK if there is no problem

-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.

-*/

-

-extern int ZEXPORT unzLocateFile OF((unzFile file,

-                     const char *szFileName,

-                     int iCaseSensitivity));

-/*

-  Try locate the file szFileName in the zipfile.

-  For the iCaseSensitivity signification, see unzStringFileNameCompare

-

-  return value :

-  UNZ_OK if the file is found. It becomes the current file.

-  UNZ_END_OF_LIST_OF_FILE if the file is not found

-*/

-

-

-/* ****************************************** */

-/* Ryan supplied functions */

-/* unz_file_info contain information about a file in the zipfile */

-typedef struct unz_file_pos_s

-{

-    uLong pos_in_zip_directory;   /* offset in zip file directory */

-    uLong num_of_file;            /* # of file */

-} unz_file_pos;

-

-extern int ZEXPORT unzGetFilePos(

-    unzFile file,

-    unz_file_pos* file_pos);

-

-extern int ZEXPORT unzGoToFilePos(

-    unzFile file,

-    unz_file_pos* file_pos);

-

-/* ****************************************** */

-

-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,

-                         unz_file_info *pfile_info,

-                         char *szFileName,

-                         uLong fileNameBufferSize,

-                         void *extraField,

-                         uLong extraFieldBufferSize,

-                         char *szComment,

-                         uLong commentBufferSize));

-/*

-  Get Info about the current file

-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about

-        the current file

-  if szFileName!=NULL, the filemane string will be copied in szFileName

-            (fileNameBufferSize is the size of the buffer)

-  if extraField!=NULL, the extra field information will be copied in extraField

-            (extraFieldBufferSize is the size of the buffer).

-            This is the Central-header version of the extra field

-  if szComment!=NULL, the comment string of the file will be copied in szComment

-            (commentBufferSize is the size of the buffer)

-*/

-

-/***************************************************************************/

-/* for reading the content of the current zipfile, you can open it, read data

-   from it, and close it (you can close it before reading all the file)

-   */

-

-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));

-/*

-  Open for reading data the current file in the zipfile.

-  If there is no error, the return value is UNZ_OK.

-*/

-

-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,

-                                                  const char* password));

-/*

-  Open for reading data the current file in the zipfile.

-  password is a crypting password

-  If there is no error, the return value is UNZ_OK.

-*/

-

-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,

-                                           int* method,

-                                           int* level,

-                                           int raw));

-/*

-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)

-    if raw==1

-  *method will receive method of compression, *level will receive level of

-     compression

-  note : you can set level parameter as NULL (if you did not want known level,

-         but you CANNOT set method parameter as NULL

-*/

-

-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,

-                                           int* method,

-                                           int* level,

-                                           int raw,

-                                           const char* password));

-/*

-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)

-    if raw==1

-  *method will receive method of compression, *level will receive level of

-     compression

-  note : you can set level parameter as NULL (if you did not want known level,

-         but you CANNOT set method parameter as NULL

-*/

-

-

-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));

-/*

-  Close the file in zip opened with unzOpenCurrentFile

-  Return UNZ_CRCERROR if all the file was read but the CRC is not good

-*/

-

-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,

-                      voidp buf,

-                      unsigned len));

-/*

-  Read bytes from the current file (opened by unzOpenCurrentFile)

-  buf contain buffer where data must be copied

-  len the size of buf.

-

-  return the number of byte copied if somes bytes are copied

-  return 0 if the end of file was reached

-  return <0 with error code if there is an error

-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)

-*/

-

-extern z_off_t ZEXPORT unztell OF((unzFile file));

-/*

-  Give the current position in uncompressed data

-*/

-

-extern int ZEXPORT unzeof OF((unzFile file));

-/*

-  return 1 if the end of file was reached, 0 elsewhere

-*/

-

-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,

-                                             voidp buf,

-                                             unsigned len));

-/*

-  Read extra field from the current file (opened by unzOpenCurrentFile)

-  This is the local-header version of the extra field (sometimes, there is

-    more info in the local-header version than in the central-header)

-

-  if buf==NULL, it return the size of the local extra field

-

-  if buf!=NULL, len is the size of the buffer, the extra header is copied in

-    buf.

-  the return value is the number of bytes copied in buf, or (if <0)

-    the error code

-*/

-

-/***************************************************************************/

-

-/* Get the current file offset */

-extern uLong ZEXPORT unzGetOffset (unzFile file);

-

-/* Set the current file offset */

-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);

-

-

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* _unz_H */

+/* unzip.h -- IO for uncompress .zip files using zlib
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
+     WinZip, InfoZip tools and compatible.
+
+   Multi volume ZipFile (span) are not supported.
+   Encryption compatible with pkzip 2.04g only supported
+   Old compressions used by old PKZip 1.x are not supported
+
+
+   I WAIT FEEDBACK at mail info@winimage.com
+   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
+
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+
+*/
+
+/* for more info about .ZIP format, see
+      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
+      http://www.info-zip.org/pub/infozip/doc/
+   PkWare has also a specification at :
+      ftp://ftp.pkware.com/probdesc.zip
+*/
+
+#ifndef _unz_H
+#define _unz_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagunzFile__ { int unused; } unzFile__;
+typedef unzFile__ *unzFile;
+#else
+typedef voidp unzFile;
+#endif
+
+
+#define UNZ_OK                          (0)
+#define UNZ_END_OF_LIST_OF_FILE         (-100)
+#define UNZ_ERRNO                       (Z_ERRNO)
+#define UNZ_EOF                         (0)
+#define UNZ_PARAMERROR                  (-102)
+#define UNZ_BADZIPFILE                  (-103)
+#define UNZ_INTERNALERROR               (-104)
+#define UNZ_CRCERROR                    (-105)
+
+/* tm_unz contain date/time info */
+typedef struct tm_unz_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_unz;
+
+/* unz_global_info structure contain global data about the ZIPfile
+   These data comes from the end of central dir */
+typedef struct unz_global_info_s
+{
+    uLong number_entry;         /* total number of entries in
+                       the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info;
+
+
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_info_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    uLong compressed_size;      /* compressed size                 4 bytes */
+    uLong uncompressed_size;    /* uncompressed size               4 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info;
+
+extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
+                                                 const char* fileName2,
+                                                 int iCaseSensitivity));
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+    (like 1 on Unix, 2 on Windows)
+*/
+
+
+extern unzFile ZEXPORT unzOpen OF((const char *path));
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
+     "zlib/zlib113.zip".
+     If the zipfile cannot be opened (file don't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+*/
+
+extern unzFile ZEXPORT unzOpen2 OF((const char *path,
+                                    zlib_filefunc_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unzOpen, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
+extern int ZEXPORT unzClose OF((unzFile file));
+/*
+  Close a ZipFile opened with unzipOpen.
+  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+  return UNZ_OK if there is no problem. */
+
+extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
+                                        unz_global_info *pglobal_info));
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+
+
+extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
+                                           char *szComment,
+                                           uLong uSizeBuf));
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+
+
+/***************************************************************************/
+/* Unzip package allow you browse the directory of the zipfile */
+
+extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+
+extern int ZEXPORT unzGoToNextFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+
+extern int ZEXPORT unzLocateFile OF((unzFile file,
+                     const char *szFileName,
+                     int iCaseSensitivity));
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+
+
+/* ****************************************** */
+/* Ryan supplied functions */
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   /* offset in zip file directory */
+    uLong num_of_file;            /* # of file */
+} unz_file_pos;
+
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+/* ****************************************** */
+
+extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
+                         unz_file_info *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+/*
+  Get Info about the current file
+  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
+        the current file
+  if szFileName!=NULL, the filemane string will be copied in szFileName
+            (fileNameBufferSize is the size of the buffer)
+  if extraField!=NULL, the extra field information will be copied in extraField
+            (extraFieldBufferSize is the size of the buffer).
+            This is the Central-header version of the extra field
+  if szComment!=NULL, the comment string of the file will be copied in szComment
+            (commentBufferSize is the size of the buffer)
+*/
+
+/***************************************************************************/
+/* for reading the content of the current zipfile, you can open it, read data
+   from it, and close it (you can close it before reading all the file)
+   */
+
+extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
+                                                  const char* password));
+/*
+  Open for reading data the current file in the zipfile.
+  password is a crypting password
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw,
+                                           const char* password));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+
+extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
+/*
+  Close the file in zip opened with unzOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+
+extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
+                      voidp buf,
+                      unsigned len));
+/*
+  Read bytes from the current file (opened by unzOpenCurrentFile)
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+
+extern z_off_t ZEXPORT unztell OF((unzFile file));
+/*
+  Give the current position in uncompressed data
+*/
+
+extern int ZEXPORT unzeof OF((unzFile file));
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+
+extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
+                                             voidp buf,
+                                             unsigned len));
+/*
+  Read extra field from the current file (opened by unzOpenCurrentFile)
+  This is the local-header version of the extra field (sometimes, there is
+    more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+
+/***************************************************************************/
+
+/* Get the current file offset */
+extern uLong ZEXPORT unzGetOffset (unzFile file);
+
+/* Set the current file offset */
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _unz_H */
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
index 400e2ba..7fbe002 100644
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
@@ -1,1219 +1,1219 @@
-/* zip.c -- IO on .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   27 Dec 2004 Rolf Kalbermatter

-   Modification to zipOpen2 to support globalComment retrieval.

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   Read zip.h for more info

-*/

-

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <time.h>

-#include "zlib.h"

-#include "zip.h"

-

-#ifdef STDC

-#  include <stddef.h>

-#  include <string.h>

-#  include <stdlib.h>

-#endif

-#ifdef NO_ERRNO_H

-    extern int errno;

-#else

-#   include <errno.h>

-#endif

-

-

-#ifndef local

-#  define local static

-#endif

-/* compile with -Dlocal if your debugger can't find static symbols */

-

-#ifndef VERSIONMADEBY

-# define VERSIONMADEBY   (0x0) /* platform depedent */

-#endif

-

-#ifndef Z_BUFSIZE

-#define Z_BUFSIZE (16384)

-#endif

-

-#ifndef Z_MAXFILENAMEINZIP

-#define Z_MAXFILENAMEINZIP (256)

-#endif

-

-#ifndef ALLOC

-# define ALLOC(size) (malloc(size))

-#endif

-#ifndef TRYFREE

-# define TRYFREE(p) {if (p) free(p);}

-#endif

-

-/*

-#define SIZECENTRALDIRITEM (0x2e)

-#define SIZEZIPLOCALHEADER (0x1e)

-*/

-

-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */

-

-#ifndef SEEK_CUR

-#define SEEK_CUR    1

-#endif

-

-#ifndef SEEK_END

-#define SEEK_END    2

-#endif

-

-#ifndef SEEK_SET

-#define SEEK_SET    0

-#endif

-

-#ifndef DEF_MEM_LEVEL

-#if MAX_MEM_LEVEL >= 8

-#  define DEF_MEM_LEVEL 8

-#else

-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL

-#endif

-#endif

-const char zip_copyright[] =

-   " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";

-

-

-#define SIZEDATA_INDATABLOCK (4096-(4*4))

-

-#define LOCALHEADERMAGIC    (0x04034b50)

-#define CENTRALHEADERMAGIC  (0x02014b50)

-#define ENDHEADERMAGIC      (0x06054b50)

-

-#define FLAG_LOCALHEADER_OFFSET (0x06)

-#define CRC_LOCALHEADER_OFFSET  (0x0e)

-

-#define SIZECENTRALHEADER (0x2e) /* 46 */

-

-typedef struct linkedlist_datablock_internal_s

-{

-  struct linkedlist_datablock_internal_s* next_datablock;

-  uLong  avail_in_this_block;

-  uLong  filled_in_this_block;

-  uLong  unused; /* for future use and alignement */

-  unsigned char data[SIZEDATA_INDATABLOCK];

-} linkedlist_datablock_internal;

-

-typedef struct linkedlist_data_s

-{

-    linkedlist_datablock_internal* first_block;

-    linkedlist_datablock_internal* last_block;

-} linkedlist_data;

-

-

-typedef struct

-{

-    z_stream stream;            /* zLib stream structure for inflate */

-    int  stream_initialised;    /* 1 is stream is initialised */

-    uInt pos_in_buffered_data;  /* last written byte in buffered_data */

-

-    uLong pos_local_header;     /* offset of the local header of the file

-                                     currenty writing */

-    char* central_header;       /* central header data for the current file */

-    uLong size_centralheader;   /* size of the central header for cur file */

-    uLong flag;                 /* flag of the file currently writing */

-

-    int  method;                /* compression method of file currenty wr.*/

-    int  raw;                   /* 1 for directly writing raw data */

-    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/

-    uLong dosDate;

-    uLong crc32;

-    int  encrypt;

-#ifndef NOCRYPT

-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */

-    const unsigned long* pcrc_32_tab;

-    int crypt_header_size;

-#endif

-} curfile_info;

-

-typedef struct

-{

-    zlib_filefunc_def z_filefunc;

-    voidpf filestream;        /* io structore of the zipfile */

-    linkedlist_data central_dir;/* datablock with central dir in construction*/

-    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/

-    curfile_info ci;            /* info on the file curretly writing */

-

-    uLong begin_pos;            /* position of the beginning of the zipfile */

-    uLong add_position_when_writting_offset;

-    uLong number_entry;

-#ifndef NO_ADDFILEINEXISTINGZIP

-    char *globalcomment;

-#endif

-} zip_internal;

-

-

-

-#ifndef NOCRYPT

-#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED

-#include "crypt.h"

-#endif

-

-local linkedlist_datablock_internal* allocate_new_datablock()

-{

-    linkedlist_datablock_internal* ldi;

-    ldi = (linkedlist_datablock_internal*)

-                 ALLOC(sizeof(linkedlist_datablock_internal));

-    if (ldi!=NULL)

-    {

-        ldi->next_datablock = NULL ;

-        ldi->filled_in_this_block = 0 ;

-        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;

-    }

-    return ldi;

-}

-

-local void free_datablock(ldi)

-    linkedlist_datablock_internal* ldi;

-{

-    while (ldi!=NULL)

-    {

-        linkedlist_datablock_internal* ldinext = ldi->next_datablock;

-        TRYFREE(ldi);

-        ldi = ldinext;

-    }

-}

-

-local void init_linkedlist(ll)

-    linkedlist_data* ll;

-{

-    ll->first_block = ll->last_block = NULL;

-}

-

-local void free_linkedlist(ll)

-    linkedlist_data* ll;

-{

-    free_datablock(ll->first_block);

-    ll->first_block = ll->last_block = NULL;

-}

-

-

-local int add_data_in_datablock(ll,buf,len)

-    linkedlist_data* ll;

-    const void* buf;

-    uLong len;

-{

-    linkedlist_datablock_internal* ldi;

-    const unsigned char* from_copy;

-

-    if (ll==NULL)

-        return ZIP_INTERNALERROR;

-

-    if (ll->last_block == NULL)

-    {

-        ll->first_block = ll->last_block = allocate_new_datablock();

-        if (ll->first_block == NULL)

-            return ZIP_INTERNALERROR;

-    }

-

-    ldi = ll->last_block;

-    from_copy = (unsigned char*)buf;

-

-    while (len>0)

-    {

-        uInt copy_this;

-        uInt i;

-        unsigned char* to_copy;

-

-        if (ldi->avail_in_this_block==0)

-        {

-            ldi->next_datablock = allocate_new_datablock();

-            if (ldi->next_datablock == NULL)

-                return ZIP_INTERNALERROR;

-            ldi = ldi->next_datablock ;

-            ll->last_block = ldi;

-        }

-

-        if (ldi->avail_in_this_block < len)

-            copy_this = (uInt)ldi->avail_in_this_block;

-        else

-            copy_this = (uInt)len;

-

-        to_copy = &(ldi->data[ldi->filled_in_this_block]);

-

-        for (i=0;i<copy_this;i++)

-            *(to_copy+i)=*(from_copy+i);

-

-        ldi->filled_in_this_block += copy_this;

-        ldi->avail_in_this_block -= copy_this;

-        from_copy += copy_this ;

-        len -= copy_this;

-    }

-    return ZIP_OK;

-}

-

-

-

-/****************************************************************************/

-

-#ifndef NO_ADDFILEINEXISTINGZIP

-/* ===========================================================================

-   Inputs a long in LSB order to the given file

-   nbByte == 1, 2 or 4 (byte, short or long)

-*/

-

-local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,

-                                voidpf filestream, uLong x, int nbByte));

-local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong x;

-    int nbByte;

-{

-    unsigned char buf[4];

-    int n;

-    for (n = 0; n < nbByte; n++)

-    {

-        buf[n] = (unsigned char)(x & 0xff);

-        x >>= 8;

-    }

-    if (x != 0)

-      {     /* data overflow - hack for ZIP64 (X Roche) */

-      for (n = 0; n < nbByte; n++)

-        {

-          buf[n] = 0xff;

-        }

-      }

-

-    if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)

-        return ZIP_ERRNO;

-    else

-        return ZIP_OK;

-}

-

-local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));

-local void ziplocal_putValue_inmemory (dest, x, nbByte)

-    void* dest;

-    uLong x;

-    int nbByte;

-{

-    unsigned char* buf=(unsigned char*)dest;

-    int n;

-    for (n = 0; n < nbByte; n++) {

-        buf[n] = (unsigned char)(x & 0xff);

-        x >>= 8;

-    }

-

-    if (x != 0)

-    {     /* data overflow - hack for ZIP64 */

-       for (n = 0; n < nbByte; n++)

-       {

-          buf[n] = 0xff;

-       }

-    }

-}

-

-/****************************************************************************/

-

-

-local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)

-    const tm_zip* ptm;

-    uLong dosDate;

-{

-    uLong year = (uLong)ptm->tm_year;

-    if (year>1980)

-        year-=1980;

-    else if (year>80)

-        year-=80;

-    return

-      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |

-        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));

-}

-

-

-/****************************************************************************/

-

-local int ziplocal_getByte OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    int *pi));

-

-local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    int *pi;

-{

-    unsigned char c;

-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);

-    if (err==1)

-    {

-        *pi = (int)c;

-        return ZIP_OK;

-    }

-    else

-    {

-        if (ZERROR(*pzlib_filefunc_def,filestream))

-            return ZIP_ERRNO;

-        else

-            return ZIP_EOF;

-    }

-}

-

-

-/* ===========================================================================

-   Reads a long in LSB order from the given gz_stream. Sets

-*/

-local int ziplocal_getShort OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong *pX;

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==ZIP_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-local int ziplocal_getLong OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong *pX;

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<16;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<24;

-

-    if (err==ZIP_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-#ifndef BUFREADCOMMENT

-#define BUFREADCOMMENT (0x400)

-#endif

-/*

-  Locate the Central directory of a zipfile (at the end, just before

-    the global comment)

-*/

-local uLong ziplocal_SearchCentralDir OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream));

-

-local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-{

-    unsigned char* buf;

-    uLong uSizeFile;

-    uLong uBackRead;

-    uLong uMaxBack=0xffff; /* maximum size of global comment */

-    uLong uPosFound=0;

-

-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)

-        return 0;

-

-

-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);

-

-    if (uMaxBack>uSizeFile)

-        uMaxBack = uSizeFile;

-

-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);

-    if (buf==NULL)

-        return 0;

-

-    uBackRead = 4;

-    while (uBackRead<uMaxBack)

-    {

-        uLong uReadSize,uReadPos ;

-        int i;

-        if (uBackRead+BUFREADCOMMENT>uMaxBack)

-            uBackRead = uMaxBack;

-        else

-            uBackRead+=BUFREADCOMMENT;

-        uReadPos = uSizeFile-uBackRead ;

-

-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?

-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);

-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            break;

-

-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)

-            break;

-

-        for (i=(int)uReadSize-3; (i--)>0;)

-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&

-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))

-            {

-                uPosFound = uReadPos+i;

-                break;

-            }

-

-        if (uPosFound!=0)

-            break;

-    }

-    TRYFREE(buf);

-    return uPosFound;

-}

-#endif /* !NO_ADDFILEINEXISTINGZIP*/

-

-/************************************************************/

-extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)

-    const char *pathname;

-    int append;

-    zipcharpc* globalcomment;

-    zlib_filefunc_def* pzlib_filefunc_def;

-{

-    zip_internal ziinit;

-    zip_internal* zi;

-    int err=ZIP_OK;

-

-

-    if (pzlib_filefunc_def==NULL)

-        fill_fopen_filefunc(&ziinit.z_filefunc);

-    else

-        ziinit.z_filefunc = *pzlib_filefunc_def;

-

-    ziinit.filestream = (*(ziinit.z_filefunc.zopen_file))

-                 (ziinit.z_filefunc.opaque,

-                  pathname,

-                  (append == APPEND_STATUS_CREATE) ?

-                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :

-                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));

-

-    if (ziinit.filestream == NULL)

-        return NULL;

-    ziinit.begin_pos = ZTELL(ziinit.z_filefunc,ziinit.filestream);

-    ziinit.in_opened_file_inzip = 0;

-    ziinit.ci.stream_initialised = 0;

-    ziinit.number_entry = 0;

-    ziinit.add_position_when_writting_offset = 0;

-    init_linkedlist(&(ziinit.central_dir));

-

-

-    zi = (zip_internal*)ALLOC(sizeof(zip_internal));

-    if (zi==NULL)

-    {

-        ZCLOSE(ziinit.z_filefunc,ziinit.filestream);

-        return NULL;

-    }

-

-    /* now we add file in a zipfile */

-#    ifndef NO_ADDFILEINEXISTINGZIP

-    ziinit.globalcomment = NULL;

-    if (append == APPEND_STATUS_ADDINZIP)

-    {

-        uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/

-

-        uLong size_central_dir;     /* size of the central directory  */

-        uLong offset_central_dir;   /* offset of start of central directory */

-        uLong central_pos,uL;

-

-        uLong number_disk;          /* number of the current dist, used for

-                                    spaning ZIP, unsupported, always 0*/

-        uLong number_disk_with_CD;  /* number the the disk with central dir, used

-                                    for spaning ZIP, unsupported, always 0*/

-        uLong number_entry;

-        uLong number_entry_CD;      /* total number of entries in

-                                    the central dir

-                                    (same than number_entry on nospan) */

-        uLong size_comment;

-

-        central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream);

-        if (central_pos==0)

-            err=ZIP_ERRNO;

-

-        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,

-                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err=ZIP_ERRNO;

-

-        /* the signature, already checked */

-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&uL)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* number of this disk */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* number of the disk with the start of the central directory */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* total number of entries in the central dir on this disk */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* total number of entries in the central dir */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        if ((number_entry_CD!=number_entry) ||

-            (number_disk_with_CD!=0) ||

-            (number_disk!=0))

-            err=ZIP_BADZIPFILE;

-

-        /* size of the central directory */

-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* offset of start of central directory with respect to the

-            starting disk number */

-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* zipfile global comment length */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        if ((central_pos<offset_central_dir+size_central_dir) &&

-            (err==ZIP_OK))

-            err=ZIP_BADZIPFILE;

-

-        if (err!=ZIP_OK)

-        {

-            ZCLOSE(ziinit.z_filefunc, ziinit.filestream);

-            return NULL;

-        }

-

-        if (size_comment>0)

-        {

-            ziinit.globalcomment = ALLOC(size_comment+1);

-            if (ziinit.globalcomment)

-            {

-               size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);

-               ziinit.globalcomment[size_comment]=0;

-            }

-        }

-

-        byte_before_the_zipfile = central_pos -

-                                (offset_central_dir+size_central_dir);

-        ziinit.add_position_when_writting_offset = byte_before_the_zipfile;

-

-        {

-            uLong size_central_dir_to_read = size_central_dir;

-            size_t buf_size = SIZEDATA_INDATABLOCK;

-            void* buf_read = (void*)ALLOC(buf_size);

-            if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,

-                  offset_central_dir + byte_before_the_zipfile,

-                  ZLIB_FILEFUNC_SEEK_SET) != 0)

-                  err=ZIP_ERRNO;

-

-            while ((size_central_dir_to_read>0) && (err==ZIP_OK))

-            {

-                uLong read_this = SIZEDATA_INDATABLOCK;

-                if (read_this > size_central_dir_to_read)

-                    read_this = size_central_dir_to_read;

-                if (ZREAD(ziinit.z_filefunc, ziinit.filestream,buf_read,read_this) != read_this)

-                    err=ZIP_ERRNO;

-

-                if (err==ZIP_OK)

-                    err = add_data_in_datablock(&ziinit.central_dir,buf_read,

-                                                (uLong)read_this);

-                size_central_dir_to_read-=read_this;

-            }

-            TRYFREE(buf_read);

-        }

-        ziinit.begin_pos = byte_before_the_zipfile;

-        ziinit.number_entry = number_entry_CD;

-

-        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,

-                  offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err=ZIP_ERRNO;

-    }

-

-    if (globalcomment)

-    {

-      *globalcomment = ziinit.globalcomment;

-    }

-#    endif /* !NO_ADDFILEINEXISTINGZIP*/

-

-    if (err != ZIP_OK)

-    {

-#    ifndef NO_ADDFILEINEXISTINGZIP

-        TRYFREE(ziinit.globalcomment);

-#    endif /* !NO_ADDFILEINEXISTINGZIP*/

-        TRYFREE(zi);

-        return NULL;

-    }

-    else

-    {

-        *zi = ziinit;

-        return (zipFile)zi;

-    }

-}

-

-extern zipFile ZEXPORT zipOpen (pathname, append)

-    const char *pathname;

-    int append;

-{

-    return zipOpen2(pathname,append,NULL,NULL);

-}

-

-extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,

-                                         extrafield_local, size_extrafield_local,

-                                         extrafield_global, size_extrafield_global,

-                                         comment, method, level, raw,

-                                         windowBits, memLevel, strategy,

-                                         password, crcForCrypting)

-    zipFile file;

-    const char* filename;

-    const zip_fileinfo* zipfi;

-    const void* extrafield_local;

-    uInt size_extrafield_local;

-    const void* extrafield_global;

-    uInt size_extrafield_global;

-    const char* comment;

-    int method;

-    int level;

-    int raw;

-    int windowBits;

-    int memLevel;

-    int strategy;

-    const char* password;

-    uLong crcForCrypting;

-{

-    zip_internal* zi;

-    uInt size_filename;

-    uInt size_comment;

-    uInt i;

-    int err = ZIP_OK;

-

-#    ifdef NOCRYPT

-    if (password != NULL)

-        return ZIP_PARAMERROR;

-#    endif

-

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    if ((method!=0) && (method!=Z_DEFLATED))

-        return ZIP_PARAMERROR;

-

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 1)

-    {

-        err = zipCloseFileInZip (file);

-        if (err != ZIP_OK)

-            return err;

-    }

-

-

-    if (filename==NULL)

-        filename="-";

-

-    if (comment==NULL)

-        size_comment = 0;

-    else

-        size_comment = (uInt)strlen(comment);

-

-    size_filename = (uInt)strlen(filename);

-

-    if (zipfi == NULL)

-        zi->ci.dosDate = 0;

-    else

-    {

-        if (zipfi->dosDate != 0)

-            zi->ci.dosDate = zipfi->dosDate;

-        else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate);

-    }

-

-    zi->ci.flag = 0;

-    if ((level==8) || (level==9))

-      zi->ci.flag |= 2;

-    if ((level==2))

-      zi->ci.flag |= 4;

-    if ((level==1))

-      zi->ci.flag |= 6;

-    if (password != NULL)

-      zi->ci.flag |= 1;

-

-    zi->ci.crc32 = 0;

-    zi->ci.method = method;

-    zi->ci.encrypt = 0;

-    zi->ci.stream_initialised = 0;

-    zi->ci.pos_in_buffered_data = 0;

-    zi->ci.raw = raw;

-    zi->ci.pos_local_header = ZTELL(zi->z_filefunc,zi->filestream) ;

-    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename +

-                                      size_extrafield_global + size_comment;

-    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader);

-

-    ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);

-    /* version info */

-    ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);

-    ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/

-

-    if (zipfi==NULL)

-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);

-    else

-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);

-

-    if (zipfi==NULL)

-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);

-    else

-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);

-

-    ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header- zi->add_position_when_writting_offset,4);

-

-    for (i=0;i<size_filename;i++)

-        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);

-

-    for (i=0;i<size_extrafield_global;i++)

-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =

-              *(((const char*)extrafield_global)+i);

-

-    for (i=0;i<size_comment;i++)

-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+

-              size_extrafield_global+i) = *(comment+i);

-    if (zi->ci.central_header == NULL)

-        return ZIP_INTERNALERROR;

-

-    /* write the local header */

-    err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC,4);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield_local,2);

-

-    if ((err==ZIP_OK) && (size_filename>0))

-        if (ZWRITE(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)

-                err = ZIP_ERRNO;

-

-    if ((err==ZIP_OK) && (size_extrafield_local>0))

-        if (ZWRITE(zi->z_filefunc,zi->filestream,extrafield_local,size_extrafield_local)

-                                                                           !=size_extrafield_local)

-                err = ZIP_ERRNO;

-

-    zi->ci.stream.avail_in = (uInt)0;

-    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;

-    zi->ci.stream.next_out = zi->ci.buffered_data;

-    zi->ci.stream.total_in = 0;

-    zi->ci.stream.total_out = 0;

-

-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-    {

-        zi->ci.stream.zalloc = (alloc_func)0;

-        zi->ci.stream.zfree = (free_func)0;

-        zi->ci.stream.opaque = (voidpf)0;

-

-        if (windowBits>0)

-            windowBits = -windowBits;

-

-        err = deflateInit2(&zi->ci.stream, level,

-               Z_DEFLATED, windowBits, memLevel, strategy);

-

-        if (err==Z_OK)

-            zi->ci.stream_initialised = 1;

-    }

-#    ifndef NOCRYPT

-    zi->ci.crypt_header_size = 0;

-    if ((err==Z_OK) && (password != NULL))

-    {

-        unsigned char bufHead[RAND_HEAD_LEN];

-        unsigned int sizeHead;

-        zi->ci.encrypt = 1;

-        zi->ci.pcrc_32_tab = get_crc_table();

-        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/

-

-        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);

-        zi->ci.crypt_header_size = sizeHead;

-

-        if (ZWRITE(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)

-                err = ZIP_ERRNO;

-    }

-#    endif

-

-    if (err==Z_OK)

-        zi->in_opened_file_inzip = 1;

-    return err;

-}

-

-extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,

-                                        extrafield_local, size_extrafield_local,

-                                        extrafield_global, size_extrafield_global,

-                                        comment, method, level, raw)

-    zipFile file;

-    const char* filename;

-    const zip_fileinfo* zipfi;

-    const void* extrafield_local;

-    uInt size_extrafield_local;

-    const void* extrafield_global;

-    uInt size_extrafield_global;

-    const char* comment;

-    int method;

-    int level;

-    int raw;

-{

-    return zipOpenNewFileInZip3 (file, filename, zipfi,

-                                 extrafield_local, size_extrafield_local,

-                                 extrafield_global, size_extrafield_global,

-                                 comment, method, level, raw,

-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,

-                                 NULL, 0);

-}

-

-extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,

-                                        extrafield_local, size_extrafield_local,

-                                        extrafield_global, size_extrafield_global,

-                                        comment, method, level)

-    zipFile file;

-    const char* filename;

-    const zip_fileinfo* zipfi;

-    const void* extrafield_local;

-    uInt size_extrafield_local;

-    const void* extrafield_global;

-    uInt size_extrafield_global;

-    const char* comment;

-    int method;

-    int level;

-{

-    return zipOpenNewFileInZip2 (file, filename, zipfi,

-                                 extrafield_local, size_extrafield_local,

-                                 extrafield_global, size_extrafield_global,

-                                 comment, method, level, 0);

-}

-

-local int zipFlushWriteBuffer(zi)

-  zip_internal* zi;

-{

-    int err=ZIP_OK;

-

-    if (zi->ci.encrypt != 0)

-    {

-#ifndef NOCRYPT

-        uInt i;

-        int t;

-        for (i=0;i<zi->ci.pos_in_buffered_data;i++)

-            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab,

-                                       zi->ci.buffered_data[i],t);

-#endif

-    }

-    if (ZWRITE(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data)

-                                                                    !=zi->ci.pos_in_buffered_data)

-      err = ZIP_ERRNO;

-    zi->ci.pos_in_buffered_data = 0;

-    return err;

-}

-

-extern int ZEXPORT zipWriteInFileInZip (file, buf, len)

-    zipFile file;

-    const void* buf;

-    unsigned len;

-{

-    zip_internal* zi;

-    int err=ZIP_OK;

-

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 0)

-        return ZIP_PARAMERROR;

-

-    zi->ci.stream.next_in = (void*)buf;

-    zi->ci.stream.avail_in = len;

-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);

-

-    while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))

-    {

-        if (zi->ci.stream.avail_out == 0)

-        {

-            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)

-                err = ZIP_ERRNO;

-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;

-            zi->ci.stream.next_out = zi->ci.buffered_data;

-        }

-

-

-        if(err != ZIP_OK)

-            break;

-

-        if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-        {

-            uLong uTotalOutBefore = zi->ci.stream.total_out;

-            err=deflate(&zi->ci.stream,  Z_NO_FLUSH);

-            zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;

-

-        }

-        else

-        {

-            uInt copy_this,i;

-            if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)

-                copy_this = zi->ci.stream.avail_in;

-            else

-                copy_this = zi->ci.stream.avail_out;

-            for (i=0;i<copy_this;i++)

-                *(((char*)zi->ci.stream.next_out)+i) =

-                    *(((const char*)zi->ci.stream.next_in)+i);

-            {

-                zi->ci.stream.avail_in -= copy_this;

-                zi->ci.stream.avail_out-= copy_this;

-                zi->ci.stream.next_in+= copy_this;

-                zi->ci.stream.next_out+= copy_this;

-                zi->ci.stream.total_in+= copy_this;

-                zi->ci.stream.total_out+= copy_this;

-                zi->ci.pos_in_buffered_data += copy_this;

-            }

-        }

-    }

-

-    return err;

-}

-

-extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)

-    zipFile file;

-    uLong uncompressed_size;

-    uLong crc32;

-{

-    zip_internal* zi;

-    uLong compressed_size;

-    int err=ZIP_OK;

-

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 0)

-        return ZIP_PARAMERROR;

-    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 (zipFlushWriteBuffer(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) ;

-    }

-

-    if (err==Z_STREAM_END)

-        err=ZIP_OK; /* this is normal */

-

-    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))

-        if (zipFlushWriteBuffer(zi)==ZIP_ERRNO)

-            err = ZIP_ERRNO;

-

-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-    {

-        err=deflateEnd(&zi->ci.stream);

-        zi->ci.stream_initialised = 0;

-    }

-

-    if (!zi->ci.raw)

-    {

-        crc32 = (uLong)zi->ci.crc32;

-        uncompressed_size = (uLong)zi->ci.stream.total_in;

-    }

-    compressed_size = (uLong)zi->ci.stream.total_out;

-#    ifndef NOCRYPT

-    compressed_size += zi->ci.crypt_header_size;

-#    endif

-

-    ziplocal_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+20,

-                                compressed_size,4); /*compr size*/

-    if (zi->ci.stream.data_type == Z_ASCII)

-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+24,

-                                uncompressed_size,4); /*uncompr size*/

-

-    if (err==ZIP_OK)

-        err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header,

-                                       (uLong)zi->ci.size_centralheader);

-    free(zi->ci.central_header);

-

-    if (err==ZIP_OK)

-    {

-        long cur_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);

-        if (ZSEEK(zi->z_filefunc,zi->filestream,

-                  zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err = ZIP_ERRNO;

-

-        if (err==ZIP_OK)

-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */

-

-        if (err==ZIP_OK) /* compressed size, unknown */

-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);

-

-        if (err==ZIP_OK) /* uncompressed size, unknown */

-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);

-

-        if (ZSEEK(zi->z_filefunc,zi->filestream,

-                  cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err = ZIP_ERRNO;

-    }

-

-    zi->number_entry ++;

-    zi->in_opened_file_inzip = 0;

-

-    return err;

-}

-

-extern int ZEXPORT zipCloseFileInZip (file)

-    zipFile file;

-{

-    return zipCloseFileInZipRaw (file,0,0);

-}

-

-extern int ZEXPORT zipClose (file, global_comment)

-    zipFile file;

-    const char* global_comment;

-{

-    zip_internal* zi;

-    int err = 0;

-    uLong size_centraldir = 0;

-    uLong centraldir_pos_inzip;

-    uInt size_global_comment;

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 1)

-    {

-        err = zipCloseFileInZip (file);

-    }

-

-#ifndef NO_ADDFILEINEXISTINGZIP

-    if (global_comment==NULL)

-        global_comment = zi->globalcomment;

-#endif

-    if (global_comment==NULL)

-        size_global_comment = 0;

-    else

-        size_global_comment = (uInt)strlen(global_comment);

-

-    centraldir_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);

-    if (err==ZIP_OK)

-    {

-        linkedlist_datablock_internal* ldi = zi->central_dir.first_block ;

-        while (ldi!=NULL)

-        {

-            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))

-                if (ZWRITE(zi->z_filefunc,zi->filestream,

-                           ldi->data,ldi->filled_in_this_block)

-                              !=ldi->filled_in_this_block )

-                    err = ZIP_ERRNO;

-

-            size_centraldir += ldi->filled_in_this_block;

-            ldi = ldi->next_datablock;

-        }

-    }

-    free_datablock(zi->central_dir.first_block);

-

-    if (err==ZIP_OK) /* Magic End */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);

-

-    if (err==ZIP_OK) /* number of this disk */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);

-

-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);

-

-    if (err==ZIP_OK) /* total number of entries in the central dir on this disk */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);

-

-    if (err==ZIP_OK) /* total number of entries in the central dir */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);

-

-    if (err==ZIP_OK) /* size of the central directory */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);

-

-    if (err==ZIP_OK) /* offset of start of central directory with respect to the

-                            starting disk number */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,

-                                (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);

-

-    if (err==ZIP_OK) /* zipfile comment length */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);

-

-    if ((err==ZIP_OK) && (size_global_comment>0))

-        if (ZWRITE(zi->z_filefunc,zi->filestream,

-                   global_comment,size_global_comment) != size_global_comment)

-                err = ZIP_ERRNO;

-

-    if (ZCLOSE(zi->z_filefunc,zi->filestream) != 0)

-        if (err == ZIP_OK)

-            err = ZIP_ERRNO;

-

-#ifndef NO_ADDFILEINEXISTINGZIP

-    TRYFREE(zi->globalcomment);

-#endif

-    TRYFREE(zi);

-

-    return err;

-}

+/* zip.c -- IO on .zip files using zlib
+   Version 1.01e, February 12th, 2005
+
+   27 Dec 2004 Rolf Kalbermatter
+   Modification to zipOpen2 to support globalComment retrieval.
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   Read zip.h for more info
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "zlib.h"
+#include "zip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+#ifndef VERSIONMADEBY
+# define VERSIONMADEBY   (0x0) /* platform depedent */
+#endif
+
+#ifndef Z_BUFSIZE
+#define Z_BUFSIZE (16384)
+#endif
+
+#ifndef Z_MAXFILENAMEINZIP
+#define Z_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+/*
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+*/
+
+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
+
+#ifndef SEEK_CUR
+#define SEEK_CUR    1
+#endif
+
+#ifndef SEEK_END
+#define SEEK_END    2
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET    0
+#endif
+
+#ifndef DEF_MEM_LEVEL
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+#endif
+const char zip_copyright[] =
+   " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+
+#define SIZEDATA_INDATABLOCK (4096-(4*4))
+
+#define LOCALHEADERMAGIC    (0x04034b50)
+#define CENTRALHEADERMAGIC  (0x02014b50)
+#define ENDHEADERMAGIC      (0x06054b50)
+
+#define FLAG_LOCALHEADER_OFFSET (0x06)
+#define CRC_LOCALHEADER_OFFSET  (0x0e)
+
+#define SIZECENTRALHEADER (0x2e) /* 46 */
+
+typedef struct linkedlist_datablock_internal_s
+{
+  struct linkedlist_datablock_internal_s* next_datablock;
+  uLong  avail_in_this_block;
+  uLong  filled_in_this_block;
+  uLong  unused; /* for future use and alignement */
+  unsigned char data[SIZEDATA_INDATABLOCK];
+} linkedlist_datablock_internal;
+
+typedef struct linkedlist_data_s
+{
+    linkedlist_datablock_internal* first_block;
+    linkedlist_datablock_internal* last_block;
+} linkedlist_data;
+
+
+typedef struct
+{
+    z_stream stream;            /* zLib stream structure for inflate */
+    int  stream_initialised;    /* 1 is stream is initialised */
+    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
+
+    uLong pos_local_header;     /* offset of the local header of the file
+                                     currenty writing */
+    char* central_header;       /* central header data for the current file */
+    uLong size_centralheader;   /* size of the central header for cur file */
+    uLong flag;                 /* flag of the file currently writing */
+
+    int  method;                /* compression method of file currenty wr.*/
+    int  raw;                   /* 1 for directly writing raw data */
+    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
+    uLong dosDate;
+    uLong crc32;
+    int  encrypt;
+#ifndef NOCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const unsigned long* pcrc_32_tab;
+    int crypt_header_size;
+#endif
+} curfile_info;
+
+typedef struct
+{
+    zlib_filefunc_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    linkedlist_data central_dir;/* datablock with central dir in construction*/
+    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
+    curfile_info ci;            /* info on the file curretly writing */
+
+    uLong begin_pos;            /* position of the beginning of the zipfile */
+    uLong add_position_when_writting_offset;
+    uLong number_entry;
+#ifndef NO_ADDFILEINEXISTINGZIP
+    char *globalcomment;
+#endif
+} zip_internal;
+
+
+
+#ifndef NOCRYPT
+#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+#include "crypt.h"
+#endif
+
+local linkedlist_datablock_internal* allocate_new_datablock()
+{
+    linkedlist_datablock_internal* ldi;
+    ldi = (linkedlist_datablock_internal*)
+                 ALLOC(sizeof(linkedlist_datablock_internal));
+    if (ldi!=NULL)
+    {
+        ldi->next_datablock = NULL ;
+        ldi->filled_in_this_block = 0 ;
+        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
+    }
+    return ldi;
+}
+
+local void free_datablock(ldi)
+    linkedlist_datablock_internal* ldi;
+{
+    while (ldi!=NULL)
+    {
+        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
+        TRYFREE(ldi);
+        ldi = ldinext;
+    }
+}
+
+local void init_linkedlist(ll)
+    linkedlist_data* ll;
+{
+    ll->first_block = ll->last_block = NULL;
+}
+
+local void free_linkedlist(ll)
+    linkedlist_data* ll;
+{
+    free_datablock(ll->first_block);
+    ll->first_block = ll->last_block = NULL;
+}
+
+
+local int add_data_in_datablock(ll,buf,len)
+    linkedlist_data* ll;
+    const void* buf;
+    uLong len;
+{
+    linkedlist_datablock_internal* ldi;
+    const unsigned char* from_copy;
+
+    if (ll==NULL)
+        return ZIP_INTERNALERROR;
+
+    if (ll->last_block == NULL)
+    {
+        ll->first_block = ll->last_block = allocate_new_datablock();
+        if (ll->first_block == NULL)
+            return ZIP_INTERNALERROR;
+    }
+
+    ldi = ll->last_block;
+    from_copy = (unsigned char*)buf;
+
+    while (len>0)
+    {
+        uInt copy_this;
+        uInt i;
+        unsigned char* to_copy;
+
+        if (ldi->avail_in_this_block==0)
+        {
+            ldi->next_datablock = allocate_new_datablock();
+            if (ldi->next_datablock == NULL)
+                return ZIP_INTERNALERROR;
+            ldi = ldi->next_datablock ;
+            ll->last_block = ldi;
+        }
+
+        if (ldi->avail_in_this_block < len)
+            copy_this = (uInt)ldi->avail_in_this_block;
+        else
+            copy_this = (uInt)len;
+
+        to_copy = &(ldi->data[ldi->filled_in_this_block]);
+
+        for (i=0;i<copy_this;i++)
+            *(to_copy+i)=*(from_copy+i);
+
+        ldi->filled_in_this_block += copy_this;
+        ldi->avail_in_this_block -= copy_this;
+        from_copy += copy_this ;
+        len -= copy_this;
+    }
+    return ZIP_OK;
+}
+
+
+
+/****************************************************************************/
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+/* ===========================================================================
+   Inputs a long in LSB order to the given file
+   nbByte == 1, 2 or 4 (byte, short or long)
+*/
+
+local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,
+                                voidpf filestream, uLong x, int nbByte));
+local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong x;
+    int nbByte;
+{
+    unsigned char buf[4];
+    int n;
+    for (n = 0; n < nbByte; n++)
+    {
+        buf[n] = (unsigned char)(x & 0xff);
+        x >>= 8;
+    }
+    if (x != 0)
+      {     /* data overflow - hack for ZIP64 (X Roche) */
+      for (n = 0; n < nbByte; n++)
+        {
+          buf[n] = 0xff;
+        }
+      }
+
+    if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
+        return ZIP_ERRNO;
+    else
+        return ZIP_OK;
+}
+
+local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
+local void ziplocal_putValue_inmemory (dest, x, nbByte)
+    void* dest;
+    uLong x;
+    int nbByte;
+{
+    unsigned char* buf=(unsigned char*)dest;
+    int n;
+    for (n = 0; n < nbByte; n++) {
+        buf[n] = (unsigned char)(x & 0xff);
+        x >>= 8;
+    }
+
+    if (x != 0)
+    {     /* data overflow - hack for ZIP64 */
+       for (n = 0; n < nbByte; n++)
+       {
+          buf[n] = 0xff;
+       }
+    }
+}
+
+/****************************************************************************/
+
+
+local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
+    const tm_zip* ptm;
+    uLong dosDate;
+{
+    uLong year = (uLong)ptm->tm_year;
+    if (year>1980)
+        year-=1980;
+    else if (year>80)
+        year-=80;
+    return
+      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
+        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
+}
+
+
+/****************************************************************************/
+
+local int ziplocal_getByte OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    int *pi));
+
+local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    int *pi;
+{
+    unsigned char c;
+    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return ZIP_OK;
+    }
+    else
+    {
+        if (ZERROR(*pzlib_filefunc_def,filestream))
+            return ZIP_ERRNO;
+        else
+            return ZIP_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int ziplocal_getShort OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong *pX;
+{
+    uLong x ;
+    int i;
+    int err;
+
+    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==ZIP_OK)
+        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==ZIP_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int ziplocal_getLong OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong *pX;
+{
+    uLong x ;
+    int i;
+    int err;
+
+    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==ZIP_OK)
+        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==ZIP_OK)
+        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<16;
+
+    if (err==ZIP_OK)
+        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==ZIP_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local uLong ziplocal_SearchCentralDir OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream));
+
+local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+{
+    unsigned char* buf;
+    uLong uSizeFile;
+    uLong uBackRead;
+    uLong uMaxBack=0xffff; /* maximum size of global comment */
+    uLong uPosFound=0;
+
+    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize,uReadPos ;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
+        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    return uPosFound;
+}
+#endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+/************************************************************/
+extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)
+    const char *pathname;
+    int append;
+    zipcharpc* globalcomment;
+    zlib_filefunc_def* pzlib_filefunc_def;
+{
+    zip_internal ziinit;
+    zip_internal* zi;
+    int err=ZIP_OK;
+
+
+    if (pzlib_filefunc_def==NULL)
+        fill_fopen_filefunc(&ziinit.z_filefunc);
+    else
+        ziinit.z_filefunc = *pzlib_filefunc_def;
+
+    ziinit.filestream = (*(ziinit.z_filefunc.zopen_file))
+                 (ziinit.z_filefunc.opaque,
+                  pathname,
+                  (append == APPEND_STATUS_CREATE) ?
+                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
+                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
+
+    if (ziinit.filestream == NULL)
+        return NULL;
+    ziinit.begin_pos = ZTELL(ziinit.z_filefunc,ziinit.filestream);
+    ziinit.in_opened_file_inzip = 0;
+    ziinit.ci.stream_initialised = 0;
+    ziinit.number_entry = 0;
+    ziinit.add_position_when_writting_offset = 0;
+    init_linkedlist(&(ziinit.central_dir));
+
+
+    zi = (zip_internal*)ALLOC(sizeof(zip_internal));
+    if (zi==NULL)
+    {
+        ZCLOSE(ziinit.z_filefunc,ziinit.filestream);
+        return NULL;
+    }
+
+    /* now we add file in a zipfile */
+#    ifndef NO_ADDFILEINEXISTINGZIP
+    ziinit.globalcomment = NULL;
+    if (append == APPEND_STATUS_ADDINZIP)
+    {
+        uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+
+        uLong size_central_dir;     /* size of the central directory  */
+        uLong offset_central_dir;   /* offset of start of central directory */
+        uLong central_pos,uL;
+
+        uLong number_disk;          /* number of the current dist, used for
+                                    spaning ZIP, unsupported, always 0*/
+        uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                                    for spaning ZIP, unsupported, always 0*/
+        uLong number_entry;
+        uLong number_entry_CD;      /* total number of entries in
+                                    the central dir
+                                    (same than number_entry on nospan) */
+        uLong size_comment;
+
+        central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream);
+        if (central_pos==0)
+            err=ZIP_ERRNO;
+
+        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
+                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err=ZIP_ERRNO;
+
+        /* the signature, already checked */
+        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&uL)!=ZIP_OK)
+            err=ZIP_ERRNO;
+
+        /* number of this disk */
+        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk)!=ZIP_OK)
+            err=ZIP_ERRNO;
+
+        /* number of the disk with the start of the central directory */
+        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD)!=ZIP_OK)
+            err=ZIP_ERRNO;
+
+        /* total number of entries in the central dir on this disk */
+        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry)!=ZIP_OK)
+            err=ZIP_ERRNO;
+
+        /* total number of entries in the central dir */
+        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD)!=ZIP_OK)
+            err=ZIP_ERRNO;
+
+        if ((number_entry_CD!=number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=ZIP_BADZIPFILE;
+
+        /* size of the central directory */
+        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir)!=ZIP_OK)
+            err=ZIP_ERRNO;
+
+        /* offset of start of central directory with respect to the
+            starting disk number */
+        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir)!=ZIP_OK)
+            err=ZIP_ERRNO;
+
+        /* zipfile global comment length */
+        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK)
+            err=ZIP_ERRNO;
+
+        if ((central_pos<offset_central_dir+size_central_dir) &&
+            (err==ZIP_OK))
+            err=ZIP_BADZIPFILE;
+
+        if (err!=ZIP_OK)
+        {
+            ZCLOSE(ziinit.z_filefunc, ziinit.filestream);
+            return NULL;
+        }
+
+        if (size_comment>0)
+        {
+            ziinit.globalcomment = ALLOC(size_comment+1);
+            if (ziinit.globalcomment)
+            {
+               size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);
+               ziinit.globalcomment[size_comment]=0;
+            }
+        }
+
+        byte_before_the_zipfile = central_pos -
+                                (offset_central_dir+size_central_dir);
+        ziinit.add_position_when_writting_offset = byte_before_the_zipfile;
+
+        {
+            uLong size_central_dir_to_read = size_central_dir;
+            size_t buf_size = SIZEDATA_INDATABLOCK;
+            void* buf_read = (void*)ALLOC(buf_size);
+            if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
+                  offset_central_dir + byte_before_the_zipfile,
+                  ZLIB_FILEFUNC_SEEK_SET) != 0)
+                  err=ZIP_ERRNO;
+
+            while ((size_central_dir_to_read>0) && (err==ZIP_OK))
+            {
+                uLong read_this = SIZEDATA_INDATABLOCK;
+                if (read_this > size_central_dir_to_read)
+                    read_this = size_central_dir_to_read;
+                if (ZREAD(ziinit.z_filefunc, ziinit.filestream,buf_read,read_this) != read_this)
+                    err=ZIP_ERRNO;
+
+                if (err==ZIP_OK)
+                    err = add_data_in_datablock(&ziinit.central_dir,buf_read,
+                                                (uLong)read_this);
+                size_central_dir_to_read-=read_this;
+            }
+            TRYFREE(buf_read);
+        }
+        ziinit.begin_pos = byte_before_the_zipfile;
+        ziinit.number_entry = number_entry_CD;
+
+        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
+                  offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err=ZIP_ERRNO;
+    }
+
+    if (globalcomment)
+    {
+      *globalcomment = ziinit.globalcomment;
+    }
+#    endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+    if (err != ZIP_OK)
+    {
+#    ifndef NO_ADDFILEINEXISTINGZIP
+        TRYFREE(ziinit.globalcomment);
+#    endif /* !NO_ADDFILEINEXISTINGZIP*/
+        TRYFREE(zi);
+        return NULL;
+    }
+    else
+    {
+        *zi = ziinit;
+        return (zipFile)zi;
+    }
+}
+
+extern zipFile ZEXPORT zipOpen (pathname, append)
+    const char *pathname;
+    int append;
+{
+    return zipOpen2(pathname,append,NULL,NULL);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
+                                         extrafield_local, size_extrafield_local,
+                                         extrafield_global, size_extrafield_global,
+                                         comment, method, level, raw,
+                                         windowBits, memLevel, strategy,
+                                         password, crcForCrypting)
+    zipFile file;
+    const char* filename;
+    const zip_fileinfo* zipfi;
+    const void* extrafield_local;
+    uInt size_extrafield_local;
+    const void* extrafield_global;
+    uInt size_extrafield_global;
+    const char* comment;
+    int method;
+    int level;
+    int raw;
+    int windowBits;
+    int memLevel;
+    int strategy;
+    const char* password;
+    uLong crcForCrypting;
+{
+    zip_internal* zi;
+    uInt size_filename;
+    uInt size_comment;
+    uInt i;
+    int err = ZIP_OK;
+
+#    ifdef NOCRYPT
+    if (password != NULL)
+        return ZIP_PARAMERROR;
+#    endif
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    if ((method!=0) && (method!=Z_DEFLATED))
+        return ZIP_PARAMERROR;
+
+    zi = (zip_internal*)file;
+
+    if (zi->in_opened_file_inzip == 1)
+    {
+        err = zipCloseFileInZip (file);
+        if (err != ZIP_OK)
+            return err;
+    }
+
+
+    if (filename==NULL)
+        filename="-";
+
+    if (comment==NULL)
+        size_comment = 0;
+    else
+        size_comment = (uInt)strlen(comment);
+
+    size_filename = (uInt)strlen(filename);
+
+    if (zipfi == NULL)
+        zi->ci.dosDate = 0;
+    else
+    {
+        if (zipfi->dosDate != 0)
+            zi->ci.dosDate = zipfi->dosDate;
+        else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate);
+    }
+
+    zi->ci.flag = 0;
+    if ((level==8) || (level==9))
+      zi->ci.flag |= 2;
+    if ((level==2))
+      zi->ci.flag |= 4;
+    if ((level==1))
+      zi->ci.flag |= 6;
+    if (password != NULL)
+      zi->ci.flag |= 1;
+
+    zi->ci.crc32 = 0;
+    zi->ci.method = method;
+    zi->ci.encrypt = 0;
+    zi->ci.stream_initialised = 0;
+    zi->ci.pos_in_buffered_data = 0;
+    zi->ci.raw = raw;
+    zi->ci.pos_local_header = ZTELL(zi->z_filefunc,zi->filestream) ;
+    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename +
+                                      size_extrafield_global + size_comment;
+    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader);
+
+    ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
+    /* version info */
+    ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2);
+    ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
+    ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
+    ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
+    ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
+    ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
+    ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
+    ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
+    ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
+    ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
+    ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
+    ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
+
+    if (zipfi==NULL)
+        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
+    else
+        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
+
+    if (zipfi==NULL)
+        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
+    else
+        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
+
+    ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header- zi->add_position_when_writting_offset,4);
+
+    for (i=0;i<size_filename;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
+
+    for (i=0;i<size_extrafield_global;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
+              *(((const char*)extrafield_global)+i);
+
+    for (i=0;i<size_comment;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
+              size_extrafield_global+i) = *(comment+i);
+    if (zi->ci.central_header == NULL)
+        return ZIP_INTERNALERROR;
+
+    /* write the local header */
+    err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC,4);
+
+    if (err==ZIP_OK)
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
+    if (err==ZIP_OK)
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
+
+    if (err==ZIP_OK)
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
+
+    if (err==ZIP_OK)
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
+
+    if (err==ZIP_OK)
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
+    if (err==ZIP_OK)
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
+    if (err==ZIP_OK)
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
+
+    if (err==ZIP_OK)
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
+
+    if (err==ZIP_OK)
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield_local,2);
+
+    if ((err==ZIP_OK) && (size_filename>0))
+        if (ZWRITE(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
+                err = ZIP_ERRNO;
+
+    if ((err==ZIP_OK) && (size_extrafield_local>0))
+        if (ZWRITE(zi->z_filefunc,zi->filestream,extrafield_local,size_extrafield_local)
+                                                                           !=size_extrafield_local)
+                err = ZIP_ERRNO;
+
+    zi->ci.stream.avail_in = (uInt)0;
+    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+    zi->ci.stream.next_out = zi->ci.buffered_data;
+    zi->ci.stream.total_in = 0;
+    zi->ci.stream.total_out = 0;
+
+    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+    {
+        zi->ci.stream.zalloc = (alloc_func)0;
+        zi->ci.stream.zfree = (free_func)0;
+        zi->ci.stream.opaque = (voidpf)0;
+
+        if (windowBits>0)
+            windowBits = -windowBits;
+
+        err = deflateInit2(&zi->ci.stream, level,
+               Z_DEFLATED, windowBits, memLevel, strategy);
+
+        if (err==Z_OK)
+            zi->ci.stream_initialised = 1;
+    }
+#    ifndef NOCRYPT
+    zi->ci.crypt_header_size = 0;
+    if ((err==Z_OK) && (password != NULL))
+    {
+        unsigned char bufHead[RAND_HEAD_LEN];
+        unsigned int sizeHead;
+        zi->ci.encrypt = 1;
+        zi->ci.pcrc_32_tab = get_crc_table();
+        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
+
+        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
+        zi->ci.crypt_header_size = sizeHead;
+
+        if (ZWRITE(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
+                err = ZIP_ERRNO;
+    }
+#    endif
+
+    if (err==Z_OK)
+        zi->in_opened_file_inzip = 1;
+    return err;
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
+                                        extrafield_local, size_extrafield_local,
+                                        extrafield_global, size_extrafield_global,
+                                        comment, method, level, raw)
+    zipFile file;
+    const char* filename;
+    const zip_fileinfo* zipfi;
+    const void* extrafield_local;
+    uInt size_extrafield_local;
+    const void* extrafield_global;
+    uInt size_extrafield_global;
+    const char* comment;
+    int method;
+    int level;
+    int raw;
+{
+    return zipOpenNewFileInZip3 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
+                                        extrafield_local, size_extrafield_local,
+                                        extrafield_global, size_extrafield_global,
+                                        comment, method, level)
+    zipFile file;
+    const char* filename;
+    const zip_fileinfo* zipfi;
+    const void* extrafield_local;
+    uInt size_extrafield_local;
+    const void* extrafield_global;
+    uInt size_extrafield_global;
+    const char* comment;
+    int method;
+    int level;
+{
+    return zipOpenNewFileInZip2 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0);
+}
+
+local int zipFlushWriteBuffer(zi)
+  zip_internal* zi;
+{
+    int err=ZIP_OK;
+
+    if (zi->ci.encrypt != 0)
+    {
+#ifndef NOCRYPT
+        uInt i;
+        int t;
+        for (i=0;i<zi->ci.pos_in_buffered_data;i++)
+            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab,
+                                       zi->ci.buffered_data[i],t);
+#endif
+    }
+    if (ZWRITE(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data)
+                                                                    !=zi->ci.pos_in_buffered_data)
+      err = ZIP_ERRNO;
+    zi->ci.pos_in_buffered_data = 0;
+    return err;
+}
+
+extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
+    zipFile file;
+    const void* buf;
+    unsigned len;
+{
+    zip_internal* zi;
+    int err=ZIP_OK;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip_internal*)file;
+
+    if (zi->in_opened_file_inzip == 0)
+        return ZIP_PARAMERROR;
+
+    zi->ci.stream.next_in = (void*)buf;
+    zi->ci.stream.avail_in = len;
+    zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);
+
+    while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
+    {
+        if (zi->ci.stream.avail_out == 0)
+        {
+            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)
+                err = ZIP_ERRNO;
+            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+            zi->ci.stream.next_out = zi->ci.buffered_data;
+        }
+
+
+        if(err != ZIP_OK)
+            break;
+
+        if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+        {
+            uLong uTotalOutBefore = zi->ci.stream.total_out;
+            err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
+            zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+
+        }
+        else
+        {
+            uInt copy_this,i;
+            if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
+                copy_this = zi->ci.stream.avail_in;
+            else
+                copy_this = zi->ci.stream.avail_out;
+            for (i=0;i<copy_this;i++)
+                *(((char*)zi->ci.stream.next_out)+i) =
+                    *(((const char*)zi->ci.stream.next_in)+i);
+            {
+                zi->ci.stream.avail_in -= copy_this;
+                zi->ci.stream.avail_out-= copy_this;
+                zi->ci.stream.next_in+= copy_this;
+                zi->ci.stream.next_out+= copy_this;
+                zi->ci.stream.total_in+= copy_this;
+                zi->ci.stream.total_out+= copy_this;
+                zi->ci.pos_in_buffered_data += copy_this;
+            }
+        }
+    }
+
+    return err;
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
+    zipFile file;
+    uLong uncompressed_size;
+    uLong crc32;
+{
+    zip_internal* zi;
+    uLong compressed_size;
+    int err=ZIP_OK;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip_internal*)file;
+
+    if (zi->in_opened_file_inzip == 0)
+        return ZIP_PARAMERROR;
+    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 (zipFlushWriteBuffer(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) ;
+    }
+
+    if (err==Z_STREAM_END)
+        err=ZIP_OK; /* this is normal */
+
+    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
+        if (zipFlushWriteBuffer(zi)==ZIP_ERRNO)
+            err = ZIP_ERRNO;
+
+    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+    {
+        err=deflateEnd(&zi->ci.stream);
+        zi->ci.stream_initialised = 0;
+    }
+
+    if (!zi->ci.raw)
+    {
+        crc32 = (uLong)zi->ci.crc32;
+        uncompressed_size = (uLong)zi->ci.stream.total_in;
+    }
+    compressed_size = (uLong)zi->ci.stream.total_out;
+#    ifndef NOCRYPT
+    compressed_size += zi->ci.crypt_header_size;
+#    endif
+
+    ziplocal_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
+    ziplocal_putValue_inmemory(zi->ci.central_header+20,
+                                compressed_size,4); /*compr size*/
+    if (zi->ci.stream.data_type == Z_ASCII)
+        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
+    ziplocal_putValue_inmemory(zi->ci.central_header+24,
+                                uncompressed_size,4); /*uncompr size*/
+
+    if (err==ZIP_OK)
+        err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header,
+                                       (uLong)zi->ci.size_centralheader);
+    free(zi->ci.central_header);
+
+    if (err==ZIP_OK)
+    {
+        long cur_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
+        if (ZSEEK(zi->z_filefunc,zi->filestream,
+                  zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err = ZIP_ERRNO;
+
+        if (err==ZIP_OK)
+            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
+
+        if (err==ZIP_OK) /* compressed size, unknown */
+            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
+
+        if (err==ZIP_OK) /* uncompressed size, unknown */
+            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
+
+        if (ZSEEK(zi->z_filefunc,zi->filestream,
+                  cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err = ZIP_ERRNO;
+    }
+
+    zi->number_entry ++;
+    zi->in_opened_file_inzip = 0;
+
+    return err;
+}
+
+extern int ZEXPORT zipCloseFileInZip (file)
+    zipFile file;
+{
+    return zipCloseFileInZipRaw (file,0,0);
+}
+
+extern int ZEXPORT zipClose (file, global_comment)
+    zipFile file;
+    const char* global_comment;
+{
+    zip_internal* zi;
+    int err = 0;
+    uLong size_centraldir = 0;
+    uLong centraldir_pos_inzip;
+    uInt size_global_comment;
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip_internal*)file;
+
+    if (zi->in_opened_file_inzip == 1)
+    {
+        err = zipCloseFileInZip (file);
+    }
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    if (global_comment==NULL)
+        global_comment = zi->globalcomment;
+#endif
+    if (global_comment==NULL)
+        size_global_comment = 0;
+    else
+        size_global_comment = (uInt)strlen(global_comment);
+
+    centraldir_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
+    if (err==ZIP_OK)
+    {
+        linkedlist_datablock_internal* ldi = zi->central_dir.first_block ;
+        while (ldi!=NULL)
+        {
+            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
+                if (ZWRITE(zi->z_filefunc,zi->filestream,
+                           ldi->data,ldi->filled_in_this_block)
+                              !=ldi->filled_in_this_block )
+                    err = ZIP_ERRNO;
+
+            size_centraldir += ldi->filled_in_this_block;
+            ldi = ldi->next_datablock;
+        }
+    }
+    free_datablock(zi->central_dir.first_block);
+
+    if (err==ZIP_OK) /* Magic End */
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
+
+    if (err==ZIP_OK) /* number of this disk */
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+    if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+
+    if (err==ZIP_OK) /* total number of entries in the central dir */
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+
+    if (err==ZIP_OK) /* size of the central directory */
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
+
+    if (err==ZIP_OK) /* offset of start of central directory with respect to the
+                            starting disk number */
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,
+                                (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
+
+    if (err==ZIP_OK) /* zipfile comment length */
+        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
+
+    if ((err==ZIP_OK) && (size_global_comment>0))
+        if (ZWRITE(zi->z_filefunc,zi->filestream,
+                   global_comment,size_global_comment) != size_global_comment)
+                err = ZIP_ERRNO;
+
+    if (ZCLOSE(zi->z_filefunc,zi->filestream) != 0)
+        if (err == ZIP_OK)
+            err = ZIP_ERRNO;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    TRYFREE(zi->globalcomment);
+#endif
+    TRYFREE(zi);
+
+    return err;
+}
diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h
index cd38b67..acacce8 100644
--- a/contrib/minizip/zip.h
+++ b/contrib/minizip/zip.h
@@ -1,235 +1,235 @@
-/* zip.h -- IO for compress .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   This unzip package allow creates .ZIP file, compatible with PKZip 2.04g

-     WinZip, InfoZip tools and compatible.

-   Multi volume ZipFile (span) are not supported.

-   Encryption compatible with pkzip 2.04g only supported

-   Old compressions used by old PKZip 1.x are not supported

-

-  For uncompress .zip file, look at unzip.h

-

-

-   I WAIT FEEDBACK at mail info@winimage.com

-   Visit also http://www.winimage.com/zLibDll/unzip.html for evolution

-

-   Condition of use and distribution are the same than zlib :

-

-  This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-

-*/

-

-/* for more info about .ZIP format, see

-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip

-      http://www.info-zip.org/pub/infozip/doc/

-   PkWare has also a specification at :

-      ftp://ftp.pkware.com/probdesc.zip

-*/

-

-#ifndef _zip_H

-#define _zip_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#ifndef _ZLIB_H

-#include "zlib.h"

-#endif

-

-#ifndef _ZLIBIOAPI_H

-#include "ioapi.h"

-#endif

-

-#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)

-/* like the STRICT of WIN32, we define a pointer that cannot be converted

-    from (void*) without cast */

-typedef struct TagzipFile__ { int unused; } zipFile__;

-typedef zipFile__ *zipFile;

-#else

-typedef voidp zipFile;

-#endif

-

-#define ZIP_OK                          (0)

-#define ZIP_EOF                         (0)

-#define ZIP_ERRNO                       (Z_ERRNO)

-#define ZIP_PARAMERROR                  (-102)

-#define ZIP_BADZIPFILE                  (-103)

-#define ZIP_INTERNALERROR               (-104)

-

-#ifndef DEF_MEM_LEVEL

-#  if MAX_MEM_LEVEL >= 8

-#    define DEF_MEM_LEVEL 8

-#  else

-#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL

-#  endif

-#endif

-/* default memLevel */

-

-/* tm_zip contain date/time info */

-typedef struct tm_zip_s

-{

-    uInt tm_sec;            /* seconds after the minute - [0,59] */

-    uInt tm_min;            /* minutes after the hour - [0,59] */

-    uInt tm_hour;           /* hours since midnight - [0,23] */

-    uInt tm_mday;           /* day of the month - [1,31] */

-    uInt tm_mon;            /* months since January - [0,11] */

-    uInt tm_year;           /* years - [1980..2044] */

-} tm_zip;

-

-typedef struct

-{

-    tm_zip      tmz_date;       /* date in understandable format           */

-    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */

-/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */

-

-    uLong       internal_fa;    /* internal file attributes        2 bytes */

-    uLong       external_fa;    /* external file attributes        4 bytes */

-} zip_fileinfo;

-

-typedef const char* zipcharpc;

-

-

-#define APPEND_STATUS_CREATE        (0)

-#define APPEND_STATUS_CREATEAFTER   (1)

-#define APPEND_STATUS_ADDINZIP      (2)

-

-extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));

-/*

-  Create a zipfile.

-     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on

-       an Unix computer "zlib/zlib113.zip".

-     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip

-       will be created at the end of the file.

-         (useful if the file contain a self extractor code)

-     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will

-       add files in existing zip (be sure you don't add file that doesn't exist)

-     If the zipfile cannot be opened, the return value is NULL.

-     Else, the return value is a zipFile Handle, usable with other function

-       of this zip package.

-*/

-

-/* Note : there is no delete function into a zipfile.

-   If you want delete file into a zipfile, you must open a zipfile, and create another

-   Of couse, you can use RAW reading and writing to copy the file you did not want delte

-*/

-

-extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,

-                                   int append,

-                                   zipcharpc* globalcomment,

-                                   zlib_filefunc_def* pzlib_filefunc_def));

-

-extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,

-                       const char* filename,

-                       const zip_fileinfo* zipfi,

-                       const void* extrafield_local,

-                       uInt size_extrafield_local,

-                       const void* extrafield_global,

-                       uInt size_extrafield_global,

-                       const char* comment,

-                       int method,

-                       int level));

-/*

-  Open a file in the ZIP for writing.

-  filename : the filename in zip (if NULL, '-' without quote will be used

-  *zipfi contain supplemental information

-  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local

-    contains the extrafield data the the local header

-  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global

-    contains the extrafield data the the local header

-  if comment != NULL, comment contain the comment string

-  method contain the compression method (0 for store, Z_DEFLATED for deflate)

-  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)

-*/

-

-

-extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,

-                                            const char* filename,

-                                            const zip_fileinfo* zipfi,

-                                            const void* extrafield_local,

-                                            uInt size_extrafield_local,

-                                            const void* extrafield_global,

-                                            uInt size_extrafield_global,

-                                            const char* comment,

-                                            int method,

-                                            int level,

-                                            int raw));

-

-/*

-  Same than zipOpenNewFileInZip, except if raw=1, we write raw file

- */

-

-extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,

-                                            const char* filename,

-                                            const zip_fileinfo* zipfi,

-                                            const void* extrafield_local,

-                                            uInt size_extrafield_local,

-                                            const void* extrafield_global,

-                                            uInt size_extrafield_global,

-                                            const char* comment,

-                                            int method,

-                                            int level,

-                                            int raw,

-                                            int windowBits,

-                                            int memLevel,

-                                            int strategy,

-                                            const char* password,

-                                            uLong crcForCtypting));

-

-/*

-  Same than zipOpenNewFileInZip2, except

-    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2

-    password : crypting password (NULL for no crypting)

-    crcForCtypting : crc of file to compress (needed for crypting)

- */

-

-

-extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,

-                       const void* buf,

-                       unsigned len));

-/*

-  Write data in the zipfile

-*/

-

-extern int ZEXPORT zipCloseFileInZip OF((zipFile file));

-/*

-  Close the current file in the zipfile

-*/

-

-extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,

-                                            uLong uncompressed_size,

-                                            uLong crc32));

-/*

-  Close the current file in the zipfile, for fiel opened with

-    parameter raw=1 in zipOpenNewFileInZip2

-  uncompressed_size and crc32 are value for the uncompressed size

-*/

-

-extern int ZEXPORT zipClose OF((zipFile file,

-                const char* global_comment));

-/*

-  Close the zipfile

-*/

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* _zip_H */

+/* zip.h -- IO for compress .zip files using zlib
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
+     WinZip, InfoZip tools and compatible.
+   Multi volume ZipFile (span) are not supported.
+   Encryption compatible with pkzip 2.04g only supported
+   Old compressions used by old PKZip 1.x are not supported
+
+  For uncompress .zip file, look at unzip.h
+
+
+   I WAIT FEEDBACK at mail info@winimage.com
+   Visit also http://www.winimage.com/zLibDll/unzip.html for evolution
+
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+
+*/
+
+/* for more info about .ZIP format, see
+      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
+      http://www.info-zip.org/pub/infozip/doc/
+   PkWare has also a specification at :
+      ftp://ftp.pkware.com/probdesc.zip
+*/
+
+#ifndef _zip_H
+#define _zip_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagzipFile__ { int unused; } zipFile__;
+typedef zipFile__ *zipFile;
+#else
+typedef voidp zipFile;
+#endif
+
+#define ZIP_OK                          (0)
+#define ZIP_EOF                         (0)
+#define ZIP_ERRNO                       (Z_ERRNO)
+#define ZIP_PARAMERROR                  (-102)
+#define ZIP_BADZIPFILE                  (-103)
+#define ZIP_INTERNALERROR               (-104)
+
+#ifndef DEF_MEM_LEVEL
+#  if MAX_MEM_LEVEL >= 8
+#    define DEF_MEM_LEVEL 8
+#  else
+#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#  endif
+#endif
+/* default memLevel */
+
+/* tm_zip contain date/time info */
+typedef struct tm_zip_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_zip;
+
+typedef struct
+{
+    tm_zip      tmz_date;       /* date in understandable format           */
+    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
+/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
+
+    uLong       internal_fa;    /* internal file attributes        2 bytes */
+    uLong       external_fa;    /* external file attributes        4 bytes */
+} zip_fileinfo;
+
+typedef const char* zipcharpc;
+
+
+#define APPEND_STATUS_CREATE        (0)
+#define APPEND_STATUS_CREATEAFTER   (1)
+#define APPEND_STATUS_ADDINZIP      (2)
+
+extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
+/*
+  Create a zipfile.
+     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
+       an Unix computer "zlib/zlib113.zip".
+     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
+       will be created at the end of the file.
+         (useful if the file contain a self extractor code)
+     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
+       add files in existing zip (be sure you don't add file that doesn't exist)
+     If the zipfile cannot be opened, the return value is NULL.
+     Else, the return value is a zipFile Handle, usable with other function
+       of this zip package.
+*/
+
+/* Note : there is no delete function into a zipfile.
+   If you want delete file into a zipfile, you must open a zipfile, and create another
+   Of couse, you can use RAW reading and writing to copy the file you did not want delte
+*/
+
+extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc_def* pzlib_filefunc_def));
+
+extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level));
+/*
+  Open a file in the ZIP for writing.
+  filename : the filename in zip (if NULL, '-' without quote will be used
+  *zipfi contain supplemental information
+  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
+    contains the extrafield data the the local header
+  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
+    contains the extrafield data the the local header
+  if comment != NULL, comment contain the comment string
+  method contain the compression method (0 for store, Z_DEFLATED for deflate)
+  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
+*/
+
+
+extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw));
+
+/*
+  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCtypting));
+
+/*
+  Same than zipOpenNewFileInZip2, except
+    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
+    password : crypting password (NULL for no crypting)
+    crcForCtypting : crc of file to compress (needed for crypting)
+ */
+
+
+extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
+                       const void* buf,
+                       unsigned len));
+/*
+  Write data in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
+/*
+  Close the current file in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
+                                            uLong uncompressed_size,
+                                            uLong crc32));
+/*
+  Close the current file in the zipfile, for fiel opened with
+    parameter raw=1 in zipOpenNewFileInZip2
+  uncompressed_size and crc32 are value for the uncompressed size
+*/
+
+extern int ZEXPORT zipClose OF((zipFile file,
+                const char* global_comment));
+/*
+  Close the zipfile
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _zip_H */
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index 94103d2..836848c 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
 interface
 
 const
-  ZLIB_VERSION = '1.2.2';
+  ZLIB_VERSION = '1.2.3';
 
 type
   alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
diff --git a/contrib/testzlib/rdtsc64.asm b/contrib/testzlib/rdtsc64.asm
deleted file mode 100644
index 6b78a8b..0000000
--- a/contrib/testzlib/rdtsc64.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-; rdtsc64.asm

-;

-; unsigned _int64 myrdtsc();

-;

-; return the performance rdtsc value, on AMD64/Intel EM64T

-;

-; compile with :

-;    ml64.exe" /Flrdtsc64   /c /Zi rdtsc64.asm

-;

-.code

-myrdtsc PROC

-          rdtsc

-          shl rdx,32

-          or rax,rdx

-          ret

-myrdtsc ENDP

-

-END

diff --git a/contrib/testzlib/rdtsc64.obj b/contrib/testzlib/rdtsc64.obj
deleted file mode 100644
index 7905142..0000000
--- a/contrib/testzlib/rdtsc64.obj
+++ /dev/null
diff --git a/contrib/testzlib/testzlib.c b/contrib/testzlib/testzlib.c
index 6c3ff9f..e5574f4 100644
--- a/contrib/testzlib/testzlib.c
+++ b/contrib/testzlib/testzlib.c
@@ -1,7 +1,7 @@
-

 #include <stdio.h>

 #include <stdlib.h>

 #include <windows.h>

+

 #include "zlib.h"

 

 

@@ -17,23 +17,25 @@ void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B)
     }

 }

 

-#ifdef _AMD64_

-unsigned _int64 myrdtsc();

+#ifdef _M_X64

+// see http://msdn2.microsoft.com/library/twchhe95(en-us,vs.80).aspx for __rdtsc

+unsigned __int64 __rdtsc(void);

 void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)

 {

- //   printf("rdtsc = %I64x\n",myrdtsc());

-   pbeginTime64->QuadPart=myrdtsc();

+ //   printf("rdtsc = %I64x\n",__rdtsc());

+   pbeginTime64->QuadPart=__rdtsc();

 }

 

 LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)

 {

     LARGE_INTEGER LIres;

-    unsigned _int64 res=myrdtsc()-((unsigned _int64)(beginTime64.QuadPart));

+    unsigned _int64 res=__rdtsc()-((unsigned _int64)(beginTime64.QuadPart));

     LIres.QuadPart=res;

-   // printf("rdtsc = %I64x\n",myrdtsc());

+   // printf("rdtsc = %I64x\n",__rdtsc());

     return LIres;

 }

 #else

+#ifdef _M_IX86

 void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)

 {

     DWORD dwEdx,dwEax;

@@ -61,8 +63,23 @@ LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
     MyDoMinus64(&LIres,endTime64,beginTime64);

     return LIres;

 }

-#endif

+#else

+void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)

+{

+}

+

+void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)

+{

+}

 

+LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)

+{

+    LARGE_INTEGER lr;

+    lr.QuadPart=0;

+    return lr;

+}

+#endif

+#endif

 

 void BeginCountPerfCounter(LARGE_INTEGER * pbeginTime64,BOOL fComputeTimeQueryPerf)

 {

diff --git a/contrib/testzlib/testzlib.sln b/contrib/testzlib/testzlib.sln
deleted file mode 100644
index 86da716..0000000
--- a/contrib/testzlib/testzlib.sln
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

-EndProject

-Global

-        GlobalSection(SolutionConfiguration) = preSolution

-                ConfigName.0 = Debug

-                ConfigName.1 = Release

-        EndGlobalSection

-        GlobalSection(ProjectDependencies) = postSolution

-        EndGlobalSection

-        GlobalSection(ProjectConfiguration) = postSolution

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug.ActiveCfg = Debug|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug.Build.0 = Debug|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release.ActiveCfg = Release|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release.Build.0 = Release|Win32

-        EndGlobalSection

-        GlobalSection(ExtensibilityGlobals) = postSolution

-        EndGlobalSection

-        GlobalSection(ExtensibilityAddIns) = postSolution

-        EndGlobalSection

-EndGlobal

diff --git a/contrib/testzlib/testzlib8.sln b/contrib/testzlib/testzlib8.sln
deleted file mode 100644
index 794f72d..0000000
--- a/contrib/testzlib/testzlib8.sln
+++ /dev/null
@@ -1,32 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib8", "testzlib8.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

-EndProject

-Global

-        GlobalSection(SolutionConfigurationPlatforms) = preSolution

-                Debug|Win32 = Debug|Win32

-                Debug|Win64 (AMD64) = Debug|Win64 (AMD64)

-                Release|Win32 = Release|Win32

-                Release|Win64 (AMD64) = Release|Win64 (AMD64)

-                ReleaseAsm|Win32 = ReleaseAsm|Win32

-                ReleaseAsm|Win64 (AMD64) = ReleaseAsm|Win64 (AMD64)

-        EndGlobalSection

-        GlobalSection(ProjectConfigurationPlatforms) = postSolution

-                {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|Win64 (AMD64).ActiveCfg = Debug|Win64 (AMD64)

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win64 (AMD64).Build.0 = Debug|Win64 (AMD64)

-                {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|Win64 (AMD64).ActiveCfg = Release|Win64 (AMD64)

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win64 (AMD64).Build.0 = Release|Win64 (AMD64)

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win32.ActiveCfg = ReleaseAsm|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win32.Build.0 = ReleaseAsm|Win32

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win64 (AMD64).ActiveCfg = ReleaseAsm|Win64 (AMD64)

-                {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAsm|Win64 (AMD64).Build.0 = ReleaseAsm|Win64 (AMD64)

-        EndGlobalSection

-        GlobalSection(SolutionProperties) = preSolution

-                HideSolutionNode = FALSE

-        EndGlobalSection

-EndGlobal

diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index e709d1b..16159f9 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,8 +1,8 @@
-Building instructions for the DLL versions of Zlib 1.2.x

-=======================================================

+Building instructions for the DLL versions of Zlib 1.2.3

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

 

 This directory contains projects that build zlib and minizip using

-Microsoft Visual C++ 7.0/7.1.

+Microsoft Visual C++ 7.0/7.1, and Visual C++ .

 

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

 binaries from:

@@ -11,18 +11,36 @@ binaries from:
 More information can be found at this site.

 

 

-Build instructions

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

-- Unzip zlib*.zip and copy the files from contrib\vstudio\vc7,

-  from contrib\vstudio\masmx86 and from contrib\minizip into the same

-  directory.

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

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

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

 - Download the crtdll library from

     http://www.winimage.com/zLibDll/crtdll.zip

-  Unzip crtdll.zip to extract crtdll.lib.

-- If you are using x86, use the Release target.

-- Open zlibvc.sln with Microsoft Visual C++ 7.0 or 7.1

+  Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc7.

+- Open contrib\vstudio\vc7\zlibvc.sln with Microsoft Visual C++ 7.x

   (Visual Studio .Net 2002 or 2003).

 

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

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

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

+- For 32 bits only: download the crtdll library from

+    http://www.winimage.com/zLibDll/crtdll.zip

+  Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc8.

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

+

+Build instructions for Visual Studio 2005 64 bits, PSDK compiler

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

+at the time of writing this text file, Visual Studio 2005 (and 

+  Microsoft Visual C++ 8.0) is on the beta 2 stage.

+Using you can get the free 64 bits compiler from Platform SDK, 

+  which is NOT a beta, and compile using the Visual studio 2005 IDE

+see http://www.winimage.com/misc/sdk64onvs2005/ for instruction

+

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

+- start Visual Studio 2005 from a platform SDK command prompt, using

+  the /useenv switch

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

+

 

 Important

 ---------

diff --git a/contrib/vstudio/vc7/miniunz.vcproj b/contrib/vstudio/vc7/miniunz.vcproj
index 935c250..ad5117c 100644
--- a/contrib/vstudio/vc7/miniunz.vcproj
+++ b/contrib/vstudio/vc7/miniunz.vcproj
@@ -19,6 +19,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

                                 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"

                                 MinimalRebuild="TRUE"

                                 BasicRuntimeChecks="3"

@@ -63,6 +64,7 @@
                                 Optimization="2"

                                 InlineFunctionExpansion="1"

                                 OmitFramePointers="TRUE"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

                                 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"

                                 StringPooling="TRUE"

                                 RuntimeLibrary="4"

@@ -104,7 +106,7 @@
                         Name="Source Files"

                         Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

                         <File

-                                RelativePath="miniunz.c">

+                                RelativePath="..\..\minizip\miniunz.c">

                         </File>

                 </Filter>

                 <Filter

@@ -116,7 +118,7 @@
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

                 </Filter>

                 <File

-                        RelativePath="zlibwapi.lib">

+                        RelativePath="ReleaseDll\zlibwapi.lib">

                 </File>

         </Files>

         <Globals>

diff --git a/contrib/vstudio/vc7/minizip.vcproj b/contrib/vstudio/vc7/minizip.vcproj
index e6f9107..fb5b632 100644
--- a/contrib/vstudio/vc7/minizip.vcproj
+++ b/contrib/vstudio/vc7/minizip.vcproj
@@ -19,6 +19,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

                                 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"

                                 MinimalRebuild="TRUE"

                                 BasicRuntimeChecks="3"

@@ -63,6 +64,7 @@
                                 Optimization="2"

                                 InlineFunctionExpansion="1"

                                 OmitFramePointers="TRUE"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

                                 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"

                                 StringPooling="TRUE"

                                 RuntimeLibrary="4"

@@ -104,7 +106,7 @@
                         Name="Source Files"

                         Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

                         <File

-                                RelativePath="minizip.c">

+                                RelativePath="..\..\minizip\minizip.c">

                         </File>

                 </Filter>

                 <Filter

@@ -116,7 +118,7 @@
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

                 </Filter>

                 <File

-                        RelativePath="zlibwapi.lib">

+                        RelativePath="ReleaseDll\zlibwapi.lib">

                 </File>

         </Files>

         <Globals>

diff --git a/contrib/testzlib/testzlib.vcproj b/contrib/vstudio/vc7/testzlib.vcproj
index bd9b39b..97bc3e8 100644
--- a/contrib/testzlib/testzlib.vcproj
+++ b/contrib/vstudio/vc7/testzlib.vcproj
@@ -2,8 +2,8 @@
 <VisualStudioProject

         ProjectType="Visual C++"

         Version="7.00"

-        Name="testzlib"

-        ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

+        Name="testZlibDll"

+        ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}"

         Keyword="Win32Proj">

         <Platforms>

                 <Platform

@@ -19,6 +19,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="0"

+                                AdditionalIncludeDirectories="..\..\.."

                                 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"

                                 MinimalRebuild="TRUE"

                                 BasicRuntimeChecks="3"

@@ -63,6 +64,7 @@
                                 Optimization="2"

                                 InlineFunctionExpansion="1"

                                 OmitFramePointers="TRUE"

+                                AdditionalIncludeDirectories="..\..\.."

                                 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"

                                 StringPooling="TRUE"

                                 RuntimeLibrary="4"

@@ -104,7 +106,7 @@
                         Name="Source Files"

                         Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

                         <File

-                                RelativePath="testzlib.c">

+                                RelativePath="..\..\testzlib\testzlib.c">

                         </File>

                 </Filter>

                 <Filter

@@ -116,7 +118,7 @@
                         Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

                 </Filter>

                 <File

-                        RelativePath="zlibwapi.lib">

+                        RelativePath="ReleaseDll\zlibwapi.lib">

                 </File>

         </Files>

         <Globals>

diff --git a/contrib/vstudio/vc7/zlib.rc b/contrib/vstudio/vc7/zlib.rc
index e9d748f..72cb8b4 100644
--- a/contrib/vstudio/vc7/zlib.rc
+++ b/contrib/vstudio/vc7/zlib.rc
@@ -2,8 +2,8 @@
 

 #define IDR_VERSION1  1

 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION    1,2,2,4

-  PRODUCTVERSION 1,2,2,4

+  FILEVERSION    1,2,3,0

+  PRODUCTVERSION 1,2,3,0

   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

   FILEFLAGS     0

   FILEOS        VOS_DOS_WINDOWS32

@@ -17,7 +17,7 @@ BEGIN
 

     BEGIN

       VALUE "FileDescription", "zlib data compression library\0"

-      VALUE "FileVersion",      "1.2.2.4\0"

+      VALUE "FileVersion",      "1.2.3.0\0"

       VALUE "InternalName",     "zlib\0"

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

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

diff --git a/contrib/vstudio/vc7/zlibstat.vcproj b/contrib/vstudio/vc7/zlibstat.vcproj
index eb182f7..766d7a4 100644
--- a/contrib/vstudio/vc7/zlibstat.vcproj
+++ b/contrib/vstudio/vc7/zlibstat.vcproj
@@ -20,6 +20,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

                                 PreprocessorDefinitions="WIN32;ZLIB_WINAPI"

                                 ExceptionHandling="FALSE"

                                 RuntimeLibrary="5"

@@ -61,6 +62,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

+                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

                                 PreprocessorDefinitions="WIN32;ZLIB_WINAPI"

                                 StringPooling="TRUE"

                                 ExceptionHandling="FALSE"

@@ -102,6 +104,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

+                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

                                 PreprocessorDefinitions="WIN32;ZLIB_WINAPI;ASMV;ASMINF"

                                 StringPooling="TRUE"

                                 ExceptionHandling="FALSE"

@@ -117,7 +120,7 @@
                                 Name="VCCustomBuildTool"/>

                         <Tool

                                 Name="VCLibrarianTool"

-                                AdditionalOptions="gvmat32.obj inffas32.obj /NODEFAULTLIB "

+                                AdditionalOptions="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj /NODEFAULTLIB "

                                 OutputFile=".\zlibstat\zlibstat.lib"

                                 SuppressStartupBanner="TRUE"/>

                         <Tool

@@ -144,6 +147,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

+                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

                                 PreprocessorDefinitions="WIN32;ZLIB_WINAPI"

                                 StringPooling="TRUE"

                                 ExceptionHandling="FALSE"

@@ -182,49 +186,49 @@
                         Name="Source Files"

                         Filter="">

                         <File

-                                RelativePath=".\adler32.c">

+                                RelativePath="..\..\..\adler32.c">

                         </File>

                         <File

-                                RelativePath=".\compress.c">

+                                RelativePath="..\..\..\compress.c">

                         </File>

                         <File

-                                RelativePath=".\crc32.c">

+                                RelativePath="..\..\..\crc32.c">

                         </File>

                         <File

-                                RelativePath=".\deflate.c">

+                                RelativePath="..\..\..\deflate.c">

                         </File>

                         <File

-                                RelativePath=".\gvmat32c.c">

+                                RelativePath="..\..\masmx86\gvmat32c.c">

                         </File>

                         <File

-                                RelativePath=".\gzio.c">

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

                         </File>

                         <File

-                                RelativePath=".\infback.c">

+                                RelativePath="..\..\..\infback.c">

                         </File>

                         <File

-                                RelativePath=".\inffast.c">

+                                RelativePath="..\..\..\inffast.c">

                         </File>

                         <File

-                                RelativePath=".\inflate.c">

+                                RelativePath="..\..\..\inflate.c">

                         </File>

                         <File

-                                RelativePath=".\inftrees.c">

+                                RelativePath="..\..\..\inftrees.c">

                         </File>

                         <File

-                                RelativePath=".\ioapi.c">

+                                RelativePath="..\..\minizip\ioapi.c">

                         </File>

                         <File

-                                RelativePath=".\trees.c">

+                                RelativePath="..\..\..\trees.c">

                         </File>

                         <File

-                                RelativePath=".\uncompr.c">

+                                RelativePath="..\..\..\uncompr.c">

                         </File>

                         <File

-                                RelativePath=".\unzip.c">

+                                RelativePath="..\..\minizip\unzip.c">

                         </File>

                         <File

-                                RelativePath=".\zip.c">

+                                RelativePath="..\..\minizip\zip.c">

                         </File>

                         <File

                                 RelativePath=".\zlib.rc">

@@ -233,7 +237,7 @@
                                 RelativePath=".\zlibvc.def">

                         </File>

                         <File

-                                RelativePath=".\zutil.c">

+                                RelativePath="..\..\..\zutil.c">

                         </File>

                 </Filter>

         </Files>

diff --git a/contrib/vstudio/vc7/zlibvc.def b/contrib/vstudio/vc7/zlibvc.def
index 6bc26c4..a40e715 100644
--- a/contrib/vstudio/vc7/zlibvc.def
+++ b/contrib/vstudio/vc7/zlibvc.def
@@ -1,5 +1,5 @@
 

-VERSION         1.21

+VERSION         1.23

 

 HEAPSIZE        1048576,8192

 

@@ -53,7 +53,7 @@ EXPORTS
         deflateBound                             @47

         gzclearerr                               @48

         gzungetc                                 @49

-        zlibCompileFlags                         @50
+        zlibCompileFlags                         @50

         deflatePrime                             @51

 

         unzOpen                                  @61

diff --git a/contrib/vstudio/vc7/zlibvc.sln b/contrib/vstudio/vc7/zlibvc.sln
index 5a007ff..927b42b 100644
--- a/contrib/vstudio/vc7/zlibvc.sln
+++ b/contrib/vstudio/vc7/zlibvc.sln
@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj",
 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

@@ -58,6 +60,16 @@ Global
                 {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

diff --git a/contrib/vstudio/vc7/zlibvc.vcproj b/contrib/vstudio/vc7/zlibvc.vcproj
index 4e57bcd..8533b49 100644
--- a/contrib/vstudio/vc7/zlibvc.vcproj
+++ b/contrib/vstudio/vc7/zlibvc.vcproj
@@ -20,6 +20,7 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

                                 PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"

                                 ExceptionHandling="FALSE"

                                 RuntimeLibrary="1"

@@ -35,7 +36,7 @@
                         <Tool

                                 Name="VCLinkerTool"

                                 AdditionalOptions="/MACHINE:I386"

-                                AdditionalDependencies="gvmat32.obj inffas32.obj"

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

                                 OutputFile=".\DebugDll\zlibwapi.dll"

                                 LinkIncremental="2"

                                 SuppressStartupBanner="TRUE"

@@ -72,10 +73,12 @@
                         IntermediateDirectory=".\zlibDllWithoutAsm"

                         ConfigurationType="2"

                         UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE">

+                        ATLMinimizesCRunTimeLibraryUsage="FALSE"

+                        WholeProgramOptimization="TRUE">

                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

+                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

                                 PreprocessorDefinitions="WIN32,ZLIB_WINAPI"

                                 StringPooling="TRUE"

                                 ExceptionHandling="FALSE"

@@ -134,10 +137,12 @@
                         IntermediateDirectory=".\zlibDllWithoutCrtDll"

                         ConfigurationType="2"

                         UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE">

+                        ATLMinimizesCRunTimeLibraryUsage="FALSE"

+                        WholeProgramOptimization="TRUE">

                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

+                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

                                 PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"

                                 StringPooling="TRUE"

                                 ExceptionHandling="FALSE"

@@ -156,7 +161,7 @@
                         <Tool

                                 Name="VCLinkerTool"

                                 AdditionalOptions="/MACHINE:I386"

-                                AdditionalDependencies="gvmat32.obj inffas32.obj "

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

                                 OutputFile=".\zlibDllWithoutCrtDll\zlibwapi.dll"

                                 LinkIncremental="1"

                                 SuppressStartupBanner="TRUE"

@@ -196,10 +201,12 @@
                         IntermediateDirectory=".\zlibvc__"

                         ConfigurationType="2"

                         UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE">

+                        ATLMinimizesCRunTimeLibraryUsage="FALSE"

+                        WholeProgramOptimization="TRUE">

                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

+                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

                                 PreprocessorDefinitions="WIN32,ZLIB_WINAPI"

                                 StringPooling="TRUE"

                                 ExceptionHandling="FALSE"

@@ -256,10 +263,12 @@
                         IntermediateDirectory=".\ReleaseDll"

                         ConfigurationType="2"

                         UseOfMFC="0"

-                        ATLMinimizesCRunTimeLibraryUsage="FALSE">

+                        ATLMinimizesCRunTimeLibraryUsage="FALSE"

+                        WholeProgramOptimization="TRUE">

                         <Tool

                                 Name="VCCLCompilerTool"

                                 InlineFunctionExpansion="1"

+                                AdditionalIncludeDirectories="..\..\..;..\..\masmx86"

                                 PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"

                                 StringPooling="TRUE"

                                 ExceptionHandling="FALSE"

@@ -278,7 +287,7 @@
                         <Tool

                                 Name="VCLinkerTool"

                                 AdditionalOptions="/MACHINE:I386"

-                                AdditionalDependencies="gvmat32.obj inffas32.obj crtdll.lib"

+                                AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj crtdll.lib"

                                 OutputFile=".\ReleaseDll\zlibwapi.dll"

                                 LinkIncremental="1"

                                 SuppressStartupBanner="TRUE"

@@ -318,19 +327,19 @@
                         Name="Source Files"

                         Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90">

                         <File

-                                RelativePath=".\adler32.c">

+                                RelativePath="..\..\..\adler32.c">

                         </File>

                         <File

-                                RelativePath=".\compress.c">

+                                RelativePath="..\..\..\compress.c">

                         </File>

                         <File

-                                RelativePath=".\crc32.c">

+                                RelativePath="..\..\..\crc32.c">

                         </File>

                         <File

-                                RelativePath=".\deflate.c">

+                                RelativePath="..\..\..\deflate.c">

                         </File>

                         <File

-                                RelativePath=".\gvmat32c.c">

+                                RelativePath="..\..\masmx86\gvmat32c.c">

                                 <FileConfiguration

                                         Name="ReleaseWithoutAsm|Win32"

                                         ExcludedFromBuild="TRUE">

@@ -339,34 +348,34 @@
                                 </FileConfiguration>

                         </File>

                         <File

-                                RelativePath=".\gzio.c">

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

                         </File>

                         <File

-                                RelativePath=".\infback.c">

+                                RelativePath="..\..\..\infback.c">

                         </File>

                         <File

-                                RelativePath=".\inffast.c">

+                                RelativePath="..\..\..\inffast.c">

                         </File>

                         <File

-                                RelativePath=".\inflate.c">

+                                RelativePath="..\..\..\inflate.c">

                         </File>

                         <File

-                                RelativePath=".\inftrees.c">

+                                RelativePath="..\..\..\inftrees.c">

                         </File>

                         <File

-                                RelativePath=".\ioapi.c">

+                                RelativePath="..\..\minizip\ioapi.c">

                         </File>

                         <File

-                                RelativePath=".\iowin32.c">

+                                RelativePath="..\..\minizip\iowin32.c">

                         </File>

                         <File

-                                RelativePath=".\trees.c">

+                                RelativePath="..\..\..\trees.c">

                         </File>

                         <File

-                                RelativePath=".\uncompr.c">

+                                RelativePath="..\..\..\uncompr.c">

                         </File>

                         <File

-                                RelativePath=".\unzip.c">

+                                RelativePath="..\..\minizip\unzip.c">

                                 <FileConfiguration

                                         Name="Release|Win32">

                                         <Tool

@@ -376,7 +385,7 @@
                                 </FileConfiguration>

                         </File>

                         <File

-                                RelativePath=".\zip.c">

+                                RelativePath="..\..\minizip\zip.c">

                                 <FileConfiguration

                                         Name="Release|Win32">

                                         <Tool

@@ -392,38 +401,38 @@
                                 RelativePath=".\zlibvc.def">

                         </File>

                         <File

-                                RelativePath=".\zutil.c">

+                                RelativePath="..\..\..\zutil.c">

                         </File>

                 </Filter>

                 <Filter

                         Name="Header Files"

                         Filter="h;hpp;hxx;hm;inl;fi;fd">

                         <File

-                                RelativePath=".\deflate.h">

+                                RelativePath="..\..\..\deflate.h">

                         </File>

                         <File

-                                RelativePath=".\infblock.h">

+                                RelativePath="..\..\..\infblock.h">

                         </File>

                         <File

-                                RelativePath=".\infcodes.h">

+                                RelativePath="..\..\..\infcodes.h">

                         </File>

                         <File

-                                RelativePath=".\inffast.h">

+                                RelativePath="..\..\..\inffast.h">

                         </File>

                         <File

-                                RelativePath=".\inftrees.h">

+                                RelativePath="..\..\..\inftrees.h">

                         </File>

                         <File

-                                RelativePath=".\infutil.h">

+                                RelativePath="..\..\..\infutil.h">

                         </File>

                         <File

-                                RelativePath=".\zconf.h">

+                                RelativePath="..\..\..\zconf.h">

                         </File>

                         <File

-                                RelativePath=".\zlib.h">

+                                RelativePath="..\..\..\zlib.h">

                         </File>

                         <File

-                                RelativePath=".\zutil.h">

+                                RelativePath="..\..\..\zutil.h">

                         </File>

                 </Filter>

                 <Filter

diff --git a/contrib/vstudio/vc8/miniunz.vcproj b/contrib/vstudio/vc8/miniunz.vcproj
new file mode 100644
index 0000000..4af53e8
--- /dev/null
+++ b/contrib/vstudio/vc8/miniunz.vcproj
@@ -0,0 +1,566 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8,00"

+        Name="miniunz"

+        ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+                <Platform

+                        Name="x64"

+                />

+                <Platform

+                        Name="Itanium"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="x86\MiniUnzip$(ConfigurationName)"

+                        IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="1"

+                                BufferSecurityCheck="false"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"

+                                OutputFile="$(OutDir)/miniunz.exe"

+                                LinkIncremental="2"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

+                                SubSystem="1"

+                                TargetMachine="1"

+                        />

+                        <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\MiniUnzip$(ConfigurationName)"

+                        IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                                TargetEnvironment="3"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="3"

+                                BufferSecurityCheck="false"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

+                                OutputFile="$(OutDir)/miniunz.exe"

+                                LinkIncremental="2"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

+                                SubSystem="1"

+                                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\MiniUnzip$(ConfigurationName)"

+                        IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                                TargetEnvironment="2"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="3"

+                                BufferSecurityCheck="false"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

+                                OutputFile="$(OutDir)/miniunz.exe"

+                                LinkIncremental="2"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/miniunz.pdb"

+                                SubSystem="1"

+                                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\MiniUnzip$(ConfigurationName)"

+                        IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

+                                StringPooling="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="0"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

+                                OutputFile="$(OutDir)/miniunz.exe"

+                                LinkIncremental="1"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                TargetMachine="1"

+                        />

+                        <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\MiniUnzip$(ConfigurationName)"

+                        IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                                TargetEnvironment="3"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

+                                StringPooling="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="2"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"

+                                OutputFile="$(OutDir)/miniunz.exe"

+                                LinkIncremental="1"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                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\MiniUnzip$(ConfigurationName)"

+                        IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                                TargetEnvironment="2"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

+                                StringPooling="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="2"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"

+                                OutputFile="$(OutDir)/miniunz.exe"

+                                LinkIncremental="1"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                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;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>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/contrib/vstudio/vc8/minizip.vcproj b/contrib/vstudio/vc8/minizip.vcproj
new file mode 100644
index 0000000..85f64c4
--- /dev/null
+++ b/contrib/vstudio/vc8/minizip.vcproj
@@ -0,0 +1,563 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8,00"

+        Name="minizip"

+        ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+                <Platform

+                        Name="x64"

+                />

+                <Platform

+                        Name="Itanium"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="x86\MiniZip$(ConfigurationName)"

+                        IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="1"

+                                BufferSecurityCheck="false"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"

+                                OutputFile="$(OutDir)/minizip.exe"

+                                LinkIncremental="2"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/minizip.pdb"

+                                SubSystem="1"

+                                TargetMachine="1"

+                        />

+                        <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\$(ConfigurationName)"

+                        IntermediateDirectory="x64\$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                                TargetEnvironment="3"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="3"

+                                BufferSecurityCheck="false"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

+                                OutputFile="$(OutDir)/minizip.exe"

+                                LinkIncremental="2"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/minizip.pdb"

+                                SubSystem="1"

+                                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\$(ConfigurationName)"

+                        IntermediateDirectory="ia64\$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                                TargetEnvironment="2"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="3"

+                                BufferSecurityCheck="false"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

+                                OutputFile="$(OutDir)/minizip.exe"

+                                LinkIncremental="2"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/minizip.pdb"

+                                SubSystem="1"

+                                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\MiniZip$(ConfigurationName)"

+                        IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

+                                StringPooling="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="0"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

+                                OutputFile="$(OutDir)/minizip.exe"

+                                LinkIncremental="1"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                TargetMachine="1"

+                        />

+                        <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\$(ConfigurationName)"

+                        IntermediateDirectory="x64\$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                                TargetEnvironment="3"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

+                                StringPooling="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="2"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"

+                                OutputFile="$(OutDir)/minizip.exe"

+                                LinkIncremental="1"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                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\$(ConfigurationName)"

+                        IntermediateDirectory="ia64\$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                                TargetEnvironment="2"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

+                                StringPooling="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="2"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"

+                                OutputFile="$(OutDir)/minizip.exe"

+                                LinkIncremental="1"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                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;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>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/contrib/vstudio/vc8/testzlib.vcproj b/contrib/vstudio/vc8/testzlib.vcproj
new file mode 100644
index 0000000..68c3539
--- /dev/null
+++ b/contrib/vstudio/vc8/testzlib.vcproj
@@ -0,0 +1,948 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8,00"

+        Name="testzlib"

+        ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

+        RootNamespace="testzlib"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+                <Platform

+                        Name="x64"

+                />

+                <Platform

+                        Name="Itanium"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="x86\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\.."

+                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="1"

+                                BufferSecurityCheck="false"

+                                UsePrecompiledHeader="0"

+                                AssemblerOutput="4"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

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

+                                OutputFile="$(OutDir)/testzlib.exe"

+                                LinkIncremental="2"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

+                                SubSystem="1"

+                                TargetMachine="1"

+                        />

+                        <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\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\..\.."

+                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="3"

+                                BufferSecurityCheck="false"

+                                AssemblerListingLocation="$(IntDir)\"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

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

+                                GenerateManifest="false"

+                        />

+                        <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\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                                TargetEnvironment="2"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\.."

+                                PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="3"

+                                BufferSecurityCheck="false"

+                                UsePrecompiledHeader="0"

+                                AssemblerOutput="4"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                OutputFile="$(OutDir)/testzlib.exe"

+                                LinkIncremental="2"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

+                                SubSystem="1"

+                                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\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        CharacterSet="2"

+                        WholeProgramOptimization="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <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"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="0"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                OutputFile="$(OutDir)/testzlib.exe"

+                                LinkIncremental="1"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                TargetMachine="1"

+                        />

+                        <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\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        WholeProgramOptimization="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\..\.."

+                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="2"

+                                BufferSecurityCheck="false"

+                                AssemblerListingLocation="$(IntDir)\"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies=""

+                                GenerateManifest="false"

+                        />

+                        <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\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        CharacterSet="2"

+                        WholeProgramOptimization="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <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"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="2"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                OutputFile="$(OutDir)/testzlib.exe"

+                                LinkIncremental="1"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                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\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        CharacterSet="2"

+                        WholeProgramOptimization="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="2"

+                                InlineFunctionExpansion="1"

+                                OmitFramePointers="true"

+                                AdditionalIncludeDirectories="..\..\.."

+                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                StringPooling="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="0"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

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

+                                OutputFile="$(OutDir)/testzlib.exe"

+                                LinkIncremental="1"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                TargetMachine="1"

+                        />

+                        <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\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        WholeProgramOptimization="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\..\.."

+                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="2"

+                                BufferSecurityCheck="false"

+                                AssemblerListingLocation="$(IntDir)\"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

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

+                                GenerateManifest="false"

+                        />

+                        <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\TestZlib$(ConfigurationName)"

+                        IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"

+                        ConfigurationType="1"

+                        CharacterSet="2"

+                        WholeProgramOptimization="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <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"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="2"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

+                                UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="true"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                OutputFile="$(OutDir)/testzlib.exe"

+                                LinkIncremental="1"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

+                                SubSystem="1"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                OptimizeForWindows98="1"

+                                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;def;odl;idl;hpj;bat;asm"

+                        >

+                        <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|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>

+                                <FileConfiguration

+                                        Name="Debug|Win64 (AMD64)"

+                                        ExcludedFromBuild="TRUE"

+                                        >

+                                        <Tool

+                                                Name="VCCLCompilerTool"

+                                        />

+                                </FileConfiguration>

+                                <FileConfiguration

+                                        Name="Release|Win64 (AMD64)"

+                                        ExcludedFromBuild="TRUE"

+                                        >

+                                        <Tool

+                                                Name="VCCLCompilerTool"

+                                        />

+                                </FileConfiguration>

+                                <FileConfiguration

+                                        Name="ReleaseAsm|Win64 (AMD64)"

+                                        ExcludedFromBuild="TRUE"

+                                        >

+                                        <Tool

+                                                Name="VCCLCompilerTool"

+                                        />

+                                </FileConfiguration>

+                        </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="..\..\testzlib\testzlib.c"

+                                >

+                        </File>

+                        <File

+                                RelativePath="..\..\..\trees.c"

+                                >

+                        </File>

+                        <File

+                                RelativePath="..\..\..\uncompr.c"

+                                >

+                        </File>

+                        <File

+                                RelativePath="..\..\..\zutil.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>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/contrib/testzlib/testzlib8.vcproj b/contrib/vstudio/vc8/testzlibdll.vcproj
index 3cab776..f38ab5e 100644
--- a/contrib/testzlib/testzlib8.vcproj
+++ b/contrib/vstudio/vc8/testzlibdll.vcproj
@@ -2,29 +2,31 @@
 <VisualStudioProject

         ProjectType="Visual C++"

         Version="8,00"

-        Name="testzlib8"

-        ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

+        Name="TestZlibDll"

+        ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}"

         Keyword="Win32Proj"

+        SignManifests="true"

         >

         <Platforms>

                 <Platform

                         Name="Win32"

                 />

                 <Platform

-                        Name="Win64 (AMD64)"

+                        Name="x64"

+                />

+                <Platform

+                        Name="Itanium"

                 />

         </Platforms>

         <ToolFiles>

-                <DefaultToolFile

-                        FileName="masm.tool"

-                />

         </ToolFiles>

         <Configurations>

                 <Configuration

                         Name="Debug|Win32"

-                        OutputDirectory="x86\$(ConfigurationName)"

-                        IntermediateDirectory="x86\$(ConfigurationName)"

+                        OutputDirectory="x86\TestZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

                         >

                         <Tool

@@ -34,9 +36,6 @@
                                 Name="VCCustomBuildTool"

                         />

                         <Tool

-                                Name="MASM"

-                        />

-                        <Tool

                                 Name="VCXMLDataGeneratorTool"

                         />

                         <Tool

@@ -48,14 +47,16 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="0"

-                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

-                                MinimalRebuild="TRUE"

-                                BasicRuntimeChecks="3"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

                                 RuntimeLibrary="1"

+                                BufferSecurityCheck="false"

                                 UsePrecompiledHeader="0"

-                                AssemblerOutput="4"

+                                AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

+                                Detect64BitPortabilityProblems="true"

                                 DebugInformationFormat="4"

                         />

                         <Tool

@@ -69,10 +70,11 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="gvmat32.obj inffas32.obj"

+                                AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"

                                 OutputFile="$(OutDir)/testzlib.exe"

                                 LinkIncremental="2"

-                                GenerateDebugInformation="TRUE"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

                                 SubSystem="1"

                                 TargetMachine="1"

@@ -90,6 +92,9 @@
                                 Name="VCBscMakeTool"

                         />

                         <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

                                 Name="VCAppVerifierTool"

                         />

                         <Tool

@@ -100,10 +105,11 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Debug|Win64 (AMD64)"

-                        OutputDirectory="amd64\$(ConfigurationName)"

-                        IntermediateDirectory="amd64\$(ConfigurationName)"

+                        Name="Debug|x64"

+                        OutputDirectory="x64\TestZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

                         >

                         <Tool

@@ -113,9 +119,6 @@
                                 Name="VCCustomBuildTool"

                         />

                         <Tool

-                                Name="MASM"

-                        />

-                        <Tool

                                 Name="VCXMLDataGeneratorTool"

                         />

                         <Tool

@@ -128,14 +131,16 @@
                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="0"

-                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

-                                MinimalRebuild="TRUE"

-                                BasicRuntimeChecks="3"

-                                RuntimeLibrary="1"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="3"

+                                BufferSecurityCheck="false"

                                 UsePrecompiledHeader="0"

-                                AssemblerOutput="4"

+                                AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

+                                Detect64BitPortabilityProblems="true"

                                 DebugInformationFormat="3"

                         />

                         <Tool

@@ -146,14 +151,14 @@
                         />

                         <Tool

                                 Name="VCPreLinkEventTool"

-                                CommandLine=""

                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="gvmat64.obj inffasx64.obj rdtsc64.obj"

+                                AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"

                                 OutputFile="$(OutDir)/testzlib.exe"

                                 LinkIncremental="2"

-                                GenerateDebugInformation="TRUE"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

                                 ProgramDatabaseFile="$(OutDir)/testzlib.pdb"

                                 SubSystem="1"

                                 TargetMachine="17"

@@ -171,6 +176,12 @@
                                 Name="VCBscMakeTool"

                         />

                         <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

                                 Name="VCWebDeploymentTool"

                         />

                         <Tool

@@ -178,10 +189,11 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="x86\$(ConfigurationName)"

-                        IntermediateDirectory="x86\$(ConfigurationName)"

+                        Name="Debug|Itanium"

+                        OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

                         >

                         <Tool

@@ -191,9 +203,6 @@
                                 Name="VCCustomBuildTool"

                         />

                         <Tool

-                                Name="MASM"

-                        />

-                        <Tool

                                 Name="VCXMLDataGeneratorTool"

                         />

                         <Tool

@@ -201,19 +210,21 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

+                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

-                                Optimization="2"

-                                InlineFunctionExpansion="1"

-                                OmitFramePointers="TRUE"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

-                                StringPooling="TRUE"

-                                RuntimeLibrary="0"

-                                EnableFunctionLevelLinking="TRUE"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="3"

+                                BufferSecurityCheck="false"

                                 UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

+                                Detect64BitPortabilityProblems="true"

                                 DebugInformationFormat="3"

                         />

                         <Tool

@@ -227,14 +238,14 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

+                                AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"

                                 OutputFile="$(OutDir)/testzlib.exe"

-                                LinkIncremental="1"

-                                GenerateDebugInformation="TRUE"

+                                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"

@@ -249,6 +260,9 @@
                                 Name="VCBscMakeTool"

                         />

                         <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

                                 Name="VCAppVerifierTool"

                         />

                         <Tool

@@ -259,10 +273,11 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="Release|Win64 (AMD64)"

-                        OutputDirectory="amd64\$(ConfigurationName)"

-                        IntermediateDirectory="amd64\$(ConfigurationName)"

+                        Name="Release|Win32"

+                        OutputDirectory="x86\TestZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

                         >

                         <Tool

@@ -272,9 +287,6 @@
                                 Name="VCCustomBuildTool"

                         />

                         <Tool

-                                Name="MASM"

-                        />

-                        <Tool

                                 Name="VCXMLDataGeneratorTool"

                         />

                         <Tool

@@ -282,20 +294,23 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="2"

                                 InlineFunctionExpansion="1"

-                                OmitFramePointers="TRUE"

-                                PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

-                                StringPooling="TRUE"

+                                OmitFramePointers="true"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"

+                                StringPooling="true"

+                                BasicRuntimeChecks="0"

                                 RuntimeLibrary="0"

-                                EnableFunctionLevelLinking="TRUE"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

+                                Detect64BitPortabilityProblems="true"

                                 DebugInformationFormat="3"

                         />

                         <Tool

@@ -309,15 +324,16 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="rdtsc64.obj"

+                                AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"

                                 OutputFile="$(OutDir)/testzlib.exe"

                                 LinkIncremental="1"

-                                GenerateDebugInformation="TRUE"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

                                 SubSystem="1"

                                 OptimizeReferences="2"

                                 EnableCOMDATFolding="2"

                                 OptimizeForWindows98="1"

-                                TargetMachine="17"

+                                TargetMachine="1"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -332,6 +348,12 @@
                                 Name="VCBscMakeTool"

                         />

                         <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

                                 Name="VCWebDeploymentTool"

                         />

                         <Tool

@@ -339,10 +361,11 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="ReleaseAsm|Win32"

-                        OutputDirectory="x86\$(ConfigurationName)"

-                        IntermediateDirectory="x86\$(ConfigurationName)"

+                        Name="Release|x64"

+                        OutputDirectory="x64\TestZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

                         >

                         <Tool

@@ -352,9 +375,6 @@
                                 Name="VCCustomBuildTool"

                         />

                         <Tool

-                                Name="MASM"

-                        />

-                        <Tool

                                 Name="VCXMLDataGeneratorTool"

                         />

                         <Tool

@@ -362,19 +382,24 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

+                                TargetEnvironment="3"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="2"

                                 InlineFunctionExpansion="1"

-                                OmitFramePointers="TRUE"

-                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

-                                StringPooling="TRUE"

-                                RuntimeLibrary="0"

-                                EnableFunctionLevelLinking="TRUE"

+                                OmitFramePointers="true"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

+                                StringPooling="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="2"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

+                                AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

+                                Detect64BitPortabilityProblems="true"

                                 DebugInformationFormat="3"

                         />

                         <Tool

@@ -388,15 +413,16 @@
                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="gvmat32.obj inffas32.obj"

+                                AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"

                                 OutputFile="$(OutDir)/testzlib.exe"

                                 LinkIncremental="1"

-                                GenerateDebugInformation="TRUE"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

                                 SubSystem="1"

                                 OptimizeReferences="2"

                                 EnableCOMDATFolding="2"

                                 OptimizeForWindows98="1"

-                                TargetMachine="1"

+                                TargetMachine="17"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -411,6 +437,9 @@
                                 Name="VCBscMakeTool"

                         />

                         <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

                                 Name="VCAppVerifierTool"

                         />

                         <Tool

@@ -421,23 +450,20 @@
                         />

                 </Configuration>

                 <Configuration

-                        Name="ReleaseAsm|Win64 (AMD64)"

-                        OutputDirectory="amd64\$(ConfigurationName)"

-                        IntermediateDirectory="amd64\$(ConfigurationName)"

+                        Name="Release|Itanium"

+                        OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"

+                        IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"

                         ConfigurationType="1"

+                        InheritedPropertySheets="UpgradeFromVC70.vsprops"

                         CharacterSet="2"

                         >

                         <Tool

                                 Name="VCPreBuildEventTool"

-                                CommandLine=""

                         />

                         <Tool

                                 Name="VCCustomBuildTool"

                         />

                         <Tool

-                                Name="MASM"

-                        />

-                        <Tool

                                 Name="VCXMLDataGeneratorTool"

                         />

                         <Tool

@@ -445,21 +471,24 @@
                         />

                         <Tool

                                 Name="VCMIDLTool"

-                                TargetEnvironment="3"

+                                TargetEnvironment="2"

                         />

                         <Tool

                                 Name="VCCLCompilerTool"

                                 Optimization="2"

                                 InlineFunctionExpansion="1"

-                                OmitFramePointers="TRUE"

-                                PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"

-                                StringPooling="TRUE"

-                                RuntimeLibrary="0"

-                                EnableFunctionLevelLinking="TRUE"

+                                OmitFramePointers="true"

+                                AdditionalIncludeDirectories="..\..\..;..\..\minizip"

+                                PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"

+                                StringPooling="true"

+                                BasicRuntimeChecks="0"

+                                RuntimeLibrary="2"

+                                BufferSecurityCheck="false"

+                                EnableFunctionLevelLinking="true"

                                 UsePrecompiledHeader="0"

-                                AssemblerOutput="4"

+                                AssemblerListingLocation="$(IntDir)\"

                                 WarningLevel="3"

-                                Detect64BitPortabilityProblems="TRUE"

+                                Detect64BitPortabilityProblems="true"

                                 DebugInformationFormat="3"

                         />

                         <Tool

@@ -470,19 +499,19 @@
                         />

                         <Tool

                                 Name="VCPreLinkEventTool"

-                                CommandLine=""

                         />

                         <Tool

                                 Name="VCLinkerTool"

-                                AdditionalDependencies="gvmat64.obj inffasx64.obj rdtsc64.obj"

+                                AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"

                                 OutputFile="$(OutDir)/testzlib.exe"

                                 LinkIncremental="1"

-                                GenerateDebugInformation="TRUE"

+                                GenerateManifest="false"

+                                GenerateDebugInformation="true"

                                 SubSystem="1"

                                 OptimizeReferences="2"

                                 EnableCOMDATFolding="2"

                                 OptimizeForWindows98="1"

-                                TargetMachine="17"

+                                TargetMachine="5"

                         />

                         <Tool

                                 Name="VCALinkTool"

@@ -497,6 +526,12 @@
                                 Name="VCBscMakeTool"

                         />

                         <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

                                 Name="VCWebDeploymentTool"

                         />

                         <Tool

@@ -512,113 +547,7 @@
                         Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

                         >

                         <File

-                                RelativePath=".\adler32.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\compress.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\crc32.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\deflate.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\gvmat32c.c"

-                                >

-                                <FileConfiguration

-                                        Name="Debug|Win64 (AMD64)"

-                                        ExcludedFromBuild="TRUE"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|Win64 (AMD64)"

-                                        ExcludedFromBuild="TRUE"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseAsm|Win32"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseAsm|Win64 (AMD64)"

-                                        ExcludedFromBuild="TRUE"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath=".\infback.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\inffas8664.c"

-                                >

-                                <FileConfiguration

-                                        Name="Debug|Win32"

-                                        ExcludedFromBuild="TRUE"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|Win32"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="ReleaseAsm|Win32"

-                                        ExcludedFromBuild="TRUE"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                        />

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath=".\inffast.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\inflate.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\inftrees.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath="testzlib.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\trees.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\uncompr.c"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\zutil.c"

+                                RelativePath="..\..\testzlib\testzlib.c"

                                 >

                         </File>

                 </Filter>

diff --git a/contrib/vstudio/vc8/zlib.rc b/contrib/vstudio/vc8/zlib.rc
new file mode 100644
index 0000000..72cb8b4
--- /dev/null
+++ b/contrib/vstudio/vc8/zlib.rc
@@ -0,0 +1,32 @@
+#include <windows.h>

+

+#define IDR_VERSION1  1

+IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE

+  FILEVERSION    1,2,3,0

+  PRODUCTVERSION 1,2,3,0

+  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

+  FILEFLAGS     0

+  FILEOS        VOS_DOS_WINDOWS32

+  FILETYPE      VFT_DLL

+  FILESUBTYPE   0       // not used

+BEGIN

+  BLOCK "StringFileInfo"

+  BEGIN

+    BLOCK "040904E4"

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

+

+    BEGIN

+      VALUE "FileDescription", "zlib data compression library\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-2003 Jean-loup Gailly & Mark Adler\0"

+    END

+  END

+  BLOCK "VarFileInfo"

+  BEGIN

+    VALUE "Translation", 0x0409, 1252

+  END

+END

diff --git a/contrib/vstudio/vc8/zlibstat.vcproj b/contrib/vstudio/vc8/zlibstat.vcproj
new file mode 100644
index 0000000..fb97037
--- /dev/null
+++ b/contrib/vstudio/vc8/zlibstat.vcproj
@@ -0,0 +1,870 @@
+<?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;_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;_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;_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;_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;_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;_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;_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;_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;_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="..\..\..\gzio.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/vstudio/vc8/zlibvc.def b/contrib/vstudio/vc8/zlibvc.def
new file mode 100644
index 0000000..a40e715
--- /dev/null
+++ b/contrib/vstudio/vc8/zlibvc.def
@@ -0,0 +1,92 @@
+

+VERSION         1.23

+

+HEAPSIZE        1048576,8192

+

+EXPORTS

+        adler32                                  @1

+        compress                                 @2

+        crc32                                    @3

+        deflate                                  @4

+        deflateCopy                              @5

+        deflateEnd                               @6

+        deflateInit2_                            @7

+        deflateInit_                             @8

+        deflateParams                            @9

+        deflateReset                             @10

+        deflateSetDictionary                     @11

+        gzclose                                  @12

+        gzdopen                                  @13

+        gzerror                                  @14

+        gzflush                                  @15

+        gzopen                                   @16

+        gzread                                   @17

+        gzwrite                                  @18

+        inflate                                  @19

+        inflateEnd                               @20

+        inflateInit2_                            @21

+        inflateInit_                             @22

+        inflateReset                             @23

+        inflateSetDictionary                     @24

+        inflateSync                              @25

+        uncompress                               @26

+        zlibVersion                              @27

+        gzprintf                                 @28

+        gzputc                                   @29

+        gzgetc                                   @30

+        gzseek                                   @31

+        gzrewind                                 @32

+        gztell                                   @33

+        gzeof                                    @34

+        gzsetparams                              @35

+        zError                                   @36

+        inflateSyncPoint                         @37

+        get_crc_table                            @38

+        compress2                                @39

+        gzputs                                   @40

+        gzgets                                   @41

+        inflateCopy                              @42

+        inflateBackInit_                         @43

+        inflateBack                              @44

+        inflateBackEnd                           @45

+        compressBound                            @46

+        deflateBound                             @47

+        gzclearerr                               @48

+        gzungetc                                 @49

+        zlibCompileFlags                         @50

+        deflatePrime                             @51

+

+        unzOpen                                  @61

+        unzClose                                 @62

+        unzGetGlobalInfo                         @63

+        unzGetCurrentFileInfo                    @64

+        unzGoToFirstFile                         @65

+        unzGoToNextFile                          @66

+        unzOpenCurrentFile                       @67

+        unzReadCurrentFile                       @68

+        unzOpenCurrentFile3                      @69

+        unztell                                  @70

+        unzeof                                   @71

+        unzCloseCurrentFile                      @72

+        unzGetGlobalComment                      @73

+        unzStringFileNameCompare                 @74

+        unzLocateFile                            @75

+        unzGetLocalExtrafield                    @76

+        unzOpen2                                 @77

+        unzOpenCurrentFile2                      @78

+        unzOpenCurrentFilePassword               @79

+

+        zipOpen                                  @80

+        zipOpenNewFileInZip                      @81

+        zipWriteInFileInZip                      @82

+        zipCloseFileInZip                        @83

+        zipClose                                 @84

+        zipOpenNewFileInZip2                     @86

+        zipCloseFileInZipRaw                     @87

+        zipOpen2                                 @88

+        zipOpenNewFileInZip3                     @89

+

+        unzGetFilePos                            @100

+        unzGoToFilePos                           @101

+

+        fill_win32_filefunc                      @110

diff --git a/contrib/vstudio/vc8/zlibvc.sln b/contrib/vstudio/vc8/zlibvc.sln
new file mode 100644
index 0000000..a815a55
--- /dev/null
+++ b/contrib/vstudio/vc8/zlibvc.sln
@@ -0,0 +1,144 @@
+

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+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}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestZlibDll", "testzlibdll.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"

+        ProjectSection(ProjectDependencies) = postProject

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}

+        EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"

+        ProjectSection(ProjectDependencies) = postProject

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}

+        EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"

+        ProjectSection(ProjectDependencies) = postProject

+                {8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}

+        EndProjectSection

+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/vc8/zlibvc.vcproj b/contrib/vstudio/vc8/zlibvc.vcproj
new file mode 100644
index 0000000..e717011
--- /dev/null
+++ b/contrib/vstudio/vc8/zlibvc.vcproj
@@ -0,0 +1,1219 @@
+<?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="..\..\..\gzio.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/deflate.c b/deflate.c
index 395c40a..29ce1f6 100644
--- a/deflate.c
+++ b/deflate.c
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.2.4 Copyright 1995-2005 Jean-loup Gailly ";
+   " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";
 /*
   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
diff --git a/inftrees.c b/inftrees.c
index 61d52f6..8a9c13f 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.2.4 Copyright 1995-2005 Mark Adler ";
+   " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 206, 69};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/make_vms.com b/make_vms.com
index c3e5b58..c2a1fb5 100644
--- a/make_vms.com
+++ b/make_vms.com
@@ -1,5 +1,5 @@
-$! make libz under VMS written by 
-$! Martin P.J. Zinser 
+$! make libz under VMS written by
+$! Martin P.J. Zinser
 $! <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com>
 $!
 $ on error then goto err_exit
@@ -46,8 +46,8 @@ $ then
 $   ccopt = "/prefix=all" + ccopt
 $   if f$trnlnm("SYS") .eqs. ""
 $   then
-$     if axp 
-$     then 
+$     if axp
+$     then
 $       define sys sys$library:
 $     else
 $       ccopt = "/decc" + ccopt
@@ -58,7 +58,7 @@ $ endif
 $ if its_vaxc .or. its_gnuc
 $ then
 $    if f$trnlnm("SYS").eqs."" then define sys sys$library:
-$ endif  
+$ endif
 $!
 $! Build the thing plain or with mms
 $!
@@ -101,8 +101,8 @@ $   then
 $     write sys$output "Building minigzip..."
 $     CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
                 minigzip.c zlib.h zconf.h
-$     call make minigzip.exe - 
-                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" - 
+$     call make minigzip.exe -
+                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" -
                 minigzip.obj libz.olb
 $   endif
 $  else
@@ -118,7 +118,7 @@ $ Then
 $   gosub crea_olist
 $   write sys$output "Creating libzshr.exe"
 $   call anal_obj_axp modules.opt _link.opt
-$   if s_case 
+$   if s_case
 $   then
 $      open/append optf modules.opt
 $      write optf "case_sensitive=YES"
@@ -200,41 +200,41 @@ $     if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
          then s_case = true
 $   endif
 $   if cparm .eqs. "LINK" then linkonly = true
-$   if f$locate("LOPTS=",cparm) .lt. f$length(cparm) 
+$   if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
 $   then
 $     start = f$locate("=",cparm) + 1
 $     len   = f$length(cparm) - start
 $     lopts = lopts + f$extract(start,len,cparm)
 $   endif
-$   if f$locate("CC=",cparm) .lt. f$length(cparm) 
+$   if f$locate("CC=",cparm) .lt. f$length(cparm)
 $   then
 $     start  = f$locate("=",cparm) + 1
 $     len    = f$length(cparm) - start
 $     cc_com = f$extract(start,len,cparm)
-      if (cc_com .nes. "DECC") .and. - 
-         (cc_com .nes. "VAXC") .and. - 
+      if (cc_com .nes. "DECC") .and. -
+         (cc_com .nes. "VAXC") .and. -
          (cc_com .nes. "GNUC")
 $     then
 $       write sys$output "Unsupported compiler choice ''cc_com' ignored"
 $       write sys$output "Use DECC, VAXC, or GNUC instead"
-$     else 
-$       if cc_com .eqs. "DECC" then its_decc = true   
-$       if cc_com .eqs. "VAXC" then its_vaxc = true   
-$       if cc_com .eqs. "GNUC" then its_gnuc = true   
-$     endif 
+$     else
+$       if cc_com .eqs. "DECC" then its_decc = true
+$       if cc_com .eqs. "VAXC" then its_vaxc = true
+$       if cc_com .eqs. "GNUC" then its_gnuc = true
+$     endif
 $   endif
-$   if f$locate("MAKE=",cparm) .lt. f$length(cparm) 
+$   if f$locate("MAKE=",cparm) .lt. f$length(cparm)
 $   then
 $     start  = f$locate("=",cparm) + 1
 $     len    = f$length(cparm) - start
 $     mmks = f$extract(start,len,cparm)
-$     if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS") 
+$     if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
 $     then
 $       make = mmks
-$     else 
+$     else
 $       write sys$output "Unsupported make choice ''mmks' ignored"
 $       write sys$output "Use MMK or MMS instead"
-$     endif 
+$     endif
 $   endif
 $   i = i + 1
 $   goto opt_loop
@@ -242,7 +242,7 @@ $ endif
 $ return
 $!------------------------------------------------------------------------------
 $!
-$! Look for the compiler used 
+$! Look for the compiler used
 $!
 $CHECK_COMPILER:
 $ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
@@ -254,7 +254,7 @@ $ endif
 $!
 $! Exit if no compiler available
 $!
-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc)) 
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
 $ then goto CC_ERR
 $ else
 $   if its_decc then write sys$output "CC compiler check ... Compaq C"
@@ -273,7 +273,7 @@ $ open/append out descrip.mms
 $ copy sys$input: out
 $ deck
 # descrip.mms: MMS description file for building zlib on VMS
-# written by Martin P.J. Zinser 
+# written by Martin P.J. Zinser
 # <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com>
 
 OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj, infback.obj\
@@ -281,7 +281,7 @@ OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj, infback.obj\
        inftrees.obj, inffast.obj
 
 $ eod
-$ write out "CFLAGS=", ccopt 
+$ write out "CFLAGS=", ccopt
 $ write out "LOPTS=", lopts
 $ copy sys$input: out
 $ deck
@@ -298,7 +298,7 @@ example.exe : example.obj libz.olb
 minigzip.exe : minigzip.obj libz.olb
               link $(LOPTS) minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
 
-clean : 
+clean :
         delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*
 
 
@@ -310,7 +310,7 @@ deflate.obj  : deflate.c deflate.h zutil.h zlib.h zconf.h
 example.obj  : example.c zlib.h zconf.h
 gzio.obj     : gzio.c zutil.h zlib.h zconf.h
 inffast.obj  : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h
-inflate.obj  : inflate.c zutil.h zlib.h zconf.h 
+inflate.obj  : inflate.c zutil.h zlib.h zconf.h
 inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h
 minigzip.obj : minigzip.c zlib.h zconf.h
 trees.obj    : trees.c deflate.h zutil.h zlib.h zconf.h
@@ -332,12 +332,12 @@ $ src_check = "OBJS ="
 $MRLOOP:
 $ read/end=mrdone min rec
 $ if (f$extract(0,6,rec) .nes. src_check) then goto mrloop
-$ rec = rec - src_check 
+$ rec = rec - src_check
 $ gosub extra_filnam
 $ if (f$element(1,"\",rec) .eqs. "\") then goto mrdone
 $MRSLOOP:
 $ read/end=mrdone min rec
-$ gosub extra_filnam 
+$ gosub extra_filnam
 $ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop
 $MRDONE:
 $ close min
@@ -356,7 +356,7 @@ $ if (srcfil .nes. " ")
 $ then
 $   write mod f$parse(srcfil,,,"NAME"), ".obj"
 $   i = i + 1
-$   goto feloop  
+$   goto feloop
 $ endif
 $ return
 $!------------------------------------------------------------------------------
@@ -382,17 +382,17 @@ $ close h_in
 $ return
 $!------------------------------------------------------------------------------
 $!
-$! Analyze Object files for OpenVMS AXP to extract Procedure and Data 
+$! Analyze Object files for OpenVMS AXP to extract Procedure and Data
 $! information to build a symbol vector for a shareable image
 $! All the "brains" of this logic was suggested by Hartmut Becker
 $! (Hartmut.Becker@compaq.com). All the bugs were introduced by me
 $! (zinser@decus.de), so if you do have problem reports please do not
 $! bother Hartmut/HP, but get in touch with me
 $!
-$ ANAL_OBJ_AXP: Subroutine   
+$ ANAL_OBJ_AXP: Subroutine
 $ V = 'F$Verify(0)
 $ SAY := "WRITE_ SYS$OUTPUT"
-$ 
+$
 $ IF F$SEARCH("''P1'") .EQS. ""
 $ THEN
 $    SAY "ANAL_OBJ_AXP-E-NOSUCHFILE:  Error, inputfile ''p1' not available"
@@ -457,5 +457,5 @@ $ if f$search("x.tmp") .nes. "" -
 $!
 $ EXIT_AA:
 $ if V then set verify
-$ endsubroutine 
+$ endsubroutine
 $!------------------------------------------------------------------------------
diff --git a/old/Makefile.riscos b/old/Makefile.riscos
index d97f449..57e29d3 100644
--- a/old/Makefile.riscos
+++ b/old/Makefile.riscos
@@ -3,12 +3,12 @@
 # test works out-of-the-box, installs `somewhere' on demand
 
 # Toolflags:
-CCflags = -c -depend !Depend -IC: -g -throwback  -DRISCOS  -fah 
+CCflags = -c -depend !Depend -IC: -g -throwback  -DRISCOS  -fah
 C++flags = -c -depend !Depend -IC: -throwback
-Linkflags = -aif -c++ -o $@ 
+Linkflags = -aif -c++ -o $@
 ObjAsmflags = -throwback -NoCache -depend !Depend
-CMHGflags = 
-LibFileflags = -c -l -o $@ 
+CMHGflags =
+LibFileflags = -c -l -o $@
 Squeezeflags = -o $@
 
 # change the line below to where _you_ want the library installed.
@@ -17,10 +17,10 @@ libdest = lib:zlib
 # Final targets:
 @.lib:   @.o.adler32 @.o.compress @.o.crc32 @.o.deflate @.o.gzio \
         @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil @.o.trees \
-        @.o.uncompr @.o.zutil 
+        @.o.uncompr @.o.zutil
         LibFile $(LibFileflags) @.o.adler32 @.o.compress @.o.crc32 @.o.deflate \
         @.o.gzio @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil \
-        @.o.trees @.o.uncompr @.o.zutil 
+        @.o.trees @.o.uncompr @.o.zutil
 test:   @.minigzip @.example @.lib
         @copy @.lib @.libc  A~C~DF~L~N~P~Q~RS~TV
         @echo running tests: hang on.
@@ -41,9 +41,9 @@ test:   @.minigzip @.example @.lib
         @/@.example @.fred @.fred
         @echo that will have given lots of hello!'s.
 
-@.minigzip:   @.o.minigzip @.lib C:o.Stubs 
-        Link $(Linkflags) @.o.minigzip @.lib C:o.Stubs 
-@.example:   @.o.example @.lib C:o.Stubs 
+@.minigzip:   @.o.minigzip @.lib C:o.Stubs
+        Link $(Linkflags) @.o.minigzip @.lib C:o.Stubs
+@.example:   @.o.example @.lib C:o.Stubs
         Link $(Linkflags) @.o.example @.lib C:o.Stubs
 
 install: @.lib
diff --git a/qnx/package.qpg b/qnx/package.qpg
index f728ebe..8a4a47c 100644
--- a/qnx/package.qpg
+++ b/qnx/package.qpg
@@ -25,10 +25,10 @@
       <QPG:Files>
          <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
          <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
-         <QPG:Add file="../libz.so.1.2.2.4" install="/opt/lib/" user="root:bin" permission="644"/>
-         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.2.4"/>
-         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.2.4"/>
-         <QPG:Add file="../libz.so.1.2.2.4" install="/opt/lib/" component="slib"/>
+         <QPG:Add file="../libz.so.1.2.3" install="/opt/lib/" user="root:bin" permission="644"/>
+         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.3"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.3"/>
+         <QPG:Add file="../libz.so.1.2.3" install="/opt/lib/" component="slib"/>
       </QPG:Files>
 
       <QPG:PackageFilter>
@@ -63,7 +63,7 @@
             </QPM:ProductDescription>
 
             <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.2.2.4</QPM:ReleaseVersion>
+               <QPM:ReleaseVersion>1.2.3</QPM:ReleaseVersion>
                <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
                <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
                <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
@@ -105,7 +105,7 @@
                </QPM:Script>
             </QPM:ProductInstallationProcedure>
          </QPM:PackageManifest>
-         
+
          <QPM:Launch>
          </QPM:Launch>
       </QPG:PackageFilter>
@@ -119,7 +119,7 @@
                </QPM:OrderDependency>
             </QPM:ProductInstallationProcedure>
          </QPM:PackageManifest>
-         
+
          <QPM:Launch>
          </QPM:Launch>
       </QPG:PackageFilter>
@@ -133,7 +133,7 @@
                </QPM:OrderDependency>
             </QPM:ProductInstallationProcedure>
          </QPM:PackageManifest>
-         
+
          <QPM:Launch>
          </QPM:Launch>
       </QPG:PackageFilter>
diff --git a/win32/zlib1.rc b/win32/zlib1.rc
index 8cff589..99025c9 100644
--- a/win32/zlib1.rc
+++ b/win32/zlib1.rc
@@ -5,8 +5,8 @@ VS_VERSION_INFO		VERSIONINFO
 #else
 VS_VERSION_INFO         VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
 #endif
-  FILEVERSION           1,2,2,4
-  PRODUCTVERSION        1,2,2,4
+  FILEVERSION           1,2,2,0
+  PRODUCTVERSION        1,2,2,0
   FILEFLAGSMASK         VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS             1
@@ -23,12 +23,12 @@ BEGIN
     //language ID = U.S. English, char set = Windows, Multilingual
     BEGIN
       VALUE "FileDescription",  "zlib data compression library\0"
-      VALUE "FileVersion",      "1.2.2.4\0"
+      VALUE "FileVersion",      "1.2.3\0"
       VALUE "InternalName",     "zlib1.dll\0"
       VALUE "LegalCopyright",   "(C) 1995-2004 Jean-loup Gailly & Mark Adler\0"
       VALUE "OriginalFilename", "zlib1.dll\0"
       VALUE "ProductName",      "zlib\0"
-      VALUE "ProductVersion",   "1.2.2.4\0"
+      VALUE "ProductVersion",   "1.2.3\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
     END
   END
diff --git a/zlib.3 b/zlib.3
index b91375e..90b8162 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "11 July 2005"
+.TH ZLIB 3 "18 July 2005"
 .SH NAME
 zlib \- compression/decompression library
 .SH SYNOPSIS
@@ -133,7 +133,7 @@ before asking for help.
 Send questions and/or comments to zlib@gzip.org,
 or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
 .SH AUTHORS
-Version 1.2.2.4
+Version 1.2.3
 Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org)
 and Mark Adler (madler@alumni.caltech.edu).
 .LP
diff --git a/zlib.h b/zlib.h
index f7e47a2..0228179 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.2.4, July 11th, 2005
+  version 1.2.3, July 18th, 2005
 
   Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
 
@@ -37,8 +37,8 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.2.4"
-#define ZLIB_VERNUM 0x1224
+#define ZLIB_VERSION "1.2.3"
+#define ZLIB_VERNUM 0x1230
 
 /*
      The 'zlib' compression library provides in-memory compression and