ZipArchive: Update to the 4.6.9 release

1 files changed, 306 insertions, 99 deletions

diff --git a/zip/ZipArchive/zlib/zconf.h b/zip/ZipArchive/zlib/zconf.h
index 0c35ab5..896c2c3 100644
--- a/zip/ZipArchive/zlib/zconf.h
+++ b/zip/ZipArchive/zlib/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library

- * Copyright (C) 1995-2005 Jean-loup Gailly.

+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler

  * For conditions of distribution and use, see copyright notice in zlib.h

  */

 

@@ -8,6 +8,7 @@
 #ifndef ZCONF_H

 #define ZCONF_H

 

+// TD CHANGE: disabled warnings

 #if _MSC_VER > 1000

 	#pragma warning (disable : 4131)

 	#pragma warning (disable : 4115)

@@ -16,57 +17,146 @@
 	#pragma warning (disable : 4244)

 	#pragma warning (disable : 4702)

 	#pragma warning (disable : 4206)

+#if _MSC_VER > 1310

+	#pragma warning (disable : 6326)

+	#pragma warning (disable : 6385)

+#endif

 #endif

-

-

 /*

  * If you *really* need a unique prefix for all types and library functions,

  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.

+ * Even better than compiling with -DZ_PREFIX would be to use configure to set

+ * this permanently in zconf.h using "./configure --zprefix".

  */

-#ifdef Z_PREFIX

-//#  define deflateInit		zarch_deflateInit

-#  define deflateInit_		zarch_deflateInit_

-#  define deflate			zarch_deflate

-#  define deflateEnd		zarch_deflateEnd

-//#  define deflateInit2	zarch_deflateInit2

-#  define deflateInit2_		zarch_deflateInit2_

-#  define deflateSetDictionary zarch_deflateSetDictionary

-#  define deflateCopy		zarch_deflateCopy

-#  define deflateReset		zarch_deflateReset

-#  define deflateParams		zarch_deflateParams

-#  define deflateBound		zarch_deflateBound

-#  define deflatePrime      zarch_deflatePrime

-#  define deflateSetHeader	zarch_deflateSetHeader

-#  define deflateTune		zarch_deflateTune

-//#  define inflateInit		zarch_inflateInit

-//#  define inflateInit2	zarch_inflateInit2

-#  define inflateInit2_		zarch_inflateInit2_

-#  define inflateInit_		zarch_inflateInit_

-#  define inflate			zarch_inflate

-#  define inflateEnd		zarch_inflateEnd

-#  define inflateSetDictionary zarch_inflateSetDictionary

-#  define inflateSync		zarch_inflateSync

-#  define inflateSyncPoint zarch_inflateSyncPoint

-#  define inflateCopy		zarch_inflateCopy

-#  define inflateReset		zarch_inflateReset

-//#  define inflateBackInit	zarch_inflateBackInit

-#  define inflateBackInit_	zarch_inflateBackInit_

-#  define inflateBack       zarch_inflateBack

-#  define inflateBackEnd    zarch_inflateBackEnd

-#  define inflatePrime		zarch_inflatePrime

-#  define inflateGetHeader	zarch_inflateGetHeader

-#  define compress			zarch_compress

-#  define compress2			zarch_compress2

-#  define compressBound		zarch_compressBound

-#  define uncompress		zarch_uncompress

-#  define adler32			zarch_adler32

-#  define adler32_combine	zarch_adler32_combine

-#  define crc32_combine		zarch_crc32_combine

-#  define deflate_copyright zarch_deflate_copyright

-#  define inflate_copyright zarch_inflate_copyright

-#  define crc32				zarch_crc32

-#  define get_crc_table		zarch_get_crc_table

+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */

+#  define Z_PREFIX_SET

+// TD CHANGE: changed prefixes from z_ to zarch_

+/* all linked symbols and init macros */

+#  define _dist_code            zarch__dist_code

+#  define _length_code          zarch__length_code

+#  define _tr_align             zarch__tr_align			

+#  define _tr_flush_bits        zarch__tr_flush_bits

+#  define _tr_flush_block       zarch__tr_flush_block

+#  define _tr_init              zarch__tr_init

+#  define _tr_stored_block      zarch__tr_stored_block

+#  define _tr_tally             zarch__tr_tally

+#  define adler32               zarch_adler32

+#  define adler32_combine       zarch_adler32_combine

+#  define adler32_combine64     zarch_adler32_combine64

+#  define adler32_z             zarch_adler32_z

+#  ifndef Z_SOLO

+	#  define compress              zarch_compress

+	#  define compress2             zarch_compress2

+	#  define compressBound         zarch_compressBound

+#  endif

+#  define crc32                 zarch_crc32

+#  define crc32_combine         zarch_crc32_combine

+#  define crc32_combine64       zarch_crc32_combine64 

+#  define crc32_combine_gen     zarch_crc32_combine_gen

+#  define crc32_combine_gen64   zarch_crc32_combine_gen64

+#  define crc32_combine_op      zarch_crc32_combine_op

+#  define crc32_z               zarch_crc32_z

+#  define deflate               zarch_deflate

+#  define deflateBound          zarch_deflateBound

+#  define deflateCopy           zarch_deflateCopy

+#  define deflateEnd            zarch_deflateEnd

+#  define deflateGetDictionary  zarch_deflateGetDictionary

+#  define deflateInit           zarch_deflateInit

+#  define deflateInit2          zarch_deflateInit2

+#  define deflateInit2_         zarch_deflateInit2_

+#  define deflateInit_          zarch_deflateInit_

+#  define deflateParams         zarch_deflateParams

+#  define deflatePending        zarch_deflatePending

+#  define deflatePrime          zarch_deflatePrime

+#  define deflateReset          zarch_deflateReset

+#  define deflateResetKeep      zarch_deflateResetKeep

+#  define deflateSetDictionary  zarch_deflateSetDictionary

+#  define deflateSetHeader      zarch_deflateSetHeader

+#  define deflateTune           zarch_deflateTune

+#  define deflate_copyright     zarch_deflate_copyright

+#  define get_crc_table         zarch_get_crc_table

+#  ifndef Z_SOLO

+#  define gz_error              zarch_gz_error

+#  define gz_intmax             zarch_gz_intmax

+#  define gz_strwinerror        zarch_gz_strwinerror

+#  define gzbuffer              zarch_gzbuffer

+#  define gzclearerr            zarch_gzclearerr

+#  define gzclose               zarch_gzclose

+#  define gzclose_r             zarch_gzclose_r

+#  define gzclose_w             zarch_gzclose_w

+#  define gzdirect              zarch_gzdirect

+#  define gzdopen               zarch_gzdopen

+#  define gzeof                 zarch_gzeof

+#  define gzerror               zarch_gzerror

+#  define gzflush               zarch_gzflush

+#  define gzfread               zarch_gzfread

+#  define gzfwrite              zarch_gzfwrite

+#  define gzgetc                zarch_gzgetc

+#  define gzgetc_               zarch_gzgetc_

+#  define gzgets                zarch_gzgets

+#  define gzoffset              zarch_gzoffset

+#  define gzoffset64            zarch_gzoffset64

+#  define gzopen                zarch_gzopen

+#  define gzopen64              zarch_gzopen64

+#    ifdef _WIN32

+#      define gzopen_w          zarch_gzopen_w

+#    endif

+#  define gzprintf              zarch_gzprintf		

+#  define gzputc                zarch_gzputc

+#  define gzputs                zarch_gzputs

+#  define gzread                zarch_gzread

+#  define gzrewind              zarch_gzrewind

+#  define gzseek                zarch_gzseek

+#  define gzseek64              zarch_gzseek64

+#  define gzsetparams           zarch_gzsetparams

+#  define gztell                zarch_gztell

+#  define gztell64              zarch_gztell64

+#  define gzungetc              zarch_gzungetc

+#  define gzvprintf             zarch_gzvprintf

+#  define gzwrite               zarch_gzwrite

+#  endif

+#  define inflate               zarch_inflate

+#  define inflateBack           zarch_inflateBack

+#  define inflateBackEnd        zarch_inflateBackEnd

+#  define inflateBackInit       zarch_inflateBackInit

+#  define inflateBackInit_      zarch_inflateBackInit_

+#  define inflateCodesUsed      zarch_inflateCodesUsed

+#  define inflateCopy           zarch_inflateCopy

+#  define inflateEnd            zarch_inflateEnd

+#  define inflateGetDictionary  zarch_inflateGetDictionary

+#  define inflateGetHeader      zarch_inflateGetHeader

+#  define inflateInit           zarch_inflateInit

+#  define inflateInit2          zarch_inflateInit2

+#  define inflateInit2_         zarch_inflateInit2_

+#  define inflateInit_          zarch_inflateInit_

+#  define inflateMark           zarch_inflateMark

+#  define inflatePrime          zarch_inflatePrime

+#  define inflateReset          zarch_inflateReset

+#  define inflateReset2         zarch_inflateReset2

+#  define inflateResetKeep      zarch_inflateResetKeep

+#  define inflateSetDictionary  zarch_inflateSetDictionary

+#  define inflateSync           zarch_inflateSync

+#  define inflateSyncPoint      zarch_inflateSyncPoint

+#  define inflateUndermine      zarch_inflateUndermine

+#  define inflateValidate       zarch_inflateValidate

+#  define inflate_copyright     zarch_inflate_copyright

+#  define inflate_fast          zarch_inflate_fast

+#  define inflate_table         zarch_inflate_table

+#  ifndef Z_SOLO

+	#  define uncompress            zarch_uncompress

+    #  define uncompress2         zarch_uncompress2

+#  endif

+#  define zError                zarch_zError

+#  ifndef Z_SOLO

+	#  define zcalloc               zarch_zcalloc

+	#  define zcfree                zarch_zcfree

+#  endif

+#  define zlibCompileFlags      zarch_zlibCompileFlags

+#  define zlibVersion           zarch_zlibVersion

+				 

+// TD CHANGE: added more definitions

 #  define zError            zarch_zError

+#  define z_errmsg			zarch_z_errmsg

 #  define z_stream			zarch_z_stream

 #  define z_stream_s		zarch_z_stream_s

 #  define alloc_func        zarch_alloc_func

@@ -91,21 +181,34 @@
 #  define z_streamp			zarch_z_streamp

 #  define deflate_rle		zarch_deflate_rle

 #  define inflate_state		zarch_inflate_state

-#  define inflate_fast		zarch_inflate_fast

-#  define inflate_table		zarch_inflate_table

-#  define updatewindow		zarch_updatewindow

-//#  define inflate_mode	zarch_inflate_mode

-//#  define send_bits		zarch_send_bits

-#  define zlibVersion		zarch_zlibVersion

-#  define zlibCompileFlags	zarch_zlibCompileFlags

-#  define zError			zarch_zError

-#  define _tr_init			zarch_tr_init

-#  define _tr_tally			zarch_tr_tally

-#  define _tr_flush_block	zarch_tr_flush_block

-#  define _tr_align			zarch_tr_align

-#  define _tr_stored_block	zarch_tr_stored_block

-#  define _dist_code		zarch_dist_code

-#  define _length_code		zarch_length_code

+									  

+// TD CHANGE: changed prefixes from z_ to zarch_

+/* all zlib typedefs in zlib.h and zconf.h */

+#  define Byte                  zarch_Byte

+#  define Bytef                 zarch_Bytef

+#  define alloc_func            zarch_alloc_func

+#  define charf                 zarch_charf

+#  define free_func             zarch_free_func

+#  ifndef Z_SOLO

+	#  define gzFile                zarch_gzFile

+#  endif

+#  define gz_header             zarch_gzarch_header

+#  define gz_headerp            zarch_gzarch_headerp

+#  define in_func               zarch_in_func

+#  define intf                  zarch_intf

+#  define out_func              zarch_out_func

+#  define uInt                  zarch_uInt

+#  define uIntf                 zarch_uIntf

+#  define uLong                 zarch_uLong

+#  define uLongf                zarch_uLongf

+#  define voidp                 zarch_voidp

+#  define voidpc                zarch_voidpc

+#  define voidpf                zarch_voidpf

+

+/* all zlib structs in zlib.h and zconf.h */

+#  define gz_header_s           zarch_gz_header_s

+#  define internal_state        zarch_internal_state

+

 #endif

 

 #if defined(__MSDOS__) && !defined(MSDOS)

@@ -119,7 +222,7 @@
 #endif

 #if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)

 #  ifndef WIN32

-#  define WIN32

+#    define WIN32

 #  endif

 #endif

 #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)

@@ -174,9 +277,25 @@
 #  endif

 #endif

 

-/* Some Mac compilers merge all .h files incorrectly: */

-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)

-#  define NO_DUMMY_DECL

+#if defined(ZLIB_CONST) && !defined(z_const)

+#  define z_const const

+#else

+#  define z_const

+#endif

+

+#ifdef Z_SOLO

+   typedef unsigned long z_size_t;

+#else

+#  define z_longlong long long

+#  if defined(NO_SIZE_T)

+     typedef unsigned NO_SIZE_T z_size_t;

+#  elif defined(STDC)

+#    include <stddef.h>

+     typedef size_t z_size_t;

+#  else

+     typedef unsigned long z_size_t;

+#  endif

+#  undef z_longlong

 #endif

 

 /* Maximum value for memLevel in deflateInit2 */

@@ -206,7 +325,7 @@
  Of course this will generally degrade compression (there's no free lunch).

 

    The memory requirements for inflate are (in bytes) 1 << windowBits

- that is, 32K for windowBits=15 (default value) plus a few kilobytes

+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes

  for small objects.

 */

 

@@ -220,6 +339,14 @@
 #  endif

 #endif

 

+#ifndef Z_ARG /* function prototypes for stdarg */

+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)

+#    define Z_ARG(args)  args

+#  else

+#    define Z_ARG(args)  ()

+#  endif

+#endif

+

 /* The following definitions for FAR are needed only for MSDOS mixed

  * model programming (small or medium model with some far allocations).

  * This was tested only with MSC; for other MSDOS compilers you may have

@@ -268,6 +395,9 @@
 #    ifdef FAR

 #      undef FAR

 #    endif

+#    ifndef WIN32_LEAN_AND_MEAN

+#      define WIN32_LEAN_AND_MEAN

+#    endif

 #    include <windows.h>

      /* No need for _export, use ZLIB.DEF instead. */

      /* For complete Windows compatibility, use WINAPI, not __stdcall. */

@@ -312,13 +442,11 @@ typedef unsigned char  Byte;  /* 8 bits */
 typedef unsigned int   uInt;  /* 16 bits or more */

 typedef unsigned long  uLong; /* 32 bits or more */

 

+// TD CHANGE: added

 #include "../_features.h"

 

-#ifdef _ZIP64

-	typedef unsigned __int64 uLongLong;

-#else

+// TD CHANGE: added

 	typedef unsigned long uLongLong;

-#endif

 

 #ifdef SMALL_MEDIUM

    /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */

@@ -341,49 +469,128 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;

 #endif

 

-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */

-#  include <sys/types.h> /* for off_t */

-#  include <unistd.h>    /* for SEEK_* and off_t */

-#  ifdef VMS

-#    include <unixio.h>   /* for off_t */

+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)

+#  include <limits.h>

+#  if (UINT_MAX == 0xffffffffUL)

+#    define Z_U4 unsigned

+#  elif (ULONG_MAX == 0xffffffffUL)

+#    define Z_U4 unsigned long

+#  elif (USHRT_MAX == 0xffffffffUL)

+#    define Z_U4 unsigned short

+#  endif

+#endif

+

+#ifdef Z_U4

+   typedef Z_U4 z_crc_t;

+#else

+   typedef unsigned long z_crc_t;

+#endif

+

+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */

+#  define Z_HAVE_UNISTD_H

+#endif

+

+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */

+#  define Z_HAVE_STDARG_H

+#endif

+

+#ifdef STDC

+#  ifndef Z_SOLO

+#    include <sys/types.h>      /* for off_t */

+#  endif

+#endif

+

+#if defined(STDC) || defined(Z_HAVE_STDARG_H)

+#  ifndef Z_SOLO

+#    include <stdarg.h>         /* for va_list */

 #  endif

-#  define z_off_t  off_t

 #endif

-#ifndef SEEK_SET

+

+#ifdef _WIN32

+#  ifndef Z_SOLO

+#    include <stddef.h>         /* for wchar_t */

+#  endif

+#endif

+

+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and

+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even

+ * though the former does not conform to the LFS document), but considering

+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as

+ * equivalently requesting no 64-bit operations

+ */

+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1

+#  undef _LARGEFILE64_SOURCE

+#endif

+

+#ifndef Z_HAVE_UNISTD_H

+#  ifdef __WATCOMC__

+#    define Z_HAVE_UNISTD_H

+#  endif

+#endif

+#ifndef Z_HAVE_UNISTD_H

+#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)

+#    define Z_HAVE_UNISTD_H

+#  endif

+#endif

+#ifndef Z_SOLO

+#  if defined(Z_HAVE_UNISTD_H)

+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */

+#    ifdef VMS

+#      include <unixio.h>       /* for off_t */

+#    endif

+#    ifndef z_off_t

+#      define z_off_t off_t

+#    endif

+#  endif

+#endif

+

+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0

+#  define Z_LFS64

+#endif

+

+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)

+#  define Z_LARGE64

+#endif

+

+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)

+#  define Z_WANT64

+#endif

+

+#if !defined(SEEK_SET) && !defined(Z_SOLO)

 #  define SEEK_SET        0       /* Seek from beginning of file.  */

 #  define SEEK_CUR        1       /* Seek from current position.  */

 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */

 #endif

-#ifndef z_off_t

-#  define  z_off_t long

-#endif

 

-#if defined(__OS400__)

-#define NO_vsnprintf

+#ifndef z_off_t

+#  define z_off_t long

 #endif

 

-#if defined(__MVS__)

-#  define NO_vsnprintf

-#  ifdef FAR

-#    undef FAR

+#if !defined(_WIN32) && defined(Z_LARGE64)

+#  define z_off64_t off64_t

+#else

+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)

+#    define z_off64_t __int64

+#  else

+#    define z_off64_t z_off_t

 #  endif

 #endif

 

 /* MVS linker does not support external names larger than 8 bytes */

 #if defined(__MVS__)

-#   pragma map(deflateInit_,"DEIN")

-#   pragma map(deflateInit2_,"DEIN2")

-#   pragma map(deflateEnd,"DEEND")

-#   pragma map(deflateBound,"DEBND")

-#   pragma map(inflateInit_,"ININ")

-#   pragma map(inflateInit2_,"ININ2")

-#   pragma map(inflateEnd,"INEND")

-#   pragma map(inflateSync,"INSY")

-#   pragma map(inflateSetDictionary,"INSEDI")

-#   pragma map(compressBound,"CMBND")

-#   pragma map(inflate_table,"INTABL")

-#   pragma map(inflate_fast,"INFA")

-#   pragma map(inflate_copyright,"INCOPY")

+  #pragma map(deflateInit_,"DEIN")

+  #pragma map(deflateInit2_,"DEIN2")

+  #pragma map(deflateEnd,"DEEND")

+  #pragma map(deflateBound,"DEBND")

+  #pragma map(inflateInit_,"ININ")

+  #pragma map(inflateInit2_,"ININ2")

+  #pragma map(inflateEnd,"INEND")

+  #pragma map(inflateSync,"INSY")

+  #pragma map(inflateSetDictionary,"INSEDI")

+  #pragma map(compressBound,"CMBND")

+  #pragma map(inflate_table,"INTABL")

+  #pragma map(inflate_fast,"INFA")

+  #pragma map(inflate_copyright,"INCOPY")

 #endif

 

 #endif /* ZCONF_H */