Changeset 95239 in vbox for trunk/src/libs/zlib-1.2.12/contrib
- Timestamp:
- Jun 9, 2022 9:09:44 AM (3 years ago)
- svn:sync-xref-src-repo-rev:
- 151769
- 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 20 20 /branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692 21 21 /trunk/src/src/libs/zlib-1.2.11:92342 22 /vendor/zlib/1.2.12:151751 23 /vendor/zlib/current:150724-151750
-
- Property svn:mergeinfo
-
trunk/src/libs/zlib-1.2.12/contrib/README.contrib
r76163 r95239 8 8 Support for Ada 9 9 See http://zlib-ada.sourceforge.net/ 10 11 amd64/ by Mikhail Teterin <[email protected]>12 asm code for AMD6413 See patch at http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/9639314 15 asm686/ by Brian Raiter <[email protected]>16 asm code for Pentium and PPro/PII, using the AT&T (GNU as) syntax17 See http://www.muppetlabs.com/~breadbox/software/assembly.html18 10 19 11 blast/ by Mark Adler <[email protected]> … … 33 25 Unsupported diffs to infback to decode the deflate64 format 34 26 35 inflate86/ by Chris Anderson <[email protected]>36 Tuned x86 gcc asm code to replace inflate_fast()37 38 27 iostream/ by Kevin Ruland <[email protected]> 39 28 A C++ I/O streams interface to the zlib gz* functions … … 45 34 and Kevin Ruland <[email protected]> 46 35 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 to50 replace longest_match() and inflate_fast(), also masm x8651 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)57 36 58 37 minizip/ by Gilles Vollant <[email protected]> -
trunk/src/libs/zlib-1.2.12/contrib/blast/blast.h
r76163 r95239 58 58 * 59 59 * If left and in are not NULL and *left is not zero when blast() is called, 60 * then the *left bytes a re*in are consumed for input before infun() is used.60 * then the *left bytes at *in are consumed for input before infun() is used. 61 61 * 62 62 * 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 153 153 154 154 const 155 zlib_version = '1.2.1 1';155 zlib_version = '1.2.12'; 156 156 157 157 type -
trunk/src/libs/zlib-1.2.12/contrib/dotzlib/DotZLib/UnitTests.cs
r76163 r95239 157 157 { 158 158 Info info = new Info(); 159 Assert.AreEqual("1.2.1 1", Info.Version);159 Assert.AreEqual("1.2.12", Info.Version); 160 160 Assert.AreEqual(32, info.SizeOfUInt); 161 161 Assert.AreEqual(32, info.SizeOfULong); -
trunk/src/libs/zlib-1.2.12/contrib/infback9/inftree9.c
r76163 r95239 1 1 /* inftree9.c -- generate Huffman trees for efficient decoding 2 * Copyright (C) 1995-20 17Mark Adler2 * Copyright (C) 1995-2022 Mark Adler 3 3 * For conditions of distribution and use, see copyright notice in zlib.h 4 4 */ … … 10 10 11 11 const char inflate9_copyright[] = 12 " inflate9 1.2.1 1 Copyright 1995-2017Mark Adler ";12 " inflate9 1.2.12 Copyright 1995-2022 Mark Adler "; 13 13 /* 14 14 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, 66 66 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}; 68 68 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ 69 69 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, -
trunk/src/libs/zlib-1.2.12/contrib/minizip/Makefile
r76163 r95239 1 1 CC=cc 2 CFLAGS =-O -I../..2 CFLAGS := $(CFLAGS) -O -I../.. 3 3 4 4 UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a … … 17 17 18 18 test: miniunz minizip 19 ./minizip test readme.txt 19 @rm -f test.* 20 @echo hello hello hello > test.txt 21 ./minizip test test.txt 20 22 ./miniunz -l test.zip 21 mv readme.txt readme.old23 @mv test.txt test.old 22 24 ./miniunz test.zip 25 @cmp test.txt test.old 26 @rm -f test.* 23 27 24 28 clean: 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 2 2 # Process this file with autoconf to produce a configure script. 3 3 4 AC_INIT([minizip], [1.2.1 1], [bugzilla.redhat.com])4 AC_INIT([minizip], [1.2.12], [bugzilla.redhat.com]) 5 5 AC_CONFIG_SRCDIR([minizip.c]) 6 6 AM_INIT_AUTOMAKE([foreign]) -
trunk/src/libs/zlib-1.2.12/contrib/minizip/crypt.h
r76163 r95239 39 39 * with any known compiler so far, though */ 40 40 41 (void)pcrc_32_tab; 41 42 temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; 42 43 return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); … … 78 79 79 80 #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)) 81 82 82 83 #ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED … … 85 86 /* "last resort" source for second part of crypt seed pattern */ 86 87 # ifndef ZCR_SEED2 87 # define ZCR_SEED2 3141592654 UL/* use PI as default pattern */88 # define ZCR_SEED2 3141592654L /* use PI as default pattern */ 88 89 # endif 89 90 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)91 static 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) 96 97 { 97 int n;/* index in random header */98 unsigned n; /* index in random header */ 98 99 int t; /* temporary */ 99 100 int c; /* random byte */ -
trunk/src/libs/zlib-1.2.12/contrib/minizip/ioapi.c
r76163 r95239 59 59 else 60 60 { 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); 62 62 if ((tell_uLong) == MAXU32) 63 63 return (ZPOS64_T)-1; … … 95 95 static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode) 96 96 { 97 (void)opaque; 97 98 FILE* file = NULL; 98 99 const char* mode_fopen = NULL; … … 113 114 static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode) 114 115 { 116 (void)opaque; 115 117 FILE* file = NULL; 116 118 const char* mode_fopen = NULL; … … 132 134 static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size) 133 135 { 136 (void)opaque; 134 137 uLong ret; 135 138 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) 140 143 { 144 (void)opaque; 141 145 uLong ret; 142 146 ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); … … 146 150 static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) 147 151 { 152 (void)opaque; 148 153 long ret; 149 154 ret = ftell((FILE *)stream); … … 154 159 static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream) 155 160 { 161 (void)opaque; 156 162 ZPOS64_T ret; 157 ret = FTELLO_FUNC((FILE *)stream);163 ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream); 158 164 return ret; 159 165 } … … 161 167 static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin) 162 168 { 169 (void)opaque; 163 170 int fseek_origin=0; 164 171 long ret; … … 177 184 } 178 185 ret = 0; 179 if (fseek((FILE *)stream, offset, fseek_origin) != 0)186 if (fseek((FILE *)stream, (long)offset, fseek_origin) != 0) 180 187 ret = -1; 181 188 return ret; … … 184 191 static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) 185 192 { 193 (void)opaque; 186 194 int fseek_origin=0; 187 195 long ret; … … 201 209 ret = 0; 202 210 203 if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)211 if(FSEEKO_FUNC((FILE *)stream, (long)offset, fseek_origin) != 0) 204 212 ret = -1; 205 213 … … 210 218 static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream) 211 219 { 220 (void)opaque; 212 221 int ret; 213 222 ret = fclose((FILE *)stream); … … 217 226 static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream) 218 227 { 228 (void)opaque; 219 229 int ret; 220 230 ret = ferror((FILE *)stream); -
trunk/src/libs/zlib-1.2.12/contrib/minizip/ioapi.h
r76163 r95239 92 92 #else 93 93 94 /* Maximum unsigned 32-bit value used as placeholder for zip64 */ 95 #define MAXU32 0xffffffff 94 96 95 97 96 #if defined(_MSC_VER) || defined(__BORLANDC__) … … 103 102 #endif 104 103 105 104 /* Maximum unsigned 32-bit value used as placeholder for zip64 */ 105 #ifndef MAXU32 106 #define MAXU32 (0xffffffff) 107 #endif 106 108 107 109 #ifdef __cplusplus -
trunk/src/libs/zlib-1.2.12/contrib/minizip/miniunz.c
r76163 r95239 46 46 #include <errno.h> 47 47 #include <fcntl.h> 48 #include <sys/stat.h> 48 49 49 50 #ifdef _WIN32 … … 81 82 dosdate : the new date at the MSDos format (4 bytes) 82 83 tmu_date : the SAME new date at the tm_unz format */ 83 void change_file_date(filename,dosdate,tmu_date)84 static void change_file_date(filename,dosdate,tmu_date) 84 85 const char *filename; 85 86 uLong dosdate; … … 98 99 CloseHandle(hFile); 99 100 #else 100 #ifdef unix || __APPLE__ 101 #if defined(unix) || defined(__APPLE__) 102 (void)dosdate; 101 103 struct utimbuf ut; 102 104 struct tm newdate; … … 122 124 As I don't know well Unix, I wait feedback for the unix portion */ 123 125 124 int mymkdir(dirname)126 static int mymkdir(dirname) 125 127 const char* dirname; 126 128 { … … 136 138 } 137 139 138 int makedir (newdir)139 c har *newdir;140 static int makedir (newdir) 141 const char *newdir; 140 142 { 141 143 char *buffer ; 142 144 char *p; 143 int len = (int)strlen(newdir);144 145 if (len <= 0)145 size_t len = strlen(newdir); 146 147 if (len == 0) 146 148 return 0; 147 149 … … 186 188 } 187 189 188 void do_banner()190 static void do_banner() 189 191 { 190 192 printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n"); … … 192 194 } 193 195 194 void do_help()196 static void do_help() 195 197 { 196 198 printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \ … … 204 206 } 205 207 206 void Display64BitsSize(ZPOS64_T n, int size_char)208 static void Display64BitsSize(ZPOS64_T n, int size_char) 207 209 { 208 210 /* to avoid compatibility problem , we do here the conversion */ … … 232 234 } 233 235 234 int do_list(uf)236 static int do_list(uf) 235 237 unzFile uf; 236 238 { … … 310 312 311 313 312 int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)314 static int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password) 313 315 unzFile uf; 314 316 const int* popt_extract_without_path; … … 325 327 326 328 unz_file_info64 file_info; 327 uLong ratio=0;328 329 err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0); 329 330 … … 440 441 } 441 442 if (err>0) 442 if (fwrite(buf, err,1,fout)!=1)443 if (fwrite(buf,(unsigned)err,1,fout)!=1) 443 444 { 444 445 printf("error in writing extracted file\n"); … … 473 474 474 475 475 int do_extract(uf,opt_extract_without_path,opt_overwrite,password)476 static int do_extract(uf,opt_extract_without_path,opt_overwrite,password) 476 477 unzFile uf; 477 478 int opt_extract_without_path; … … 482 483 unz_global_info64 gi; 483 484 int err; 484 FILE* fout=NULL;485 485 486 486 err = unzGetGlobalInfo64(uf,&gi); … … 509 509 } 510 510 511 int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)511 static int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password) 512 512 unzFile uf; 513 513 const char* filename; … … 516 516 const char* password; 517 517 { 518 int err = UNZ_OK;519 518 if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK) 520 519 { -
trunk/src/libs/zlib-1.2.12/contrib/minizip/minizip.c
r76163 r95239 72 72 73 73 #ifdef _WIN32 74 uLongfiletime(f, tmzip, dt)75 c har *f;/* name of file to get info on */74 static int filetime(f, tmzip, dt) 75 const char *f; /* name of file to get info on */ 76 76 tm_zip *tmzip; /* return value: access, modific. and creation times */ 77 77 uLong *dt; /* dostime */ … … 95 95 } 96 96 #else 97 #if def unix || __APPLE__98 uLongfiletime(f, tmzip, dt)99 c har *f;/* name of file to get info on */97 #if defined(unix) || defined(__APPLE__) 98 static int filetime(f, tmzip, dt) 99 const char *f; /* name of file to get info on */ 100 100 tm_zip *tmzip; /* return value: access, modific. and creation times */ 101 101 uLong *dt; /* dostime */ 102 102 { 103 (void)dt; 103 104 int ret=0; 104 105 struct stat s; /* results of stat() */ … … 109 110 { 110 111 char name[MAXFILENAME+1]; 111 int len = strlen(f);112 size_t len = strlen(f); 112 113 if (len > MAXFILENAME) 113 114 len = MAXFILENAME; … … 139 140 #else 140 141 uLong filetime(f, tmzip, dt) 141 c har *f;/* name of file to get info on */142 const char *f; /* name of file to get info on */ 142 143 tm_zip *tmzip; /* return value: access, modific. and creation times */ 143 144 uLong *dt; /* dostime */ … … 151 152 152 153 153 int check_exist_file(filename)154 static int check_exist_file(filename) 154 155 const char* filename; 155 156 { … … 164 165 } 165 166 166 void do_banner()167 static void do_banner() 167 168 { 168 169 printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n"); … … 170 171 } 171 172 172 void do_help()173 static void do_help() 173 174 { 174 175 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, 184 185 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)186 static int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc) 186 187 { 187 188 unsigned long calculate_crc=0; … … 200 201 { 201 202 err = ZIP_OK; 202 size_read = (int)fread(buf,1,size_buf,fin);203 size_read = fread(buf,1,size_buf,fin); 203 204 if (size_read < size_buf) 204 205 if (feof(fin)==0) … … 209 210 210 211 if (size_read>0) 211 calculate_crc = crc32 (calculate_crc,buf,size_read);212 calculate_crc = crc32_z(calculate_crc,buf,size_read); 212 213 total_read += size_read; 213 214 … … 222 223 } 223 224 224 int isLargeFile(const char* filename)225 static int isLargeFile(const char* filename) 225 226 { 226 227 int largeFile = 0; … … 230 231 if(pFile != NULL) 231 232 { 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); 234 235 235 236 printf("File : %s is %lld bytes\n", filename, pos); … … 256 257 int zipok; 257 258 int err=0; 258 int size_buf=0;259 size_t size_buf=0; 259 260 void* buf=NULL; 260 261 const char* password=NULL; … … 397 398 { 398 399 FILE * fin; 399 int size_read;400 size_t size_read; 400 401 const char* filenameinzip = argv[i]; 401 402 const char *savefilenameinzip; … … 473 474 { 474 475 err = ZIP_OK; 475 size_read = (int)fread(buf,1,size_buf,fin);476 size_read = fread(buf,1,size_buf,fin); 476 477 if (size_read < size_buf) 477 478 if (feof(fin)==0) … … 483 484 if (size_read>0) 484 485 { 485 err = zipWriteInFileInZip (zf,buf, size_read);486 err = zipWriteInFileInZip (zf,buf,(unsigned)size_read); 486 487 if (err<0) 487 488 { -
trunk/src/libs/zlib-1.2.12/contrib/minizip/unzip.c
r76163 r95239 456 456 ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06)) 457 457 { 458 uPosFound = uReadPos+ i;458 uPosFound = uReadPos+(unsigned)i; 459 459 break; 460 460 } … … 524 524 ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07)) 525 525 { 526 uPosFound = uReadPos+ i;526 uPosFound = uReadPos+(unsigned)i; 527 527 break; 528 528 } … … 854 854 ZPOS64_T uDate; 855 855 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)) ; 863 863 } 864 864 … … 994 994 if (lSeek!=0) 995 995 { 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) 997 997 lSeek=0; 998 998 else … … 1019 1019 if (lSeek!=0) 1020 1020 { 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) 1022 1022 lSeek=0; 1023 1023 else … … 1091 1091 if (lSeek!=0) 1092 1092 { 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) 1094 1094 lSeek=0; 1095 1095 else … … 1768 1768 if ((pfile_in_zip_read_info->stream.avail_in == 0) && 1769 1769 (pfile_in_zip_read_info->rest_read_compressed == 0)) 1770 return (iRead==0) ? UNZ_EOF : iRead;1770 return (iRead==0) ? UNZ_EOF : (int)iRead; 1771 1771 1772 1772 if (pfile_in_zip_read_info->stream.avail_out < … … 1858 1858 1859 1859 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 */ 1860 1863 uOutThis = uTotalOutAfter-uTotalOutBefore; 1861 1864 … … 1872 1875 1873 1876 if (err==Z_STREAM_END) 1874 return (iRead==0) ? UNZ_EOF : iRead;1877 return (iRead==0) ? UNZ_EOF : (int)iRead; 1875 1878 if (err!=Z_OK) 1876 1879 break; … … 1879 1882 1880 1883 if (err==Z_OK) 1881 return iRead;1884 return (int)iRead; 1882 1885 return err; 1883 1886 } -
trunk/src/libs/zlib-1.2.12/contrib/minizip/unzip.h
r76163 r95239 84 84 typedef struct tm_unz_s 85 85 { 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] */ 92 92 } tm_unz; 93 93 -
trunk/src/libs/zlib-1.2.12/contrib/minizip/zip.c
r76163 r95239 159 159 unsigned long keys[3]; /* keys defining the pseudo-random sequence */ 160 160 const z_crc_t* pcrc_32_tab; 161 intcrypt_header_size;161 unsigned crypt_header_size; 162 162 #endif 163 163 } curfile64_info; … … 302 302 } 303 303 304 if (ZWRITE64(*pzlib_filefunc_def,filestream,buf, nbByte)!=(uLong)nbByte)304 if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,(uLong)nbByte)!=(uLong)nbByte) 305 305 return ZIP_ERRNO; 306 306 else … … 338 338 year-=80; 339 339 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)); 342 342 } 343 343 … … 523 523 ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06)) 524 524 { 525 uPosFound = uReadPos+ i;525 uPosFound = uReadPos+(unsigned)i; 526 526 break; 527 527 } 528 528 529 530 529 if (uPosFound!=0) 530 break; 531 531 } 532 532 TRYFREE(buf); … … 587 587 if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07)) 588 588 { 589 uPosFound = uReadPos+ i;589 uPosFound = uReadPos+(unsigned)i; 590 590 break; 591 591 } … … 638 638 } 639 639 640 int LoadCentralDirectoryRecord(zip64_internal* pziinit)640 local int LoadCentralDirectoryRecord(zip64_internal* pziinit) 641 641 { 642 642 int err=ZIP_OK; … … 956 956 } 957 957 958 int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)958 local int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local) 959 959 { 960 960 /* write the local header */ … … 1035 1035 zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream); 1036 1036 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); 1039 1039 1040 1040 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8); … … 1517 1517 ZPOS64_T compressed_size; 1518 1518 uLong invalidValue = 0xffffffff; 1519 shortdatasize = 0;1519 unsigned datasize = 0; 1520 1520 int err=ZIP_OK; 1521 1521 … … 1753 1753 } 1754 1754 1755 int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)1755 local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip) 1756 1756 { 1757 1757 int err = ZIP_OK; … … 1775 1775 } 1776 1776 1777 int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)1777 local int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip) 1778 1778 { 1779 1779 int err = ZIP_OK; … … 1814 1814 return err; 1815 1815 } 1816 int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)1816 local int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip) 1817 1817 { 1818 1818 int err = ZIP_OK; … … 1862 1862 } 1863 1863 1864 int Write_GlobalComment(zip64_internal* zi, const char* global_comment)1864 local int Write_GlobalComment(zip64_internal* zi, const char* global_comment) 1865 1865 { 1866 1866 int err = ZIP_OK; … … 1963 1963 return ZIP_PARAMERROR; 1964 1964 1965 pNewHeader = (char*)ALLOC( *dataLen);1965 pNewHeader = (char*)ALLOC((unsigned)*dataLen); 1966 1966 pTmp = pNewHeader; 1967 1967 -
trunk/src/libs/zlib-1.2.12/contrib/minizip/zip.h
r76163 r95239 89 89 typedef struct tm_zip_s 90 90 { 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] */ 97 97 } tm_zip; 98 98 … … 144 144 zipcharpc* globalcomment, 145 145 zlib_filefunc64_def* pzlib_filefunc_def)); 146 147 extern zipFile ZEXPORT zipOpen3 OF((const void *pathname, 148 int append, 149 zipcharpc* globalcomment, 150 zlib_filefunc64_32_def* pzlib_filefunc64_32_def)); 146 151 147 152 extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file, -
trunk/src/libs/zlib-1.2.12/contrib/pascal/zlibpas.pas
r76163 r95239 11 11 12 12 const 13 ZLIB_VERSION = '1.2.1 1';13 ZLIB_VERSION = '1.2.12'; 14 14 ZLIB_VERNUM = $12a0; 15 15 -
trunk/src/libs/zlib-1.2.12/contrib/vstudio/readme.txt
r76163 r95239 1 Building instructions for the DLL versions of Zlib 1.2.1 11 Building instructions for the DLL versions of Zlib 1.2.12 2 2 ======================================================== 3 3 -
trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc10/zlib.rc
r76163 r95239 3 3 #define IDR_VERSION1 1 4 4 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 5 FILEVERSION 1, 2, 1 1, 06 PRODUCTVERSION 1, 2, 1 1, 05 FILEVERSION 1, 2, 12, 0 6 PRODUCTVERSION 1, 2, 12, 0 7 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 8 8 FILEFLAGS 0 … … 18 18 BEGIN 19 19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" 20 VALUE "FileVersion", "1.2.1 1\0"20 VALUE "FileVersion", "1.2.12\0" 21 21 VALUE "InternalName", "zlib\0" 22 22 VALUE "OriginalFilename", "zlibwapi.dll\0" 23 23 VALUE "ProductName", "ZLib.DLL\0" 24 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 25 VALUE "LegalCopyright", "(C) 1995-20 17Jean-loup Gailly & Mark Adler\0"25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 26 26 END 27 27 END -
trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc10/zlibvc.def
r76163 r95239 152 152 adler32_z @174 153 153 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 3 3 #define IDR_VERSION1 1 4 4 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 5 FILEVERSION 1, 2, 1 1, 06 PRODUCTVERSION 1, 2, 1 1, 05 FILEVERSION 1, 2, 12, 0 6 PRODUCTVERSION 1, 2, 12, 0 7 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 8 8 FILEFLAGS 0 … … 18 18 BEGIN 19 19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" 20 VALUE "FileVersion", "1.2.1 1\0"20 VALUE "FileVersion", "1.2.12\0" 21 21 VALUE "InternalName", "zlib\0" 22 22 VALUE "OriginalFilename", "zlibwapi.dll\0" 23 23 VALUE "ProductName", "ZLib.DLL\0" 24 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 25 VALUE "LegalCopyright", "(C) 1995-20 17Jean-loup Gailly & Mark Adler\0"25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 26 26 END 27 27 END -
trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc11/zlibvc.def
r76163 r95239 152 152 adler32_z @174 153 153 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 3 3 #define IDR_VERSION1 1 4 4 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 5 FILEVERSION 1, 2, 1 1, 06 PRODUCTVERSION 1, 2, 1 1, 05 FILEVERSION 1, 2, 12, 0 6 PRODUCTVERSION 1, 2, 12, 0 7 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 8 8 FILEFLAGS 0 … … 18 18 BEGIN 19 19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" 20 VALUE "FileVersion", "1.2.1 1\0"20 VALUE "FileVersion", "1.2.12\0" 21 21 VALUE "InternalName", "zlib\0" 22 22 VALUE "OriginalFilename", "zlibwapi.dll\0" 23 23 VALUE "ProductName", "ZLib.DLL\0" 24 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 25 VALUE "LegalCopyright", "(C) 1995-20 17Jean-loup Gailly & Mark Adler\0"25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 26 26 END 27 27 END -
trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc12/zlibvc.def
r76163 r95239 152 152 adler32_z @174 153 153 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 3 3 #define IDR_VERSION1 1 4 4 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 5 FILEVERSION 1, 2, 1 1, 06 PRODUCTVERSION 1, 2, 1 1, 05 FILEVERSION 1, 2, 12, 0 6 PRODUCTVERSION 1, 2, 12, 0 7 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 8 8 FILEFLAGS 0 … … 18 18 BEGIN 19 19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" 20 VALUE "FileVersion", "1.2.1 1\0"20 VALUE "FileVersion", "1.2.12\0" 21 21 VALUE "InternalName", "zlib\0" 22 22 VALUE "OriginalFilename", "zlibwapi.dll\0" 23 23 VALUE "ProductName", "ZLib.DLL\0" 24 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 25 VALUE "LegalCopyright", "(C) 1995-20 17Jean-loup Gailly & Mark Adler\0"25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 26 26 END 27 27 END -
trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc14/zlibvc.def
r76163 r95239 152 152 adler32_z @174 153 153 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 3 3 #define IDR_VERSION1 1 4 4 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 5 FILEVERSION 1, 2, 1 1, 06 PRODUCTVERSION 1, 2, 1 1, 05 FILEVERSION 1, 2, 12, 0 6 PRODUCTVERSION 1, 2, 12, 0 7 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 8 8 FILEFLAGS 0 … … 18 18 BEGIN 19 19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" 20 VALUE "FileVersion", "1.2.1 1\0"20 VALUE "FileVersion", "1.2.12\0" 21 21 VALUE "InternalName", "zlib\0" 22 22 VALUE "OriginalFilename", "zlibwapi.dll\0" 23 23 VALUE "ProductName", "ZLib.DLL\0" 24 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 25 VALUE "LegalCopyright", "(C) 1995-20 17Jean-loup Gailly & Mark Adler\0"25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 26 26 END 27 27 END -
trunk/src/libs/zlib-1.2.12/contrib/vstudio/vc9/zlibvc.def
r76163 r95239 152 152 adler32_z @174 153 153 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.