diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2016-12-31 11:41:31 -0800 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2016-12-31 23:37:10 -0800 |
commit | 2fa463bacfff79181df1a5270fb67cc679a53e71 (patch) | |
tree | 6b1f6de2f9b9941e5e105be4558f04c3de4f775b /contrib | |
parent | 14e3194e1ebbfc2825e51caf8312e4e3b45c9c81 (diff) | |
download | zlib-2fa463bacfff79181df1a5270fb67cc679a53e71.tar.gz zlib-2fa463bacfff79181df1a5270fb67cc679a53e71.tar.bz2 zlib-2fa463bacfff79181df1a5270fb67cc679a53e71.zip |
zlib 1.2.9v1.2.9
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/delphi/ZLib.pas | 2 | ||||
-rw-r--r-- | contrib/dotzlib/DotZLib/UnitTests.cs | 2 | ||||
-rw-r--r-- | contrib/infback9/inftree9.c | 6 | ||||
-rw-r--r-- | contrib/minizip/configure.ac | 2 | ||||
-rw-r--r-- | contrib/pascal/zlibpas.pas | 4 | ||||
-rw-r--r-- | contrib/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlib.rc | 8 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlibvc.def | 12 | ||||
-rw-r--r-- | contrib/vstudio/vc11/zlib.rc | 8 | ||||
-rw-r--r-- | contrib/vstudio/vc11/zlibvc.def | 10 | ||||
-rw-r--r-- | contrib/vstudio/vc12/zlib.rc | 4 | ||||
-rw-r--r-- | contrib/vstudio/vc12/zlibvc.def | 296 | ||||
-rw-r--r-- | contrib/vstudio/vc14/zlib.rc | 4 | ||||
-rw-r--r-- | contrib/vstudio/vc14/zlibvc.def | 296 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlib.rc | 8 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlibvc.def | 10 |
16 files changed, 362 insertions, 312 deletions
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas index b2cbfad..7a3cb66 100644 --- a/contrib/delphi/ZLib.pas +++ b/contrib/delphi/ZLib.pas | |||
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; | |||
152 | const OutBuf: Pointer; BufSize: Integer); | 152 | const OutBuf: Pointer; BufSize: Integer); |
153 | 153 | ||
154 | const | 154 | const |
155 | zlib_version = '1.2.8.1'; | 155 | zlib_version = '1.2.9'; |
156 | 156 | ||
157 | type | 157 | type |
158 | EZlibError = class(Exception); | 158 | EZlibError = class(Exception); |
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs index 5ad86d9..3d156f4 100644 --- a/contrib/dotzlib/DotZLib/UnitTests.cs +++ b/contrib/dotzlib/DotZLib/UnitTests.cs | |||
@@ -156,7 +156,7 @@ namespace DotZLibTests | |||
156 | public void Info_Version() | 156 | public void Info_Version() |
157 | { | 157 | { |
158 | Info info = new Info(); | 158 | Info info = new Info(); |
159 | Assert.AreEqual("1.2.8.1", Info.Version); | 159 | Assert.AreEqual("1.2.9", Info.Version); |
160 | Assert.AreEqual(32, info.SizeOfUInt); | 160 | Assert.AreEqual(32, info.SizeOfUInt); |
161 | Assert.AreEqual(32, info.SizeOfULong); | 161 | Assert.AreEqual(32, info.SizeOfULong); |
162 | Assert.AreEqual(32, info.SizeOfPointer); | 162 | Assert.AreEqual(32, info.SizeOfPointer); |
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c index f31e995..2103aee 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* inftree9.c -- generate Huffman trees for efficient decoding | 1 | /* inftree9.c -- generate Huffman trees for efficient decoding |
2 | * Copyright (C) 1995-2013 Mark Adler | 2 | * Copyright (C) 1995-2016 Mark Adler |
3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
4 | */ | 4 | */ |
5 | 5 | ||
@@ -9,7 +9,7 @@ | |||
9 | #define MAXBITS 15 | 9 | #define MAXBITS 15 |
10 | 10 | ||
11 | const char inflate9_copyright[] = | 11 | const char inflate9_copyright[] = |
12 | " inflate9 1.2.8.1 Copyright 1995-2013 Mark Adler "; | 12 | " inflate9 1.2.9 Copyright 1995-2016 Mark Adler "; |
13 | /* | 13 | /* |
14 | If you use the zlib library in a product, an acknowledgment is welcome | 14 | If you use the zlib library in a product, an acknowledgment is welcome |
15 | in the documentation of your product. If for some reason you cannot | 15 | in the documentation of your product. If for some reason you cannot |
@@ -64,7 +64,7 @@ unsigned short FAR *work; | |||
64 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ | 64 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ |
65 | 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, | 65 | 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, |
66 | 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, | 66 | 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, |
67 | 133, 133, 133, 133, 144, 203, 198}; | 67 | 133, 133, 133, 133, 144, 192, 79}; |
68 | static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ | 68 | static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ |
69 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, | 69 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, |
70 | 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, | 70 | 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, |
diff --git a/contrib/minizip/configure.ac b/contrib/minizip/configure.ac index 06b9566..54d823f 100644 --- a/contrib/minizip/configure.ac +++ b/contrib/minizip/configure.ac | |||
@@ -1,7 +1,7 @@ | |||
1 | # -*- Autoconf -*- | 1 | # -*- Autoconf -*- |
2 | # Process this file with autoconf to produce a configure script. | 2 | # Process this file with autoconf to produce a configure script. |
3 | 3 | ||
4 | AC_INIT([minizip], [1.2.8.1], [bugzilla.redhat.com]) | 4 | AC_INIT([minizip], [1.2.9], [bugzilla.redhat.com]) |
5 | AC_CONFIG_SRCDIR([minizip.c]) | 5 | AC_CONFIG_SRCDIR([minizip.c]) |
6 | AM_INIT_AUTOMAKE([foreign]) | 6 | AM_INIT_AUTOMAKE([foreign]) |
7 | LT_INIT | 7 | LT_INIT |
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas index 0d1d5ff..aebaea0 100644 --- a/contrib/pascal/zlibpas.pas +++ b/contrib/pascal/zlibpas.pas | |||
@@ -10,8 +10,8 @@ unit zlibpas; | |||
10 | interface | 10 | interface |
11 | 11 | ||
12 | const | 12 | const |
13 | ZLIB_VERSION = '1.2.8.1'; | 13 | ZLIB_VERSION = '1.2.9'; |
14 | ZLIB_VERNUM = $1281; | 14 | ZLIB_VERNUM = $1290; |
15 | 15 | ||
16 | type | 16 | type |
17 | alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; | 17 | alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; |
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt index 1646742..3954bc4 100644 --- a/contrib/vstudio/readme.txt +++ b/contrib/vstudio/readme.txt | |||
@@ -1,4 +1,4 @@ | |||
1 | Building instructions for the DLL versions of Zlib 1.2.8.1 | 1 | Building instructions for the DLL versions of Zlib 1.2.9 |
2 | ======================================================== | 2 | ======================================================== |
3 | 3 | ||
4 | This directory contains projects that build zlib and minizip using | 4 | This directory contains projects that build zlib and minizip using |
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc index 3e9f7a8..d846820 100644 --- a/contrib/vstudio/vc10/zlib.rc +++ b/contrib/vstudio/vc10/zlib.rc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1, 2, 8, 1 | 5 | FILEVERSION 1, 2, 9, 0 |
6 | PRODUCTVERSION 1, 2, 8, 1 | 6 | PRODUCTVERSION 1, 2, 9, 0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
@@ -17,12 +17,12 @@ BEGIN | |||
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" | 19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" |
20 | VALUE "FileVersion", "1.2.8.1\0" | 20 | VALUE "FileVersion", "1.2.9\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" | 24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" |
25 | VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" | 25 | VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0" |
26 | END | 26 | END |
27 | END | 27 | END |
28 | BLOCK "VarFileInfo" | 28 | BLOCK "VarFileInfo" |
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def index d2da2a1..54e683d 100644 --- a/contrib/vstudio/vc10/zlibvc.def +++ b/contrib/vstudio/vc10/zlibvc.def | |||
@@ -2,7 +2,7 @@ LIBRARY | |||
2 | ; zlib data compression and ZIP file I/O library | 2 | ; zlib data compression and ZIP file I/O library |
3 | 3 | ||
4 | VERSION 1.2 | 4 | VERSION 1.2 |
5 | 5 | ||
6 | EXPORTS | 6 | EXPORTS |
7 | adler32 @1 | 7 | adler32 @1 |
8 | compress @2 | 8 | compress @2 |
@@ -141,3 +141,13 @@ EXPORTS | |||
141 | ; zlib1 v1.2.8 added: | 141 | ; zlib1 v1.2.8 added: |
142 | inflateGetDictionary @166 | 142 | inflateGetDictionary @166 |
143 | gzvprintf @167 | 143 | gzvprintf @167 |
144 | |||
145 | ; zlib1 v1.2.9 added: | ||
146 | inflateCodesUsed @168 | ||
147 | inflateValidate @169 | ||
148 | uncompress2 @170 | ||
149 | gzfread @171 | ||
150 | gzfwrite @172 | ||
151 | deflateGetDictionary @173 | ||
152 | adler32_z @174 | ||
153 | crc32_z @175 | ||
diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc index 3e9f7a8..d846820 100644 --- a/contrib/vstudio/vc11/zlib.rc +++ b/contrib/vstudio/vc11/zlib.rc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1, 2, 8, 1 | 5 | FILEVERSION 1, 2, 9, 0 |
6 | PRODUCTVERSION 1, 2, 8, 1 | 6 | PRODUCTVERSION 1, 2, 9, 0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
@@ -17,12 +17,12 @@ BEGIN | |||
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" | 19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" |
20 | VALUE "FileVersion", "1.2.8.1\0" | 20 | VALUE "FileVersion", "1.2.9\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" | 24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" |
25 | VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" | 25 | VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0" |
26 | END | 26 | END |
27 | END | 27 | END |
28 | BLOCK "VarFileInfo" | 28 | BLOCK "VarFileInfo" |
diff --git a/contrib/vstudio/vc11/zlibvc.def b/contrib/vstudio/vc11/zlibvc.def index 66cf3fb..54e683d 100644 --- a/contrib/vstudio/vc11/zlibvc.def +++ b/contrib/vstudio/vc11/zlibvc.def | |||
@@ -141,3 +141,13 @@ EXPORTS | |||
141 | ; zlib1 v1.2.8 added: | 141 | ; zlib1 v1.2.8 added: |
142 | inflateGetDictionary @166 | 142 | inflateGetDictionary @166 |
143 | gzvprintf @167 | 143 | gzvprintf @167 |
144 | |||
145 | ; zlib1 v1.2.9 added: | ||
146 | inflateCodesUsed @168 | ||
147 | inflateValidate @169 | ||
148 | uncompress2 @170 | ||
149 | gzfread @171 | ||
150 | gzfwrite @172 | ||
151 | deflateGetDictionary @173 | ||
152 | adler32_z @174 | ||
153 | crc32_z @175 | ||
diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc index 46a7ee1..4f6396d 100644 --- a/contrib/vstudio/vc12/zlib.rc +++ b/contrib/vstudio/vc12/zlib.rc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1, 2, 8, 1 | 5 | FILEVERSION 1, 2, 9, 0 |
6 | PRODUCTVERSION 1, 2, 8, 1 | 6 | PRODUCTVERSION 1, 2, 9, 0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def index 83106b9..54e683d 100644 --- a/contrib/vstudio/vc12/zlibvc.def +++ b/contrib/vstudio/vc12/zlibvc.def | |||
@@ -1,143 +1,153 @@ | |||
1 | LIBRARY | 1 | LIBRARY |
2 | ; zlib data compression and ZIP file I/O library | 2 | ; zlib data compression and ZIP file I/O library |
3 | 3 | ||
4 | VERSION 1.2 | 4 | VERSION 1.2 |
5 | 5 | ||
6 | EXPORTS | 6 | EXPORTS |
7 | adler32 @1 | 7 | adler32 @1 |
8 | compress @2 | 8 | compress @2 |
9 | crc32 @3 | 9 | crc32 @3 |
10 | deflate @4 | 10 | deflate @4 |
11 | deflateCopy @5 | 11 | deflateCopy @5 |
12 | deflateEnd @6 | 12 | deflateEnd @6 |
13 | deflateInit2_ @7 | 13 | deflateInit2_ @7 |
14 | deflateInit_ @8 | 14 | deflateInit_ @8 |
15 | deflateParams @9 | 15 | deflateParams @9 |
16 | deflateReset @10 | 16 | deflateReset @10 |
17 | deflateSetDictionary @11 | 17 | deflateSetDictionary @11 |
18 | gzclose @12 | 18 | gzclose @12 |
19 | gzdopen @13 | 19 | gzdopen @13 |
20 | gzerror @14 | 20 | gzerror @14 |
21 | gzflush @15 | 21 | gzflush @15 |
22 | gzopen @16 | 22 | gzopen @16 |
23 | gzread @17 | 23 | gzread @17 |
24 | gzwrite @18 | 24 | gzwrite @18 |
25 | inflate @19 | 25 | inflate @19 |
26 | inflateEnd @20 | 26 | inflateEnd @20 |
27 | inflateInit2_ @21 | 27 | inflateInit2_ @21 |
28 | inflateInit_ @22 | 28 | inflateInit_ @22 |
29 | inflateReset @23 | 29 | inflateReset @23 |
30 | inflateSetDictionary @24 | 30 | inflateSetDictionary @24 |
31 | inflateSync @25 | 31 | inflateSync @25 |
32 | uncompress @26 | 32 | uncompress @26 |
33 | zlibVersion @27 | 33 | zlibVersion @27 |
34 | gzprintf @28 | 34 | gzprintf @28 |
35 | gzputc @29 | 35 | gzputc @29 |
36 | gzgetc @30 | 36 | gzgetc @30 |
37 | gzseek @31 | 37 | gzseek @31 |
38 | gzrewind @32 | 38 | gzrewind @32 |
39 | gztell @33 | 39 | gztell @33 |
40 | gzeof @34 | 40 | gzeof @34 |
41 | gzsetparams @35 | 41 | gzsetparams @35 |
42 | zError @36 | 42 | zError @36 |
43 | inflateSyncPoint @37 | 43 | inflateSyncPoint @37 |
44 | get_crc_table @38 | 44 | get_crc_table @38 |
45 | compress2 @39 | 45 | compress2 @39 |
46 | gzputs @40 | 46 | gzputs @40 |
47 | gzgets @41 | 47 | gzgets @41 |
48 | inflateCopy @42 | 48 | inflateCopy @42 |
49 | inflateBackInit_ @43 | 49 | inflateBackInit_ @43 |
50 | inflateBack @44 | 50 | inflateBack @44 |
51 | inflateBackEnd @45 | 51 | inflateBackEnd @45 |
52 | compressBound @46 | 52 | compressBound @46 |
53 | deflateBound @47 | 53 | deflateBound @47 |
54 | gzclearerr @48 | 54 | gzclearerr @48 |
55 | gzungetc @49 | 55 | gzungetc @49 |
56 | zlibCompileFlags @50 | 56 | zlibCompileFlags @50 |
57 | deflatePrime @51 | 57 | deflatePrime @51 |
58 | deflatePending @52 | 58 | deflatePending @52 |
59 | 59 | ||
60 | unzOpen @61 | 60 | unzOpen @61 |
61 | unzClose @62 | 61 | unzClose @62 |
62 | unzGetGlobalInfo @63 | 62 | unzGetGlobalInfo @63 |
63 | unzGetCurrentFileInfo @64 | 63 | unzGetCurrentFileInfo @64 |
64 | unzGoToFirstFile @65 | 64 | unzGoToFirstFile @65 |
65 | unzGoToNextFile @66 | 65 | unzGoToNextFile @66 |
66 | unzOpenCurrentFile @67 | 66 | unzOpenCurrentFile @67 |
67 | unzReadCurrentFile @68 | 67 | unzReadCurrentFile @68 |
68 | unzOpenCurrentFile3 @69 | 68 | unzOpenCurrentFile3 @69 |
69 | unztell @70 | 69 | unztell @70 |
70 | unzeof @71 | 70 | unzeof @71 |
71 | unzCloseCurrentFile @72 | 71 | unzCloseCurrentFile @72 |
72 | unzGetGlobalComment @73 | 72 | unzGetGlobalComment @73 |
73 | unzStringFileNameCompare @74 | 73 | unzStringFileNameCompare @74 |
74 | unzLocateFile @75 | 74 | unzLocateFile @75 |
75 | unzGetLocalExtrafield @76 | 75 | unzGetLocalExtrafield @76 |
76 | unzOpen2 @77 | 76 | unzOpen2 @77 |
77 | unzOpenCurrentFile2 @78 | 77 | unzOpenCurrentFile2 @78 |
78 | unzOpenCurrentFilePassword @79 | 78 | unzOpenCurrentFilePassword @79 |
79 | 79 | ||
80 | zipOpen @80 | 80 | zipOpen @80 |
81 | zipOpenNewFileInZip @81 | 81 | zipOpenNewFileInZip @81 |
82 | zipWriteInFileInZip @82 | 82 | zipWriteInFileInZip @82 |
83 | zipCloseFileInZip @83 | 83 | zipCloseFileInZip @83 |
84 | zipClose @84 | 84 | zipClose @84 |
85 | zipOpenNewFileInZip2 @86 | 85 | zipOpenNewFileInZip2 @86 |
86 | zipCloseFileInZipRaw @87 | 86 | zipCloseFileInZipRaw @87 |
87 | zipOpen2 @88 | 87 | zipOpen2 @88 |
88 | zipOpenNewFileInZip3 @89 | 88 | zipOpenNewFileInZip3 @89 |
89 | 89 | ||
90 | unzGetFilePos @100 | 90 | unzGetFilePos @100 |
91 | unzGoToFilePos @101 | 91 | unzGoToFilePos @101 |
92 | 92 | ||
93 | fill_win32_filefunc @110 | 93 | fill_win32_filefunc @110 |
94 | 94 | ||
95 | ; zlibwapi v1.2.4 added: | 95 | ; zlibwapi v1.2.4 added: |
96 | fill_win32_filefunc64 @111 | 96 | fill_win32_filefunc64 @111 |
97 | fill_win32_filefunc64A @112 | 97 | fill_win32_filefunc64A @112 |
98 | fill_win32_filefunc64W @113 | 98 | fill_win32_filefunc64W @113 |
99 | 99 | ||
100 | unzOpen64 @120 | 100 | unzOpen64 @120 |
101 | unzOpen2_64 @121 | 101 | unzOpen2_64 @121 |
102 | unzGetGlobalInfo64 @122 | 102 | unzGetGlobalInfo64 @122 |
103 | unzGetCurrentFileInfo64 @124 | 103 | unzGetCurrentFileInfo64 @124 |
104 | unzGetCurrentFileZStreamPos64 @125 | 104 | unzGetCurrentFileZStreamPos64 @125 |
105 | unztell64 @126 | 105 | unztell64 @126 |
106 | unzGetFilePos64 @127 | 106 | unzGetFilePos64 @127 |
107 | unzGoToFilePos64 @128 | 107 | unzGoToFilePos64 @128 |
108 | 108 | ||
109 | zipOpen64 @130 | 109 | zipOpen64 @130 |
110 | zipOpen2_64 @131 | 110 | zipOpen2_64 @131 |
111 | zipOpenNewFileInZip64 @132 | 111 | zipOpenNewFileInZip64 @132 |
112 | zipOpenNewFileInZip2_64 @133 | 112 | zipOpenNewFileInZip2_64 @133 |
113 | zipOpenNewFileInZip3_64 @134 | 113 | zipOpenNewFileInZip3_64 @134 |
114 | zipOpenNewFileInZip4_64 @135 | 114 | zipOpenNewFileInZip4_64 @135 |
115 | zipCloseFileInZipRaw64 @136 | 115 | zipCloseFileInZipRaw64 @136 |
116 | 116 | ||
117 | ; zlib1 v1.2.4 added: | 117 | ; zlib1 v1.2.4 added: |
118 | adler32_combine @140 | 118 | adler32_combine @140 |
119 | crc32_combine @142 | 119 | crc32_combine @142 |
120 | deflateSetHeader @144 | 120 | deflateSetHeader @144 |
121 | deflateTune @145 | 121 | deflateTune @145 |
122 | gzbuffer @146 | 122 | gzbuffer @146 |
123 | gzclose_r @147 | 123 | gzclose_r @147 |
124 | gzclose_w @148 | 124 | gzclose_w @148 |
125 | gzdirect @149 | 125 | gzdirect @149 |
126 | gzoffset @150 | 126 | gzoffset @150 |
127 | inflateGetHeader @156 | 127 | inflateGetHeader @156 |
128 | inflateMark @157 | 128 | inflateMark @157 |
129 | inflatePrime @158 | 129 | inflatePrime @158 |
130 | inflateReset2 @159 | 130 | inflateReset2 @159 |
131 | inflateUndermine @160 | 131 | inflateUndermine @160 |
132 | 132 | ||
133 | ; zlib1 v1.2.6 added: | 133 | ; zlib1 v1.2.6 added: |
134 | gzgetc_ @161 | 134 | gzgetc_ @161 |
135 | inflateResetKeep @163 | 135 | inflateResetKeep @163 |
136 | deflateResetKeep @164 | 136 | deflateResetKeep @164 |
137 | 137 | ||
138 | ; zlib1 v1.2.7 added: | 138 | ; zlib1 v1.2.7 added: |
139 | gzopen_w @165 | 139 | gzopen_w @165 |
140 | 140 | ||
141 | ; zlib1 v1.2.8 added: | 141 | ; zlib1 v1.2.8 added: |
142 | inflateGetDictionary @166 | 142 | inflateGetDictionary @166 |
143 | gzvprintf @167 | 143 | gzvprintf @167 |
144 | |||
145 | ; zlib1 v1.2.9 added: | ||
146 | inflateCodesUsed @168 | ||
147 | inflateValidate @169 | ||
148 | uncompress2 @170 | ||
149 | gzfread @171 | ||
150 | gzfwrite @172 | ||
151 | deflateGetDictionary @173 | ||
152 | adler32_z @174 | ||
153 | crc32_z @175 | ||
diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc index 46a7ee1..4f6396d 100644 --- a/contrib/vstudio/vc14/zlib.rc +++ b/contrib/vstudio/vc14/zlib.rc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1, 2, 8, 1 | 5 | FILEVERSION 1, 2, 9, 0 |
6 | PRODUCTVERSION 1, 2, 8, 1 | 6 | PRODUCTVERSION 1, 2, 9, 0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
diff --git a/contrib/vstudio/vc14/zlibvc.def b/contrib/vstudio/vc14/zlibvc.def index 83106b9..54e683d 100644 --- a/contrib/vstudio/vc14/zlibvc.def +++ b/contrib/vstudio/vc14/zlibvc.def | |||
@@ -1,143 +1,153 @@ | |||
1 | LIBRARY | 1 | LIBRARY |
2 | ; zlib data compression and ZIP file I/O library | 2 | ; zlib data compression and ZIP file I/O library |
3 | 3 | ||
4 | VERSION 1.2 | 4 | VERSION 1.2 |
5 | 5 | ||
6 | EXPORTS | 6 | EXPORTS |
7 | adler32 @1 | 7 | adler32 @1 |
8 | compress @2 | 8 | compress @2 |
9 | crc32 @3 | 9 | crc32 @3 |
10 | deflate @4 | 10 | deflate @4 |
11 | deflateCopy @5 | 11 | deflateCopy @5 |
12 | deflateEnd @6 | 12 | deflateEnd @6 |
13 | deflateInit2_ @7 | 13 | deflateInit2_ @7 |
14 | deflateInit_ @8 | 14 | deflateInit_ @8 |
15 | deflateParams @9 | 15 | deflateParams @9 |
16 | deflateReset @10 | 16 | deflateReset @10 |
17 | deflateSetDictionary @11 | 17 | deflateSetDictionary @11 |
18 | gzclose @12 | 18 | gzclose @12 |
19 | gzdopen @13 | 19 | gzdopen @13 |
20 | gzerror @14 | 20 | gzerror @14 |
21 | gzflush @15 | 21 | gzflush @15 |
22 | gzopen @16 | 22 | gzopen @16 |
23 | gzread @17 | 23 | gzread @17 |
24 | gzwrite @18 | 24 | gzwrite @18 |
25 | inflate @19 | 25 | inflate @19 |
26 | inflateEnd @20 | 26 | inflateEnd @20 |
27 | inflateInit2_ @21 | 27 | inflateInit2_ @21 |
28 | inflateInit_ @22 | 28 | inflateInit_ @22 |
29 | inflateReset @23 | 29 | inflateReset @23 |
30 | inflateSetDictionary @24 | 30 | inflateSetDictionary @24 |
31 | inflateSync @25 | 31 | inflateSync @25 |
32 | uncompress @26 | 32 | uncompress @26 |
33 | zlibVersion @27 | 33 | zlibVersion @27 |
34 | gzprintf @28 | 34 | gzprintf @28 |
35 | gzputc @29 | 35 | gzputc @29 |
36 | gzgetc @30 | 36 | gzgetc @30 |
37 | gzseek @31 | 37 | gzseek @31 |
38 | gzrewind @32 | 38 | gzrewind @32 |
39 | gztell @33 | 39 | gztell @33 |
40 | gzeof @34 | 40 | gzeof @34 |
41 | gzsetparams @35 | 41 | gzsetparams @35 |
42 | zError @36 | 42 | zError @36 |
43 | inflateSyncPoint @37 | 43 | inflateSyncPoint @37 |
44 | get_crc_table @38 | 44 | get_crc_table @38 |
45 | compress2 @39 | 45 | compress2 @39 |
46 | gzputs @40 | 46 | gzputs @40 |
47 | gzgets @41 | 47 | gzgets @41 |
48 | inflateCopy @42 | 48 | inflateCopy @42 |
49 | inflateBackInit_ @43 | 49 | inflateBackInit_ @43 |
50 | inflateBack @44 | 50 | inflateBack @44 |
51 | inflateBackEnd @45 | 51 | inflateBackEnd @45 |
52 | compressBound @46 | 52 | compressBound @46 |
53 | deflateBound @47 | 53 | deflateBound @47 |
54 | gzclearerr @48 | 54 | gzclearerr @48 |
55 | gzungetc @49 | 55 | gzungetc @49 |
56 | zlibCompileFlags @50 | 56 | zlibCompileFlags @50 |
57 | deflatePrime @51 | 57 | deflatePrime @51 |
58 | deflatePending @52 | 58 | deflatePending @52 |
59 | 59 | ||
60 | unzOpen @61 | 60 | unzOpen @61 |
61 | unzClose @62 | 61 | unzClose @62 |
62 | unzGetGlobalInfo @63 | 62 | unzGetGlobalInfo @63 |
63 | unzGetCurrentFileInfo @64 | 63 | unzGetCurrentFileInfo @64 |
64 | unzGoToFirstFile @65 | 64 | unzGoToFirstFile @65 |
65 | unzGoToNextFile @66 | 65 | unzGoToNextFile @66 |
66 | unzOpenCurrentFile @67 | 66 | unzOpenCurrentFile @67 |
67 | unzReadCurrentFile @68 | 67 | unzReadCurrentFile @68 |
68 | unzOpenCurrentFile3 @69 | 68 | unzOpenCurrentFile3 @69 |
69 | unztell @70 | 69 | unztell @70 |
70 | unzeof @71 | 70 | unzeof @71 |
71 | unzCloseCurrentFile @72 | 71 | unzCloseCurrentFile @72 |
72 | unzGetGlobalComment @73 | 72 | unzGetGlobalComment @73 |
73 | unzStringFileNameCompare @74 | 73 | unzStringFileNameCompare @74 |
74 | unzLocateFile @75 | 74 | unzLocateFile @75 |
75 | unzGetLocalExtrafield @76 | 75 | unzGetLocalExtrafield @76 |
76 | unzOpen2 @77 | 76 | unzOpen2 @77 |
77 | unzOpenCurrentFile2 @78 | 77 | unzOpenCurrentFile2 @78 |
78 | unzOpenCurrentFilePassword @79 | 78 | unzOpenCurrentFilePassword @79 |
79 | 79 | ||
80 | zipOpen @80 | 80 | zipOpen @80 |
81 | zipOpenNewFileInZip @81 | 81 | zipOpenNewFileInZip @81 |
82 | zipWriteInFileInZip @82 | 82 | zipWriteInFileInZip @82 |
83 | zipCloseFileInZip @83 | 83 | zipCloseFileInZip @83 |
84 | zipClose @84 | 84 | zipClose @84 |
85 | zipOpenNewFileInZip2 @86 | 85 | zipOpenNewFileInZip2 @86 |
86 | zipCloseFileInZipRaw @87 | 86 | zipCloseFileInZipRaw @87 |
87 | zipOpen2 @88 | 87 | zipOpen2 @88 |
88 | zipOpenNewFileInZip3 @89 | 88 | zipOpenNewFileInZip3 @89 |
89 | 89 | ||
90 | unzGetFilePos @100 | 90 | unzGetFilePos @100 |
91 | unzGoToFilePos @101 | 91 | unzGoToFilePos @101 |
92 | 92 | ||
93 | fill_win32_filefunc @110 | 93 | fill_win32_filefunc @110 |
94 | 94 | ||
95 | ; zlibwapi v1.2.4 added: | 95 | ; zlibwapi v1.2.4 added: |
96 | fill_win32_filefunc64 @111 | 96 | fill_win32_filefunc64 @111 |
97 | fill_win32_filefunc64A @112 | 97 | fill_win32_filefunc64A @112 |
98 | fill_win32_filefunc64W @113 | 98 | fill_win32_filefunc64W @113 |
99 | 99 | ||
100 | unzOpen64 @120 | 100 | unzOpen64 @120 |
101 | unzOpen2_64 @121 | 101 | unzOpen2_64 @121 |
102 | unzGetGlobalInfo64 @122 | 102 | unzGetGlobalInfo64 @122 |
103 | unzGetCurrentFileInfo64 @124 | 103 | unzGetCurrentFileInfo64 @124 |
104 | unzGetCurrentFileZStreamPos64 @125 | 104 | unzGetCurrentFileZStreamPos64 @125 |
105 | unztell64 @126 | 105 | unztell64 @126 |
106 | unzGetFilePos64 @127 | 106 | unzGetFilePos64 @127 |
107 | unzGoToFilePos64 @128 | 107 | unzGoToFilePos64 @128 |
108 | 108 | ||
109 | zipOpen64 @130 | 109 | zipOpen64 @130 |
110 | zipOpen2_64 @131 | 110 | zipOpen2_64 @131 |
111 | zipOpenNewFileInZip64 @132 | 111 | zipOpenNewFileInZip64 @132 |
112 | zipOpenNewFileInZip2_64 @133 | 112 | zipOpenNewFileInZip2_64 @133 |
113 | zipOpenNewFileInZip3_64 @134 | 113 | zipOpenNewFileInZip3_64 @134 |
114 | zipOpenNewFileInZip4_64 @135 | 114 | zipOpenNewFileInZip4_64 @135 |
115 | zipCloseFileInZipRaw64 @136 | 115 | zipCloseFileInZipRaw64 @136 |
116 | 116 | ||
117 | ; zlib1 v1.2.4 added: | 117 | ; zlib1 v1.2.4 added: |
118 | adler32_combine @140 | 118 | adler32_combine @140 |
119 | crc32_combine @142 | 119 | crc32_combine @142 |
120 | deflateSetHeader @144 | 120 | deflateSetHeader @144 |
121 | deflateTune @145 | 121 | deflateTune @145 |
122 | gzbuffer @146 | 122 | gzbuffer @146 |
123 | gzclose_r @147 | 123 | gzclose_r @147 |
124 | gzclose_w @148 | 124 | gzclose_w @148 |
125 | gzdirect @149 | 125 | gzdirect @149 |
126 | gzoffset @150 | 126 | gzoffset @150 |
127 | inflateGetHeader @156 | 127 | inflateGetHeader @156 |
128 | inflateMark @157 | 128 | inflateMark @157 |
129 | inflatePrime @158 | 129 | inflatePrime @158 |
130 | inflateReset2 @159 | 130 | inflateReset2 @159 |
131 | inflateUndermine @160 | 131 | inflateUndermine @160 |
132 | 132 | ||
133 | ; zlib1 v1.2.6 added: | 133 | ; zlib1 v1.2.6 added: |
134 | gzgetc_ @161 | 134 | gzgetc_ @161 |
135 | inflateResetKeep @163 | 135 | inflateResetKeep @163 |
136 | deflateResetKeep @164 | 136 | deflateResetKeep @164 |
137 | 137 | ||
138 | ; zlib1 v1.2.7 added: | 138 | ; zlib1 v1.2.7 added: |
139 | gzopen_w @165 | 139 | gzopen_w @165 |
140 | 140 | ||
141 | ; zlib1 v1.2.8 added: | 141 | ; zlib1 v1.2.8 added: |
142 | inflateGetDictionary @166 | 142 | inflateGetDictionary @166 |
143 | gzvprintf @167 | 143 | gzvprintf @167 |
144 | |||
145 | ; zlib1 v1.2.9 added: | ||
146 | inflateCodesUsed @168 | ||
147 | inflateValidate @169 | ||
148 | uncompress2 @170 | ||
149 | gzfread @171 | ||
150 | gzfwrite @172 | ||
151 | deflateGetDictionary @173 | ||
152 | adler32_z @174 | ||
153 | crc32_z @175 | ||
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc index 3e9f7a8..d846820 100644 --- a/contrib/vstudio/vc9/zlib.rc +++ b/contrib/vstudio/vc9/zlib.rc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1, 2, 8, 1 | 5 | FILEVERSION 1, 2, 9, 0 |
6 | PRODUCTVERSION 1, 2, 8, 1 | 6 | PRODUCTVERSION 1, 2, 9, 0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
@@ -17,12 +17,12 @@ BEGIN | |||
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" | 19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" |
20 | VALUE "FileVersion", "1.2.8.1\0" | 20 | VALUE "FileVersion", "1.2.9\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" | 24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" |
25 | VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" | 25 | VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0" |
26 | END | 26 | END |
27 | END | 27 | END |
28 | BLOCK "VarFileInfo" | 28 | BLOCK "VarFileInfo" |
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def index 66cf3fb..54e683d 100644 --- a/contrib/vstudio/vc9/zlibvc.def +++ b/contrib/vstudio/vc9/zlibvc.def | |||
@@ -141,3 +141,13 @@ EXPORTS | |||
141 | ; zlib1 v1.2.8 added: | 141 | ; zlib1 v1.2.8 added: |
142 | inflateGetDictionary @166 | 142 | inflateGetDictionary @166 |
143 | gzvprintf @167 | 143 | gzvprintf @167 |
144 | |||
145 | ; zlib1 v1.2.9 added: | ||
146 | inflateCodesUsed @168 | ||
147 | inflateValidate @169 | ||
148 | uncompress2 @170 | ||
149 | gzfread @171 | ||
150 | gzfwrite @172 | ||
151 | deflateGetDictionary @173 | ||
152 | adler32_z @174 | ||
153 | crc32_z @175 | ||