Changeset 95239 in vbox for trunk/src/libs/zlib-1.2.12/contrib

Timestamp:

Jun 9, 2022 9:09:44 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151769

Message:

libs/zlib: Upgrade to 1.2.12, bugref:8515

Location:

trunk/src/libs/zlib-1.2.12

Files:

• . (modified) (1 prop)
• contrib/README.contrib (modified) (3 diffs)
• contrib/amd64 (deleted)
• contrib/asm686 (deleted)
• contrib/blast/blast.h (modified) (1 diff)
• contrib/delphi/ZLib.pas (modified) (1 diff)
• contrib/dotzlib/DotZLib.chm (deleted)
• contrib/dotzlib/DotZLib/UnitTests.cs (modified) (1 diff)
• contrib/infback9/inftree9.c (modified) (3 diffs)
• contrib/inflate86 (deleted)
• contrib/masmx64 (deleted)
• contrib/masmx86 (deleted)
• contrib/minizip/Makefile (modified) (2 diffs)
• contrib/minizip/configure.ac (modified) (1 diff)
• contrib/minizip/crypt.h (modified) (3 diffs)
• contrib/minizip/ioapi.c (modified) (13 diffs)
• contrib/minizip/ioapi.h (modified) (2 diffs)
• contrib/minizip/miniunz.c (modified) (16 diffs)
• contrib/minizip/minizip.c (modified) (16 diffs)
• contrib/minizip/unzip.c (modified) (10 diffs)
• contrib/minizip/unzip.h (modified) (1 diff)
• contrib/minizip/zip.c (modified) (14 diffs)
• contrib/minizip/zip.h (modified) (2 diffs)
• contrib/pascal/zlibpas.pas (modified) (1 diff)
• contrib/vstudio/readme.txt (modified) (1 diff)
• contrib/vstudio/vc10/zlib.rc (modified) (2 diffs)
• contrib/vstudio/vc10/zlibvc.def (modified) (1 diff)
• contrib/vstudio/vc11/zlib.rc (modified) (2 diffs)
• contrib/vstudio/vc11/zlibvc.def (modified) (1 diff)
• contrib/vstudio/vc12/zlib.rc (modified) (2 diffs)
• contrib/vstudio/vc12/zlibvc.def (modified) (1 diff)
• contrib/vstudio/vc14/zlib.rc (modified) (2 diffs)
• contrib/vstudio/vc14/zlibvc.def (modified) (1 diff)
• contrib/vstudio/vc9/zlib.rc (modified) (2 diffs)
• contrib/vstudio/vc9/zlibvc.def (modified) (1 diff)

trunk/src/libs/zlib-1.2.12

@@ -20 +20 @@
 /branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
 /trunk/src/src/libs/zlib-1.2.11:92342
+/vendor/zlib/1.2.12:151751
+/vendor/zlib/current:150724-151750

@@ -20 +20 @@
 /branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
 /trunk/src/src/libs/zlib-1.2.11:92342
+/vendor/zlib/1.2.12:151751
+/vendor/zlib/current:150724-151750

trunk/src/libs/zlib-1.2.12/contrib/README.contrib

@@ -8 +8 @@
         Support for Ada
         See http://zlib-ada.sourceforge.net/
-
-amd64/      by Mikhail Teterin <[email protected]>
-        asm code for AMD64
-        See patch at http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/96393
-
-asm686/     by Brian Raiter <[email protected]>
-        asm code for Pentium and PPro/PII, using the AT&T (GNU as) syntax
-        See http://www.muppetlabs.com/~breadbox/software/assembly.html
 
 blast/      by Mark Adler <[email protected]>
@@ -33 +25 @@
         Unsupported diffs to infback to decode the deflate64 format
 
-inflate86/  by Chris Anderson <[email protected]>
-        Tuned x86 gcc asm code to replace inflate_fast()
-
 iostream/   by Kevin Ruland <[email protected]>
         A C++ I/O streams interface to the zlib gz* functions
@@ -45 +34 @@
             and Kevin Ruland <[email protected]>
         Yet another C++ I/O streams interface
-
-masmx64/    by Gilles Vollant <[email protected]>
-        x86 64-bit (AMD64 and Intel EM64t) code for x64 assembler to
-        replace longest_match() and inflate_fast(),  also masm x86
-        64-bits translation of Chris Anderson inflate_fast()
-
-masmx86/    by Gilles Vollant <[email protected]>
-        x86 asm code to replace longest_match() and inflate_fast(),
-        for Visual C++ and MASM (32 bits).
-        Based on Brian Raiter (asm686) and Chris Anderson (inflate86)
 
 minizip/    by Gilles Vollant <[email protected]>

trunk/src/libs/zlib-1.2.12/contrib/blast/blast.h

@@ -58 +58 @@
  *
  * If left and in are not NULL and *left is not zero when blast() is called,
- * then the *left bytes are *in are consumed for input before infun() is used.
+ * then the *left bytes at *in are consumed for input before infun() is used.
  *
  * The output function is invoked: err = outfun(how, buf, len), where the bytes

trunk/src/libs/zlib-1.2.12/contrib/delphi/ZLib.pas

@@ -153 +153 @@
 
 const
-  zlib_version = '1.2.11';
+  zlib_version = '1.2.12';
 
 type

trunk/src/libs/zlib-1.2.12/contrib/dotzlib/DotZLib/UnitTests.cs

@@ -157 +157 @@
         {
             Info info = new Info();
-            Assert.AreEqual("1.2.11", Info.Version);
+            Assert.AreEqual("1.2.12", Info.Version);
             Assert.AreEqual(32, info.SizeOfUInt);
             Assert.AreEqual(32, info.SizeOfULong);

trunk/src/libs/zlib-1.2.12/contrib/infback9/inftree9.c

@@ -1 +1 @@
 /* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2017 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -10 +10 @@
 
 const char inflate9_copyright[] =
-   " inflate9 1.2.11 Copyright 1995-2017 Mark Adler ";
+   " inflate9 1.2.12 Copyright 1995-2022 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
@@ -65 +65 @@
         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, 202};
+        133, 133, 133, 133, 144, 199, 202};
     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,

trunk/src/libs/zlib-1.2.12/contrib/minizip/Makefile

@@ -1 +1 @@
 CC=cc
-CFLAGS=-O -I../..
+CFLAGS := $(CFLAGS) -O -I../..
 
 UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
@@ -17 +17 @@
 
 test:   miniunz minizip
-        ./minizip test readme.txt
+        @rm -f test.*
+        @echo hello hello hello > test.txt
+        ./minizip test test.txt
         ./miniunz -l test.zip
-        mv readme.txt readme.old
+        @mv test.txt test.old
         ./miniunz test.zip
+        @cmp test.txt test.old
+        @rm -f test.*
 
 clean:
-        /bin/rm -f *.o *~ minizip miniunz
+        /bin/rm -f *.o *~ minizip miniunz test.*

trunk/src/libs/zlib-1.2.12/contrib/minizip/configure.ac

@@ -2 +2 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([minizip], [1.2.11], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.2.12], [bugzilla.redhat.com])
 AC_CONFIG_SRCDIR([minizip.c])
 AM_INIT_AUTOMAKE([foreign])

trunk/src/libs/zlib-1.2.12/contrib/minizip/crypt.h

@@ -39 +39 @@
                      * with any known compiler so far, though */
 
+    (void)pcrc_32_tab;
     temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
     return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
@@ -78 +79 @@
 
 #define zencode(pkeys,pcrc_32_tab,c,t) \
-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
+    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), (Byte)t^(c))
 
 #ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
@@ -85 +86 @@
    /* "last resort" source for second part of crypt seed pattern */
 #  ifndef ZCR_SEED2
-#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
+#    define ZCR_SEED2 3141592654L       /* use PI as default pattern */
 #  endif
 
-static int crypthead(const char* passwd,      /* password string */
-                     unsigned char* buf,      /* where to write header */
-                     int bufSize,
-                     unsigned long* pkeys,
-                     const z_crc_t* pcrc_32_tab,
-                     unsigned long crcForCrypting)
+static unsigned crypthead(const char* passwd,       /* password string */
+                          unsigned char* buf,       /* where to write header */
+                          int bufSize,
+                          unsigned long* pkeys,
+                          const z_crc_t* pcrc_32_tab,
+                          unsigned long crcForCrypting)
 {
-    int n;                       /* index in random header */
+    unsigned n;                  /* index in random header */
     int t;                       /* temporary */
     int c;                       /* random byte */

trunk/src/libs/zlib-1.2.12/contrib/minizip/ioapi.c

@@ -59 +59 @@
     else
     {
-        uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
+        uLong tell_uLong = (uLong)(*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
         if ((tell_uLong) == MAXU32)
             return (ZPOS64_T)-1;
@@ -95 +95 @@
 static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
 {
+    (void)opaque;
     FILE* file = NULL;
     const char* mode_fopen = NULL;
@@ -113 +114 @@
 static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
 {
+    (void)opaque;
     FILE* file = NULL;
     const char* mode_fopen = NULL;
@@ -132 +134 @@
 static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
 {
+    (void)opaque;
     uLong ret;
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
@@ -139 +142 @@
 static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
 {
+    (void)opaque;
     uLong ret;
     ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
@@ -146 +150 @@
 static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
 {
+    (void)opaque;
     long ret;
     ret = ftell((FILE *)stream);
@@ -154 +159 @@
 static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
 {
+    (void)opaque;
     ZPOS64_T ret;
-    ret = FTELLO_FUNC((FILE *)stream);
+    ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream);
     return ret;
 }
@@ -161 +167 @@
 static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
 {
+    (void)opaque;
     int fseek_origin=0;
     long ret;
@@ -177 +184 @@
     }
     ret = 0;
-    if (fseek((FILE *)stream, offset, fseek_origin) != 0)
+    if (fseek((FILE *)stream, (long)offset, fseek_origin) != 0)
         ret = -1;
     return ret;
@@ -184 +191 @@
 static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
 {
+    (void)opaque;
     int fseek_origin=0;
     long ret;
@@ -201 +209 @@
     ret = 0;
 
-    if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)
+    if(FSEEKO_FUNC((FILE *)stream, (long)offset, fseek_origin) != 0)
                         ret = -1;
 
@@ -210 +218 @@
 static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
 {
+    (void)opaque;
     int ret;
     ret = fclose((FILE *)stream);
@@ -217 +226 @@
 static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
 {
+    (void)opaque;
     int ret;
     ret = ferror((FILE *)stream);

trunk/src/libs/zlib-1.2.12/contrib/minizip/ioapi.h

@@ -92 +92 @@
 #else
 
-/* Maximum unsigned 32-bit value used as placeholder for zip64 */
-#define MAXU32 0xffffffff
+
 
 #if defined(_MSC_VER) || defined(__BORLANDC__)
@@ -103 +102 @@
 #endif
 
-
+/* Maximum unsigned 32-bit value used as placeholder for zip64 */
+#ifndef MAXU32
+#define MAXU32 (0xffffffff)
+#endif
 
 #ifdef __cplusplus

trunk/src/libs/zlib-1.2.12/contrib/minizip/miniunz.c

@@ -46 +46 @@
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/stat.h>
 
 #ifdef _WIN32
@@ -81 +82 @@
     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)
+static void change_file_date(filename,dosdate,tmu_date)
     const char *filename;
     uLong dosdate;
@@ -98 +99 @@
   CloseHandle(hFile);
 #else
-#ifdef unix || __APPLE__
+#if defined(unix) || defined(__APPLE__)
+  (void)dosdate;
   struct utimbuf ut;
   struct tm newdate;
@@ -122 +124 @@
    As I don't know well Unix, I wait feedback for the unix portion */
 
-int mymkdir(dirname)
+static int mymkdir(dirname)
     const char* dirname;
 {
@@ -136 +138 @@
 }
 
-int makedir (newdir)
-    char *newdir;
+static int makedir (newdir)
+    const char *newdir;
 {
   char *buffer ;
   char *p;
-  int  len = (int)strlen(newdir);
-
-  if (len <= 0)
+  size_t len = strlen(newdir);
+
+  if (len == 0)
     return 0;
 
@@ -186 +188 @@
 }
 
-void do_banner()
+static void do_banner()
 {
     printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
@@ -192 +194 @@
 }
 
-void do_help()
+static void do_help()
 {
     printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
@@ -204 +206 @@
 }
 
-void Display64BitsSize(ZPOS64_T n, int size_char)
+static void Display64BitsSize(ZPOS64_T n, int size_char)
 {
   /* to avoid compatibility problem , we do here the conversion */
@@ -232 +234 @@
 }
 
-int do_list(uf)
+static int do_list(uf)
     unzFile uf;
 {
@@ -310 +312 @@
 
 
-int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
+static int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
     unzFile uf;
     const int* popt_extract_without_path;
@@ -325 +327 @@
 
     unz_file_info64 file_info;
-    uLong ratio=0;
     err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
 
@@ -440 +441 @@
                 }
                 if (err>0)
-                    if (fwrite(buf,err,1,fout)!=1)
+                    if (fwrite(buf,(unsigned)err,1,fout)!=1)
                     {
                         printf("error in writing extracted file\n");
@@ -473 +474 @@
 
 
-int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
+static int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
     unzFile uf;
     int opt_extract_without_path;
@@ -482 +483 @@
     unz_global_info64 gi;
     int err;
-    FILE* fout=NULL;
 
     err = unzGetGlobalInfo64(uf,&gi);
@@ -509 +509 @@
 }
 
-int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
+static int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
     unzFile uf;
     const char* filename;
@@ -516 +516 @@
     const char* password;
 {
-    int err = UNZ_OK;
     if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
     {

trunk/src/libs/zlib-1.2.12/contrib/minizip/minizip.c

@@ -72 +72 @@
 
 #ifdef _WIN32
-uLong filetime(f, tmzip, dt)
-    char *f;                /* name of file to get info on */
+static int filetime(f, tmzip, dt)
+    const char *f;          /* name of file to get info on */
     tm_zip *tmzip;             /* return value: access, modific. and creation times */
     uLong *dt;             /* dostime */
@@ -95 +95 @@
 }
 #else
-#ifdef unix || __APPLE__
-uLong filetime(f, tmzip, dt)
-    char *f;               /* name of file to get info on */
+#if defined(unix) || defined(__APPLE__)
+static int filetime(f, tmzip, dt)
+    const char *f;         /* name of file to get info on */
     tm_zip *tmzip;         /* return value: access, modific. and creation times */
     uLong *dt;             /* dostime */
 {
+  (void)dt;
   int ret=0;
   struct stat s;        /* results of stat() */
@@ -109 +110 @@
   {
     char name[MAXFILENAME+1];
-    int len = strlen(f);
+    size_t len = strlen(f);
     if (len > MAXFILENAME)
       len = MAXFILENAME;
@@ -139 +140 @@
 #else
 uLong filetime(f, tmzip, dt)
-    char *f;                /* name of file to get info on */
+    const char *f;          /* name of file to get info on */
     tm_zip *tmzip;             /* return value: access, modific. and creation times */
     uLong *dt;             /* dostime */
@@ -151 +152 @@
 
 
-int check_exist_file(filename)
+static int check_exist_file(filename)
     const char* filename;
 {
@@ -164 +165 @@
 }
 
-void do_banner()
+static void do_banner()
 {
     printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
@@ -170 +171 @@
 }
 
-void do_help()
+static void do_help()
 {
     printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
@@ -183 +184 @@
 /* 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)
+static int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
 {
    unsigned long calculate_crc=0;
@@ -200 +201 @@
         {
             err = ZIP_OK;
-            size_read = (int)fread(buf,1,size_buf,fin);
+            size_read = fread(buf,1,size_buf,fin);
             if (size_read < size_buf)
                 if (feof(fin)==0)
@@ -209 +210 @@
 
             if (size_read>0)
-                calculate_crc = crc32(calculate_crc,buf,size_read);
+                calculate_crc = crc32_z(calculate_crc,buf,size_read);
             total_read += size_read;
 
@@ -222 +223 @@
 }
 
-int isLargeFile(const char* filename)
+static int isLargeFile(const char* filename)
 {
   int largeFile = 0;
@@ -230 +231 @@
   if(pFile != NULL)
   {
-    int n = FSEEKO_FUNC(pFile, 0, SEEK_END);
-    pos = FTELLO_FUNC(pFile);
+    FSEEKO_FUNC(pFile, 0, SEEK_END);
+    pos = (ZPOS64_T)FTELLO_FUNC(pFile);
 
                 printf("File : %s is %lld bytes\n", filename, pos);
@@ -256 +257 @@
     int zipok;
     int err=0;
-    int size_buf=0;
+    size_t size_buf=0;
     void* buf=NULL;
     const char* password=NULL;
@@ -397 +398 @@
             {
                 FILE * fin;
-                int size_read;
+                size_t size_read;
                 const char* filenameinzip = argv[i];
                 const char *savefilenameinzip;
@@ -473 +474 @@
                     {
                         err = ZIP_OK;
-                        size_read = (int)fread(buf,1,size_buf,fin);
+                        size_read = fread(buf,1,size_buf,fin);
                         if (size_read < size_buf)
                             if (feof(fin)==0)
@@ -483 +484 @@
                         if (size_read>0)
                         {
-                            err = zipWriteInFileInZip (zf,buf,size_read);
+                            err = zipWriteInFileInZip (zf,buf,(unsigned)size_read);
                             if (err<0)
                             {

trunk/src/libs/zlib-1.2.12/contrib/minizip/unzip.c

@@ -456 +456 @@
                 ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
             {
-                uPosFound = uReadPos+i;
+                uPosFound = uReadPos+(unsigned)i;
                 break;
             }
@@ -524 +524 @@
                 ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
             {
-                uPosFound = uReadPos+i;
+                uPosFound = uReadPos+(unsigned)i;
                 break;
             }
@@ -854 +854 @@
     ZPOS64_T uDate;
     uDate = (ZPOS64_T)(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)) ;
+    ptm->tm_mday = (int)(uDate&0x1f) ;
+    ptm->tm_mon =  (int)((((uDate)&0x1E0)/0x20)-1) ;
+    ptm->tm_year = (int)(((uDate&0x0FE00)/0x0200)+1980) ;
+
+    ptm->tm_hour = (int) ((ulDosDate &0xF800)/0x800);
+    ptm->tm_min =  (int) ((ulDosDate&0x7E0)/0x20) ;
+    ptm->tm_sec =  (int) (2*(ulDosDate&0x1f)) ;
 }
 
@@ -994 +994 @@
         if (lSeek!=0)
         {
-            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+            if (ZSEEK64(s->z_filefunc, s->filestream,(ZPOS64_T)lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
                 lSeek=0;
             else
@@ -1019 +1019 @@
         if (lSeek!=0)
         {
-            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+            if (ZSEEK64(s->z_filefunc, s->filestream,(ZPOS64_T)lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
                 lSeek=0;
             else
@@ -1091 +1091 @@
         if (lSeek!=0)
         {
-            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+            if (ZSEEK64(s->z_filefunc, s->filestream,(ZPOS64_T)lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
                 lSeek=0;
             else
@@ -1768 +1768 @@
             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;
+                return (iRead==0) ? UNZ_EOF : (int)iRead;
 
             if (pfile_in_zip_read_info->stream.avail_out <
@@ -1858 +1858 @@
 
             uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
+            /* Detect overflow, because z_stream.total_out is uLong (32 bits) */
+            if (uTotalOutAfter<uTotalOutBefore)
+                uTotalOutAfter += 1LL << 32; /* Add maximum value of uLong + 1 */
             uOutThis = uTotalOutAfter-uTotalOutBefore;
 
@@ -1872 +1875 @@
 
             if (err==Z_STREAM_END)
-                return (iRead==0) ? UNZ_EOF : iRead;
+                return (iRead==0) ? UNZ_EOF : (int)iRead;
             if (err!=Z_OK)
                 break;
@@ -1879 +1882 @@
 
     if (err==Z_OK)
-        return iRead;
+        return (int)iRead;
     return err;
 }

trunk/src/libs/zlib-1.2.12/contrib/minizip/unzip.h

@@ -84 +84 @@
 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] */
+    int tm_sec;             /* seconds after the minute - [0,59] */
+    int tm_min;             /* minutes after the hour - [0,59] */
+    int tm_hour;            /* hours since midnight - [0,23] */
+    int tm_mday;            /* day of the month - [1,31] */
+    int tm_mon;             /* months since January - [0,11] */
+    int tm_year;            /* years - [1980..2044] */
 } tm_unz;
 

trunk/src/libs/zlib-1.2.12/contrib/minizip/zip.c

@@ -159 +159 @@
     unsigned long keys[3];     /* keys defining the pseudo-random sequence */
     const z_crc_t* pcrc_32_tab;
-    int crypt_header_size;
+    unsigned crypt_header_size;
 #endif
 } curfile64_info;
@@ -302 +302 @@
       }
 
-    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
+    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,(uLong)nbByte)!=(uLong)nbByte)
         return ZIP_ERRNO;
     else
@@ -338 +338 @@
         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));
+      (uLong) (((uLong)(ptm->tm_mday) + (32 * (uLong)(ptm->tm_mon+1)) + (512 * year)) << 16) |
+        (((uLong)ptm->tm_sec/2) + (32 * (uLong)ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
 }
 
@@ -523 +523 @@
         ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
       {
-        uPosFound = uReadPos+i;
+        uPosFound = uReadPos+(unsigned)i;
         break;
       }
 
-      if (uPosFound!=0)
-        break;
+    if (uPosFound!=0)
+      break;
   }
   TRYFREE(buf);
@@ -587 +587 @@
       if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
       {
-        uPosFound = uReadPos+i;
+        uPosFound = uReadPos+(unsigned)i;
         break;
       }
@@ -638 +638 @@
 }
 
-int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+local int LoadCentralDirectoryRecord(zip64_internal* pziinit)
 {
   int err=ZIP_OK;
@@ -956 +956 @@
 }
 
-int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+local int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
 {
   /* write the local header */
@@ -1035 +1035 @@
       zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
 
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)HeaderID,2);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)DataSize,2);
 
       err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
@@ -1517 +1517 @@
     ZPOS64_T compressed_size;
     uLong invalidValue = 0xffffffff;
-    short datasize = 0;
+    unsigned datasize = 0;
     int err=ZIP_OK;
 
@@ -1753 +1753 @@
 }
 
-int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
+local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
 {
   int err = ZIP_OK;
@@ -1775 +1775 @@
 }
 
-int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+local int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
 {
   int err = ZIP_OK;
@@ -1814 +1814 @@
   return err;
 }
-int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+local int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
 {
   int err = ZIP_OK;
@@ -1862 +1862 @@
 }
 
-int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+local int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
 {
   int err = ZIP_OK;
@@ -1963 +1963 @@
     return ZIP_PARAMERROR;
 
-  pNewHeader = (char*)ALLOC(*dataLen);
+  pNewHeader = (char*)ALLOC((unsigned)*dataLen);
   pTmp = pNewHeader;
 

trunk/src/libs/zlib-1.2.12/contrib/minizip/zip.h

@@ -89 +89 @@
 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] */
+    int tm_sec;             /* seconds after the minute - [0,59] */
+    int tm_min;             /* minutes after the hour - [0,59] */
+    int tm_hour;            /* hours since midnight - [0,23] */
+    int tm_mday;            /* day of the month - [1,31] */
+    int tm_mon;             /* months since January - [0,11] */
+    int tm_year;            /* years - [1980..2044] */
 } tm_zip;
 
@@ -144 +144 @@
                                    zipcharpc* globalcomment,
                                    zlib_filefunc64_def* pzlib_filefunc_def));
+
+extern zipFile ZEXPORT zipOpen3 OF((const void *pathname,
+                                    int append,
+                                    zipcharpc* globalcomment,
+                                    zlib_filefunc64_32_def* pzlib_filefunc64_32_def));
 
 extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,

trunk/src/libs/zlib-1.2.12/contrib/pascal/zlibpas.pas

@@ -11 +11 @@
 
 const
-  ZLIB_VERSION = '1.2.11';
+  ZLIB_VERSION = '1.2.12';
   ZLIB_VERNUM  = $12a0;
 

trunk/src/libs/zlib-1.2.12/contrib/vstudio/readme.txt

@@ -1 @@
-Building instructions for the DLL versions of Zlib 1.2.11
+Building instructions for the DLL versions of Zlib 1.2.12
 ========================================================
 

trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc10/zlib.rc

@@ -3 +3 @@
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
+  FILEVERSION    1, 2, 12, 0
+  PRODUCTVERSION 1, 2, 12, 0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
@@ -18 +18 @@
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.2.11\0"
+      VALUE "FileVersion",      "1.2.12\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlibwapi.dll\0"
       VALUE "ProductName",      "ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
     END
   END

trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc10/zlibvc.def

@@ -152 +152 @@
         adler32_z                               @174
         crc32_z                                 @175
+
+; zlib1 v1.2.12 added:
+                crc32_combine_gen                                               @176
+                crc32_combine_gen64                                             @177
+                crc32_combine_op                                                @178

trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc11/zlib.rc

@@ -3 +3 @@
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
+  FILEVERSION    1, 2, 12, 0
+  PRODUCTVERSION 1, 2, 12, 0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
@@ -18 +18 @@
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.2.11\0"
+      VALUE "FileVersion",      "1.2.12\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlibwapi.dll\0"
       VALUE "ProductName",      "ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
     END
   END

trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc11/zlibvc.def

@@ -152 +152 @@
         adler32_z                               @174
         crc32_z                                 @175
+
+; zlib1 v1.2.12 added:
+                crc32_combine_gen                                               @176
+                crc32_combine_gen64                                             @177
+                crc32_combine_op                                                @178

trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc12/zlib.rc

@@ -3 +3 @@
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
+  FILEVERSION    1, 2, 12, 0
+  PRODUCTVERSION 1, 2, 12, 0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
@@ -18 +18 @@
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.2.11\0"
+      VALUE "FileVersion",      "1.2.12\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlibwapi.dll\0"
       VALUE "ProductName",      "ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
     END
   END

trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc12/zlibvc.def

@@ -152 +152 @@
         adler32_z                               @174
         crc32_z                                 @175
+
+; zlib1 v1.2.12 added:
+                crc32_combine_gen                                               @176
+                crc32_combine_gen64                                             @177
+                crc32_combine_op                                                @178

trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc14/zlib.rc

@@ -3 +3 @@
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
+  FILEVERSION    1, 2, 12, 0
+  PRODUCTVERSION 1, 2, 12, 0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
@@ -18 +18 @@
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.2.11\0"
+      VALUE "FileVersion",      "1.2.12\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlibwapi.dll\0"
       VALUE "ProductName",      "ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
     END
   END

trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc14/zlibvc.def

@@ -152 +152 @@
         adler32_z                               @174
         crc32_z                                 @175
+
+; zlib1 v1.2.12 added:
+                crc32_combine_gen                                               @176
+                crc32_combine_gen64                                             @177
+                crc32_combine_op                                                @178

trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc9/zlib.rc

@@ -3 +3 @@
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
+  FILEVERSION    1, 2, 12, 0
+  PRODUCTVERSION 1, 2, 12, 0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
@@ -18 +18 @@
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.2.11\0"
+      VALUE "FileVersion",      "1.2.12\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlibwapi.dll\0"
       VALUE "ProductName",      "ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
     END
   END

trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc9/zlibvc.def

@@ -152 +152 @@
         adler32_z                               @174
         crc32_z                                 @175
+
+; zlib1 v1.2.12 added:
+                crc32_combine_gen                                               @176
+                crc32_combine_gen64                                             @177
+                crc32_combine_op                                                @178

@@ -20 +20 @@
 /branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
 /trunk/src/src/libs/zlib-1.2.11:92342
+/vendor/zlib/1.2.12:151751
+/vendor/zlib/current:150724-151750