VirtualBox

Ignore:
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:
6 deleted
29 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libs/zlib-1.2.12

    • Property svn:mergeinfo
      •  

        old new  
        2020/branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
        2121/trunk/src/src/libs/zlib-1.2.11:92342
         22/vendor/zlib/1.2.12:151751
         23/vendor/zlib/current:150724-151750
  • trunk/src/libs/zlib-1.2.12/contrib/README.contrib

    r76163 r95239  
    88        Support for Ada
    99        See http://zlib-ada.sourceforge.net/
    10 
    11 amd64/      by Mikhail Teterin <[email protected]>
    12         asm code for AMD64
    13         See patch at http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/96393
    14 
    15 asm686/     by Brian Raiter <[email protected]>
    16         asm code for Pentium and PPro/PII, using the AT&T (GNU as) syntax
    17         See http://www.muppetlabs.com/~breadbox/software/assembly.html
    1810
    1911blast/      by Mark Adler <[email protected]>
     
    3325        Unsupported diffs to infback to decode the deflate64 format
    3426
    35 inflate86/  by Chris Anderson <[email protected]>
    36         Tuned x86 gcc asm code to replace inflate_fast()
    37 
    3827iostream/   by Kevin Ruland <[email protected]>
    3928        A C++ I/O streams interface to the zlib gz* functions
     
    4534            and Kevin Ruland <[email protected]>
    4635        Yet another C++ I/O streams interface
    47 
    48 masmx64/    by Gilles Vollant <[email protected]>
    49         x86 64-bit (AMD64 and Intel EM64t) code for x64 assembler to
    50         replace longest_match() and inflate_fast(),  also masm x86
    51         64-bits translation of Chris Anderson inflate_fast()
    52 
    53 masmx86/    by Gilles Vollant <[email protected]>
    54         x86 asm code to replace longest_match() and inflate_fast(),
    55         for Visual C++ and MASM (32 bits).
    56         Based on Brian Raiter (asm686) and Chris Anderson (inflate86)
    5736
    5837minizip/    by Gilles Vollant <[email protected]>
  • trunk/src/libs/zlib-1.2.12/contrib/blast/blast.h

    r76163 r95239  
    5858 *
    5959 * If left and in are not NULL and *left is not zero when blast() is called,
    60  * then the *left bytes are *in are consumed for input before infun() is used.
     60 * then the *left bytes at *in are consumed for input before infun() is used.
    6161 *
    6262 * The output function is invoked: err = outfun(how, buf, len), where the bytes
  • trunk/src/libs/zlib-1.2.12/contrib/delphi/ZLib.pas

    r76163 r95239  
    153153
    154154const
    155   zlib_version = '1.2.11';
     155  zlib_version = '1.2.12';
    156156
    157157type
  • trunk/src/libs/zlib-1.2.12/contrib/dotzlib/DotZLib/UnitTests.cs

    r76163 r95239  
    157157        {
    158158            Info info = new Info();
    159             Assert.AreEqual("1.2.11", Info.Version);
     159            Assert.AreEqual("1.2.12", Info.Version);
    160160            Assert.AreEqual(32, info.SizeOfUInt);
    161161            Assert.AreEqual(32, info.SizeOfULong);
  • trunk/src/libs/zlib-1.2.12/contrib/infback9/inftree9.c

    r76163 r95239  
    11/* inftree9.c -- generate Huffman trees for efficient decoding
    2  * Copyright (C) 1995-2017 Mark Adler
     2 * Copyright (C) 1995-2022 Mark Adler
    33 * For conditions of distribution and use, see copyright notice in zlib.h
    44 */
     
    1010
    1111const char inflate9_copyright[] =
    12    " inflate9 1.2.11 Copyright 1995-2017 Mark Adler ";
     12   " inflate9 1.2.12 Copyright 1995-2022 Mark Adler ";
    1313/*
    1414  If you use the zlib library in a product, an acknowledgment is welcome
     
    6565        128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
    6666        130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
    67         133, 133, 133, 133, 144, 77, 202};
     67        133, 133, 133, 133, 144, 199, 202};
    6868    static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
    6969        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/Makefile

    r76163 r95239  
    11CC=cc
    2 CFLAGS=-O -I../..
     2CFLAGS := $(CFLAGS) -O -I../..
    33
    44UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
     
    1717
    1818test:   miniunz minizip
    19         ./minizip test readme.txt
     19        @rm -f test.*
     20        @echo hello hello hello > test.txt
     21        ./minizip test test.txt
    2022        ./miniunz -l test.zip
    21         mv readme.txt readme.old
     23        @mv test.txt test.old
    2224        ./miniunz test.zip
     25        @cmp test.txt test.old
     26        @rm -f test.*
    2327
    2428clean:
    25         /bin/rm -f *.o *~ minizip miniunz
     29        /bin/rm -f *.o *~ minizip miniunz test.*
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/configure.ac

    r76163 r95239  
    22# Process this file with autoconf to produce a configure script.
    33
    4 AC_INIT([minizip], [1.2.11], [bugzilla.redhat.com])
     4AC_INIT([minizip], [1.2.12], [bugzilla.redhat.com])
    55AC_CONFIG_SRCDIR([minizip.c])
    66AM_INIT_AUTOMAKE([foreign])
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/crypt.h

    r76163 r95239  
    3939                     * with any known compiler so far, though */
    4040
     41    (void)pcrc_32_tab;
    4142    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
    4243    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
     
    7879
    7980#define zencode(pkeys,pcrc_32_tab,c,t) \
    80     (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
     81    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), (Byte)t^(c))
    8182
    8283#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
     
    8586   /* "last resort" source for second part of crypt seed pattern */
    8687#  ifndef ZCR_SEED2
    87 #    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
     88#    define ZCR_SEED2 3141592654     /* use PI as default pattern */
    8889#  endif
    8990
    90 static int crypthead(const char* passwd,      /* password string */
    91                      unsigned char* buf,      /* where to write header */
    92                      int bufSize,
    93                      unsigned long* pkeys,
    94                      const z_crc_t* pcrc_32_tab,
    95                      unsigned long crcForCrypting)
     91static unsigned crypthead(const char* passwd,       /* password string */
     92                          unsigned char* buf,       /* where to write header */
     93                          int bufSize,
     94                          unsigned long* pkeys,
     95                          const z_crc_t* pcrc_32_tab,
     96                          unsigned long crcForCrypting)
    9697{
    97     int n;                       /* index in random header */
     98    unsigned n;                  /* index in random header */
    9899    int t;                       /* temporary */
    99100    int c;                       /* random byte */
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/ioapi.c

    r76163 r95239  
    5959    else
    6060    {
    61         uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
     61        uLong tell_uLong = (uLong)(*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
    6262        if ((tell_uLong) == MAXU32)
    6363            return (ZPOS64_T)-1;
     
    9595static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
    9696{
     97    (void)opaque;
    9798    FILE* file = NULL;
    9899    const char* mode_fopen = NULL;
     
    113114static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
    114115{
     116    (void)opaque;
    115117    FILE* file = NULL;
    116118    const char* mode_fopen = NULL;
     
    132134static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
    133135{
     136    (void)opaque;
    134137    uLong ret;
    135138    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
     
    139142static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
    140143{
     144    (void)opaque;
    141145    uLong ret;
    142146    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
     
    146150static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
    147151{
     152    (void)opaque;
    148153    long ret;
    149154    ret = ftell((FILE *)stream);
     
    154159static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
    155160{
     161    (void)opaque;
    156162    ZPOS64_T ret;
    157     ret = FTELLO_FUNC((FILE *)stream);
     163    ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream);
    158164    return ret;
    159165}
     
    161167static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
    162168{
     169    (void)opaque;
    163170    int fseek_origin=0;
    164171    long ret;
     
    177184    }
    178185    ret = 0;
    179     if (fseek((FILE *)stream, offset, fseek_origin) != 0)
     186    if (fseek((FILE *)stream, (long)offset, fseek_origin) != 0)
    180187        ret = -1;
    181188    return ret;
     
    184191static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
    185192{
     193    (void)opaque;
    186194    int fseek_origin=0;
    187195    long ret;
     
    201209    ret = 0;
    202210
    203     if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)
     211    if(FSEEKO_FUNC((FILE *)stream, (long)offset, fseek_origin) != 0)
    204212                        ret = -1;
    205213
     
    210218static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
    211219{
     220    (void)opaque;
    212221    int ret;
    213222    ret = fclose((FILE *)stream);
     
    217226static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
    218227{
     228    (void)opaque;
    219229    int ret;
    220230    ret = ferror((FILE *)stream);
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/ioapi.h

    r76163 r95239  
    9292#else
    9393
    94 /* Maximum unsigned 32-bit value used as placeholder for zip64 */
    95 #define MAXU32 0xffffffff
     94
    9695
    9796#if defined(_MSC_VER) || defined(__BORLANDC__)
     
    103102#endif
    104103
    105 
     104/* Maximum unsigned 32-bit value used as placeholder for zip64 */
     105#ifndef MAXU32
     106#define MAXU32 (0xffffffff)
     107#endif
    106108
    107109#ifdef __cplusplus
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/miniunz.c

    r76163 r95239  
    4646#include <errno.h>
    4747#include <fcntl.h>
     48#include <sys/stat.h>
    4849
    4950#ifdef _WIN32
     
    8182    dosdate : the new date at the MSDos format (4 bytes)
    8283    tmu_date : the SAME new date at the tm_unz format */
    83 void change_file_date(filename,dosdate,tmu_date)
     84static void change_file_date(filename,dosdate,tmu_date)
    8485    const char *filename;
    8586    uLong dosdate;
     
    9899  CloseHandle(hFile);
    99100#else
    100 #ifdef unix || __APPLE__
     101#if defined(unix) || defined(__APPLE__)
     102  (void)dosdate;
    101103  struct utimbuf ut;
    102104  struct tm newdate;
     
    122124   As I don't know well Unix, I wait feedback for the unix portion */
    123125
    124 int mymkdir(dirname)
     126static int mymkdir(dirname)
    125127    const char* dirname;
    126128{
     
    136138}
    137139
    138 int makedir (newdir)
    139     char *newdir;
     140static int makedir (newdir)
     141    const char *newdir;
    140142{
    141143  char *buffer ;
    142144  char *p;
    143   int  len = (int)strlen(newdir);
    144 
    145   if (len <= 0)
     145  size_t len = strlen(newdir);
     146
     147  if (len == 0)
    146148    return 0;
    147149
     
    186188}
    187189
    188 void do_banner()
     190static void do_banner()
    189191{
    190192    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
     
    192194}
    193195
    194 void do_help()
     196static void do_help()
    195197{
    196198    printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
     
    204206}
    205207
    206 void Display64BitsSize(ZPOS64_T n, int size_char)
     208static void Display64BitsSize(ZPOS64_T n, int size_char)
    207209{
    208210  /* to avoid compatibility problem , we do here the conversion */
     
    232234}
    233235
    234 int do_list(uf)
     236static int do_list(uf)
    235237    unzFile uf;
    236238{
     
    310312
    311313
    312 int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
     314static int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
    313315    unzFile uf;
    314316    const int* popt_extract_without_path;
     
    325327
    326328    unz_file_info64 file_info;
    327     uLong ratio=0;
    328329    err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
    329330
     
    440441                }
    441442                if (err>0)
    442                     if (fwrite(buf,err,1,fout)!=1)
     443                    if (fwrite(buf,(unsigned)err,1,fout)!=1)
    443444                    {
    444445                        printf("error in writing extracted file\n");
     
    473474
    474475
    475 int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
     476static int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
    476477    unzFile uf;
    477478    int opt_extract_without_path;
     
    482483    unz_global_info64 gi;
    483484    int err;
    484     FILE* fout=NULL;
    485485
    486486    err = unzGetGlobalInfo64(uf,&gi);
     
    509509}
    510510
    511 int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
     511static int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
    512512    unzFile uf;
    513513    const char* filename;
     
    516516    const char* password;
    517517{
    518     int err = UNZ_OK;
    519518    if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
    520519    {
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/minizip.c

    r76163 r95239  
    7272
    7373#ifdef _WIN32
    74 uLong filetime(f, tmzip, dt)
    75     char *f;                /* name of file to get info on */
     74static int filetime(f, tmzip, dt)
     75    const char *f;          /* name of file to get info on */
    7676    tm_zip *tmzip;             /* return value: access, modific. and creation times */
    7777    uLong *dt;             /* dostime */
     
    9595}
    9696#else
    97 #ifdef unix || __APPLE__
    98 uLong filetime(f, tmzip, dt)
    99     char *f;               /* name of file to get info on */
     97#if defined(unix) || defined(__APPLE__)
     98static int filetime(f, tmzip, dt)
     99    const char *f;         /* name of file to get info on */
    100100    tm_zip *tmzip;         /* return value: access, modific. and creation times */
    101101    uLong *dt;             /* dostime */
    102102{
     103  (void)dt;
    103104  int ret=0;
    104105  struct stat s;        /* results of stat() */
     
    109110  {
    110111    char name[MAXFILENAME+1];
    111     int len = strlen(f);
     112    size_t len = strlen(f);
    112113    if (len > MAXFILENAME)
    113114      len = MAXFILENAME;
     
    139140#else
    140141uLong filetime(f, tmzip, dt)
    141     char *f;                /* name of file to get info on */
     142    const char *f;          /* name of file to get info on */
    142143    tm_zip *tmzip;             /* return value: access, modific. and creation times */
    143144    uLong *dt;             /* dostime */
     
    151152
    152153
    153 int check_exist_file(filename)
     154static int check_exist_file(filename)
    154155    const char* filename;
    155156{
     
    164165}
    165166
    166 void do_banner()
     167static void do_banner()
    167168{
    168169    printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
     
    170171}
    171172
    172 void do_help()
     173static void do_help()
    173174{
    174175    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
     
    183184/* calculate the CRC32 of a file,
    184185   because to encrypt a file, we need known the CRC32 of the file before */
    185 int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
     186static int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
    186187{
    187188   unsigned long calculate_crc=0;
     
    200201        {
    201202            err = ZIP_OK;
    202             size_read = (int)fread(buf,1,size_buf,fin);
     203            size_read = fread(buf,1,size_buf,fin);
    203204            if (size_read < size_buf)
    204205                if (feof(fin)==0)
     
    209210
    210211            if (size_read>0)
    211                 calculate_crc = crc32(calculate_crc,buf,size_read);
     212                calculate_crc = crc32_z(calculate_crc,buf,size_read);
    212213            total_read += size_read;
    213214
     
    222223}
    223224
    224 int isLargeFile(const char* filename)
     225static int isLargeFile(const char* filename)
    225226{
    226227  int largeFile = 0;
     
    230231  if(pFile != NULL)
    231232  {
    232     int n = FSEEKO_FUNC(pFile, 0, SEEK_END);
    233     pos = FTELLO_FUNC(pFile);
     233    FSEEKO_FUNC(pFile, 0, SEEK_END);
     234    pos = (ZPOS64_T)FTELLO_FUNC(pFile);
    234235
    235236                printf("File : %s is %lld bytes\n", filename, pos);
     
    256257    int zipok;
    257258    int err=0;
    258     int size_buf=0;
     259    size_t size_buf=0;
    259260    void* buf=NULL;
    260261    const char* password=NULL;
     
    397398            {
    398399                FILE * fin;
    399                 int size_read;
     400                size_t size_read;
    400401                const char* filenameinzip = argv[i];
    401402                const char *savefilenameinzip;
     
    473474                    {
    474475                        err = ZIP_OK;
    475                         size_read = (int)fread(buf,1,size_buf,fin);
     476                        size_read = fread(buf,1,size_buf,fin);
    476477                        if (size_read < size_buf)
    477478                            if (feof(fin)==0)
     
    483484                        if (size_read>0)
    484485                        {
    485                             err = zipWriteInFileInZip (zf,buf,size_read);
     486                            err = zipWriteInFileInZip (zf,buf,(unsigned)size_read);
    486487                            if (err<0)
    487488                            {
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/unzip.c

    r76163 r95239  
    456456                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
    457457            {
    458                 uPosFound = uReadPos+i;
     458                uPosFound = uReadPos+(unsigned)i;
    459459                break;
    460460            }
     
    524524                ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
    525525            {
    526                 uPosFound = uReadPos+i;
     526                uPosFound = uReadPos+(unsigned)i;
    527527                break;
    528528            }
     
    854854    ZPOS64_T uDate;
    855855    uDate = (ZPOS64_T)(ulDosDate>>16);
    856     ptm->tm_mday = (uInt)(uDate&0x1f) ;
    857     ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
    858     ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
    859 
    860     ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
    861     ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
    862     ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
     856    ptm->tm_mday = (int)(uDate&0x1f) ;
     857    ptm->tm_mon =  (int)((((uDate)&0x1E0)/0x20)-1) ;
     858    ptm->tm_year = (int)(((uDate&0x0FE00)/0x0200)+1980) ;
     859
     860    ptm->tm_hour = (int) ((ulDosDate &0xF800)/0x800);
     861    ptm->tm_min =  (int) ((ulDosDate&0x7E0)/0x20) ;
     862    ptm->tm_sec =  (int) (2*(ulDosDate&0x1f)) ;
    863863}
    864864
     
    994994        if (lSeek!=0)
    995995        {
    996             if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
     996            if (ZSEEK64(s->z_filefunc, s->filestream,(ZPOS64_T)lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
    997997                lSeek=0;
    998998            else
     
    10191019        if (lSeek!=0)
    10201020        {
    1021             if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
     1021            if (ZSEEK64(s->z_filefunc, s->filestream,(ZPOS64_T)lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
    10221022                lSeek=0;
    10231023            else
     
    10911091        if (lSeek!=0)
    10921092        {
    1093             if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
     1093            if (ZSEEK64(s->z_filefunc, s->filestream,(ZPOS64_T)lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
    10941094                lSeek=0;
    10951095            else
     
    17681768            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
    17691769                (pfile_in_zip_read_info->rest_read_compressed == 0))
    1770                 return (iRead==0) ? UNZ_EOF : iRead;
     1770                return (iRead==0) ? UNZ_EOF : (int)iRead;
    17711771
    17721772            if (pfile_in_zip_read_info->stream.avail_out <
     
    18581858
    18591859            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
     1860            /* Detect overflow, because z_stream.total_out is uLong (32 bits) */
     1861            if (uTotalOutAfter<uTotalOutBefore)
     1862                uTotalOutAfter += 1LL << 32; /* Add maximum value of uLong + 1 */
    18601863            uOutThis = uTotalOutAfter-uTotalOutBefore;
    18611864
     
    18721875
    18731876            if (err==Z_STREAM_END)
    1874                 return (iRead==0) ? UNZ_EOF : iRead;
     1877                return (iRead==0) ? UNZ_EOF : (int)iRead;
    18751878            if (err!=Z_OK)
    18761879                break;
     
    18791882
    18801883    if (err==Z_OK)
    1881         return iRead;
     1884        return (int)iRead;
    18821885    return err;
    18831886}
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/unzip.h

    r76163 r95239  
    8484typedef struct tm_unz_s
    8585{
    86     uInt tm_sec;            /* seconds after the minute - [0,59] */
    87     uInt tm_min;            /* minutes after the hour - [0,59] */
    88     uInt tm_hour;           /* hours since midnight - [0,23] */
    89     uInt tm_mday;           /* day of the month - [1,31] */
    90     uInt tm_mon;            /* months since January - [0,11] */
    91     uInt tm_year;           /* years - [1980..2044] */
     86    int tm_sec;             /* seconds after the minute - [0,59] */
     87    int tm_min;             /* minutes after the hour - [0,59] */
     88    int tm_hour;            /* hours since midnight - [0,23] */
     89    int tm_mday;            /* day of the month - [1,31] */
     90    int tm_mon;             /* months since January - [0,11] */
     91    int tm_year;            /* years - [1980..2044] */
    9292} tm_unz;
    9393
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/zip.c

    r76163 r95239  
    159159    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
    160160    const z_crc_t* pcrc_32_tab;
    161     int crypt_header_size;
     161    unsigned crypt_header_size;
    162162#endif
    163163} curfile64_info;
     
    302302      }
    303303
    304     if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
     304    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,(uLong)nbByte)!=(uLong)nbByte)
    305305        return ZIP_ERRNO;
    306306    else
     
    338338        year-=80;
    339339    return
    340       (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
    341         ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
     340      (uLong) (((uLong)(ptm->tm_mday) + (32 * (uLong)(ptm->tm_mon+1)) + (512 * year)) << 16) |
     341        (((uLong)ptm->tm_sec/2) + (32 * (uLong)ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
    342342}
    343343
     
    523523        ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
    524524      {
    525         uPosFound = uReadPos+i;
     525        uPosFound = uReadPos+(unsigned)i;
    526526        break;
    527527      }
    528528
    529       if (uPosFound!=0)
    530         break;
     529    if (uPosFound!=0)
     530      break;
    531531  }
    532532  TRYFREE(buf);
     
    587587      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
    588588      {
    589         uPosFound = uReadPos+i;
     589        uPosFound = uReadPos+(unsigned)i;
    590590        break;
    591591      }
     
    638638}
    639639
    640 int LoadCentralDirectoryRecord(zip64_internal* pziinit)
     640local int LoadCentralDirectoryRecord(zip64_internal* pziinit)
    641641{
    642642  int err=ZIP_OK;
     
    956956}
    957957
    958 int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
     958local int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
    959959{
    960960  /* write the local header */
     
    10351035      zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
    10361036
    1037       err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
    1038       err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
     1037      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)HeaderID,2);
     1038      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)DataSize,2);
    10391039
    10401040      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
     
    15171517    ZPOS64_T compressed_size;
    15181518    uLong invalidValue = 0xffffffff;
    1519     short datasize = 0;
     1519    unsigned datasize = 0;
    15201520    int err=ZIP_OK;
    15211521
     
    17531753}
    17541754
    1755 int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
     1755local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
    17561756{
    17571757  int err = ZIP_OK;
     
    17751775}
    17761776
    1777 int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
     1777local int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
    17781778{
    17791779  int err = ZIP_OK;
     
    18141814  return err;
    18151815}
    1816 int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
     1816local int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
    18171817{
    18181818  int err = ZIP_OK;
     
    18621862}
    18631863
    1864 int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
     1864local int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
    18651865{
    18661866  int err = ZIP_OK;
     
    19631963    return ZIP_PARAMERROR;
    19641964
    1965   pNewHeader = (char*)ALLOC(*dataLen);
     1965  pNewHeader = (char*)ALLOC((unsigned)*dataLen);
    19661966  pTmp = pNewHeader;
    19671967
  • trunk/src/libs/zlib-1.2.12/contrib/minizip/zip.h

    r76163 r95239  
    8989typedef struct tm_zip_s
    9090{
    91     uInt tm_sec;            /* seconds after the minute - [0,59] */
    92     uInt tm_min;            /* minutes after the hour - [0,59] */
    93     uInt tm_hour;           /* hours since midnight - [0,23] */
    94     uInt tm_mday;           /* day of the month - [1,31] */
    95     uInt tm_mon;            /* months since January - [0,11] */
    96     uInt tm_year;           /* years - [1980..2044] */
     91    int tm_sec;             /* seconds after the minute - [0,59] */
     92    int tm_min;             /* minutes after the hour - [0,59] */
     93    int tm_hour;            /* hours since midnight - [0,23] */
     94    int tm_mday;            /* day of the month - [1,31] */
     95    int tm_mon;             /* months since January - [0,11] */
     96    int tm_year;            /* years - [1980..2044] */
    9797} tm_zip;
    9898
     
    144144                                   zipcharpc* globalcomment,
    145145                                   zlib_filefunc64_def* pzlib_filefunc_def));
     146
     147extern zipFile ZEXPORT zipOpen3 OF((const void *pathname,
     148                                    int append,
     149                                    zipcharpc* globalcomment,
     150                                    zlib_filefunc64_32_def* pzlib_filefunc64_32_def));
    146151
    147152extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
  • trunk/src/libs/zlib-1.2.12/contrib/pascal/zlibpas.pas

    r76163 r95239  
    1111
    1212const
    13   ZLIB_VERSION = '1.2.11';
     13  ZLIB_VERSION = '1.2.12';
    1414  ZLIB_VERNUM  = $12a0;
    1515
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/readme.txt

    r76163 r95239  
    1 Building instructions for the DLL versions of Zlib 1.2.11
     1Building instructions for the DLL versions of Zlib 1.2.12
    22========================================================
    33
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc10/zlib.rc

    r76163 r95239  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1, 2, 11, 0
    6   PRODUCTVERSION 1, 2, 11, 0
     5  FILEVERSION    1, 2, 12, 0
     6  PRODUCTVERSION 1, 2, 12, 0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
     
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.11\0"
     20      VALUE "FileVersion",      "1.2.12\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlibwapi.dll\0"
    2323      VALUE "ProductName",      "ZLib.DLL\0"
    2424      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
    25       VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
     25      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
    2626    END
    2727  END
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc10/zlibvc.def

    r76163 r95239  
    152152        adler32_z                               @174
    153153        crc32_z                                 @175
     154
     155; zlib1 v1.2.12 added:
     156                crc32_combine_gen                                               @176
     157                crc32_combine_gen64                                             @177
     158                crc32_combine_op                                                @178
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc11/zlib.rc

    r76163 r95239  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1, 2, 11, 0
    6   PRODUCTVERSION 1, 2, 11, 0
     5  FILEVERSION    1, 2, 12, 0
     6  PRODUCTVERSION 1, 2, 12, 0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
     
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.11\0"
     20      VALUE "FileVersion",      "1.2.12\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlibwapi.dll\0"
    2323      VALUE "ProductName",      "ZLib.DLL\0"
    2424      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
    25       VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
     25      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
    2626    END
    2727  END
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc11/zlibvc.def

    r76163 r95239  
    152152        adler32_z                               @174
    153153        crc32_z                                 @175
     154
     155; zlib1 v1.2.12 added:
     156                crc32_combine_gen                                               @176
     157                crc32_combine_gen64                                             @177
     158                crc32_combine_op                                                @178
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc12/zlib.rc

    r76163 r95239  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1, 2, 11, 0
    6   PRODUCTVERSION 1, 2, 11, 0
     5  FILEVERSION    1, 2, 12, 0
     6  PRODUCTVERSION 1, 2, 12, 0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
     
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.11\0"
     20      VALUE "FileVersion",      "1.2.12\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlibwapi.dll\0"
    2323      VALUE "ProductName",      "ZLib.DLL\0"
    2424      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
    25       VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
     25      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
    2626    END
    2727  END
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc12/zlibvc.def

    r76163 r95239  
    152152        adler32_z                               @174
    153153        crc32_z                                 @175
     154
     155; zlib1 v1.2.12 added:
     156                crc32_combine_gen                                               @176
     157                crc32_combine_gen64                                             @177
     158                crc32_combine_op                                                @178
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc14/zlib.rc

    r76163 r95239  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1, 2, 11, 0
    6   PRODUCTVERSION 1, 2, 11, 0
     5  FILEVERSION    1, 2, 12, 0
     6  PRODUCTVERSION 1, 2, 12, 0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
     
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.11\0"
     20      VALUE "FileVersion",      "1.2.12\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlibwapi.dll\0"
    2323      VALUE "ProductName",      "ZLib.DLL\0"
    2424      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
    25       VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
     25      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
    2626    END
    2727  END
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc14/zlibvc.def

    r76163 r95239  
    152152        adler32_z                               @174
    153153        crc32_z                                 @175
     154
     155; zlib1 v1.2.12 added:
     156                crc32_combine_gen                                               @176
     157                crc32_combine_gen64                                             @177
     158                crc32_combine_op                                                @178
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc9/zlib.rc

    r76163 r95239  
    33#define IDR_VERSION1  1
    44IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
    5   FILEVERSION    1, 2, 11, 0
    6   PRODUCTVERSION 1, 2, 11, 0
     5  FILEVERSION    1, 2, 12, 0
     6  PRODUCTVERSION 1, 2, 12, 0
    77  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
    88  FILEFLAGS     0
     
    1818    BEGIN
    1919      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20       VALUE "FileVersion",      "1.2.11\0"
     20      VALUE "FileVersion",      "1.2.12\0"
    2121      VALUE "InternalName",     "zlib\0"
    2222      VALUE "OriginalFilename", "zlibwapi.dll\0"
    2323      VALUE "ProductName",      "ZLib.DLL\0"
    2424      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
    25       VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
     25      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
    2626    END
    2727  END
  • trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc9/zlibvc.def

    r76163 r95239  
    152152        adler32_z                               @174
    153153        crc32_z                                 @175
     154
     155; zlib1 v1.2.12 added:
     156                crc32_combine_gen                                               @176
     157                crc32_combine_gen64                                             @177
     158                crc32_combine_op                                                @178
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette