zlib 1.2.2.2v1.2.2.2

8 files changed, 49 insertions, 45 deletions

diff --git a/contrib/README.contrib b/contrib/README.contrib
index 7778980..732d48c 100644
--- a/contrib/README.contrib
+++ b/contrib/README.contrib
@@ -22,9 +22,6 @@ delphi/     by Cosmin Truta <cosmint@cs.ubbcluj.ro>
 dotzlib/    by Henrik Ravn <henrik@ravn.com>
         Support for Microsoft .Net and Visual C++ .Net
 
-gzappend/   by Mark Adler <madler@alumni.caltech.edu>
-        append to a gzip file -- illustrates the use of Z_BLOCK
-
 infback9/   by Mark Adler <madler@alumni.caltech.edu>
         Unsupported diffs to infback to decode the deflate64 format
 
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index 8853866..b9d33e2 100644
--- a/contrib/delphi/ZLib.pas
+++ b/contrib/delphi/ZLib.pas
@@ -344,7 +344,7 @@ begin
     strm.avail_out := OutBytes;
     DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
     try
-      while DCheck(inflate(strm, Z_FINISH)) <> Z_STREAM_END do
+      while DCheck(inflate(strm, Z_NO_FLUSH)) <> Z_STREAM_END do
       begin
         P := OutBuf;
         Inc(OutBytes, BufInc);
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index 7325873..29bef6a 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.1 Copyright 1995-2004 Mark Adler ";
+   " inflate9 1.2.2.2 Copyright 1995-2004 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, 77, 207};
+        133, 133, 133, 133, 144, 72, 199};
     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
         65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/contrib/masmx86/gvmat32.asm b/contrib/masmx86/gvmat32.asm
index ec360e6..e841a7f 100644
--- a/contrib/masmx86/gvmat32.asm
+++ b/contrib/masmx86/gvmat32.asm
@@ -47,21 +47,25 @@
 
 
 
-;  all the +4 offsets are due to the addition of pending_buf_size (in zlib
+;  all the +addstr offsets are due to the addition of pending_buf_size in zlib 1.04
+;  and adding gzhead and gzindex in zlib 1.2.2.1
 ;  in the deflate_state structure since the asm code was first written
-;  (if you compile with zlib 1.0.4 or older, remove the +4).
+;  (if you compile with zlib 1.0.4 or older, set addstr to 0).
+;  (if you compiler with zlib between 1.04 and 1.2.1, set addstr to 4)
 ;  Note : these value are good with a 8 bytes boundary pack structure
-    dep_chain_length    equ     70h+4
-    dep_window          equ     2ch+4
-    dep_strstart        equ     60h+4
-    dep_prev_length     equ     6ch+4
-    dep_nice_match      equ     84h+4
-    dep_w_size          equ     20h+4
-    dep_prev            equ     34h+4
-    dep_w_mask          equ     28h+4
-    dep_good_match      equ     80h+4
-    dep_match_start     equ     64h+4
-    dep_lookahead       equ     68h+4
+
+    addstr              equ     4+8
+    dep_chain_length    equ     70h+addstr
+    dep_window          equ     2ch+addstr
+    dep_strstart        equ     60h+addstr
+    dep_prev_length     equ     6ch+addstr
+    dep_nice_match      equ     84h+addstr
+    dep_w_size          equ     20h+addstr
+    dep_prev            equ     34h+addstr
+    dep_w_mask          equ     28h+addstr
+    dep_good_match      equ     80h+addstr
+    dep_match_start     equ     64h+addstr
+    dep_lookahead       equ     68h+addstr
 
 
 _TEXT                   segment
@@ -597,19 +601,19 @@ curmatch	equ  esp + 60
 ;;; program to crash horribly, without so much as a warning at
 ;;; compile time. Sigh.)
 
-dsWSize         equ 36
-dsWMask         equ 44
-dsWindow        equ 48
-dsPrev          equ 56
-dsMatchLen      equ 88
-dsPrevMatch     equ 92
-dsStrStart      equ 100
-dsMatchStart    equ 104
-dsLookahead     equ 108
-dsPrevLen       equ 112
-dsMaxChainLen   equ 116
-dsGoodMatch     equ 132
-dsNiceMatch     equ 136
+dsWSize         equ 36+addstr-4
+dsWMask         equ 44+addstr-4
+dsWindow        equ 48+addstr-4
+dsPrev          equ 56+addstr-4
+dsMatchLen      equ 88+addstr-4
+dsPrevMatch     equ 92+addstr-4
+dsStrStart      equ 100+addstr-4
+dsMatchStart    equ 104+addstr-4
+dsLookahead     equ 108+addstr-4
+dsPrevLen       equ 112+addstr-4
+dsMaxChainLen   equ 116+addstr-4
+dsGoodMatch     equ 132+addstr-4
+dsNiceMatch     equ 136+addstr-4
 
 
 ;;; match.asm -- Pentium-Pro-optimized version of longest_match()
diff --git a/contrib/masmx86/inffas32.asm b/contrib/masmx86/inffas32.asm
index 7d76e1c..531bcef 100644
--- a/contrib/masmx86/inffas32.asm
+++ b/contrib/masmx86/inffas32.asm
@@ -84,17 +84,20 @@ dd	2147483647
 dd      4294967295
 
 
+; head was added in zlib 1.2.2.1, so we add addstr
+; set addstr to 0 with zlib 1.2.1 of below
+addstr           equ    4
 
 mode_state       equ    0       ;/* state->mode */
-wsize_state      equ    32      ;/* state->wsize */
-write_state      equ    (36+4)  ;/* state->write */
-window_state     equ    (40+4)  ;/* state->window */
-hold_state       equ    (44+4)  ;/* state->hold */
-bits_state       equ    (48+4)  ;/* state->bits */
-lencode_state    equ    (64+4)  ;/* state->lencode */
-distcode_state   equ    (68+4)  ;/* state->distcode */
-lenbits_state    equ    (72+4)  ;/* state->lenbits */
-distbits_state   equ    (76+4)  ;/* state->distbits */
+wsize_state      equ    32+addstr       ;/* state->wsize */
+write_state      equ    (36+4+addstr)   ;/* state->write */
+window_state     equ    (40+4+addstr)   ;/* state->window */
+hold_state       equ    (44+4+addstr)   ;/* state->hold */
+bits_state       equ    (48+4+addstr)   ;/* state->bits */
+lencode_state    equ    (64+4+addstr)   ;/* state->lencode */
+distcode_state   equ    (68+4+addstr)   ;/* state->distcode */
+lenbits_state    equ    (72+4+addstr)   ;/* state->lenbits */
+distbits_state   equ    (76+4+addstr)   ;/* state->distbits */
 
 
 ;;SECTION .text
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index 3a4b85c..e709d1b 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,4 +1,4 @@
-Building instructions for the DLL versions of Zlib 1.21

+Building instructions for the DLL versions of Zlib 1.2.x

 =======================================================

 

 This directory contains projects that build zlib and minizip using

diff --git a/contrib/vstudio/vc7/zlib.rc b/contrib/vstudio/vc7/zlib.rc
index cb779f7..d35cef0 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,1

-  PRODUCTVERSION 1,2,2,1

+  FILEVERSION    1,2,2,2

+  PRODUCTVERSION 1,2,2,2

   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.1\0"

+      VALUE "FileVersion",      "1.2.2.2\0"

       VALUE "InternalName",     "zlib\0"

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

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

diff --git a/contrib/gzappend/gzappend.c b/examples/gzappend.c
index e9e878e..e9e878e 100644
--- a/contrib/gzappend/gzappend.c
+++ b/examples/gzappend.c