Updated zlib to 1.3.2

Updated version number and year.

README.md

@@ -19,8 +19,8 @@ Original author: **Anchorite (TeamX)**
     -s: create Fallout 1 DAT file
     -r: recurse into subdirectories
     -0..9: Compression method
-           (Fallout1: 0 - store, other numbers - compress (default))
+           Fallout 1: 0 = store; other numbers = compress (default)
-           (Fallout2: 0 - store, 1 - best speed, 9 - best compression (default))
+           Fallout 2: 0 = store; 1 = best speed; 9 = best compression (default)
     -p: extract without paths
     -d: extract files into specified directory
     -t: add files to specified directory of DAT file

src/dat2.cpp

@@ -41,8 +41,8 @@ int main(int argc, char* argv[])
 		return 1;
 	}
 	else {
-		printf("Fallout DAT file packer/unpacker, version 2.33a\n");
+		printf("Fallout DAT file packer/unpacker, version 2.33b\n");
-		printf("Copyright (C) 2004-2024, Anchorite (TeamX)\n");
+		printf("Copyright (C) 2004-2026, Anchorite (TeamX)\n");
 		printf("anchorite2001@yandex.ru\n");
 		printf("\n");
 
@@ -169,8 +169,8 @@ void PrintUsage(char* lpszFileName)
 	printf("  -s: create Fallout 1 DAT file\n");
 	printf("  -r: recurse into subdirectories\n");
 	printf("  -0..9: Compression method\n");
-	printf("         (Fallout1: 0 - store, other numbers - compress (default))\n");
+	printf("         Fallout 1: 0 = store; other numbers = compress (default)\n");
-	printf("         (Fallout2: 0 - store, 1 - best speed, 9 - best compression (default))\n");
+	printf("         Fallout 2: 0 = store; 1 = best speed; 9 = best compression (default)\n");
 	printf("  -p: extract without paths\n");
 	printf("  -d: extract files into specified directory\n");
 	printf("  -t: add files to specified directory of DAT file\n");

src/dat2.rc

@@ -65,8 +65,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,3,0
+ FILEVERSION 2,3,3,2
- PRODUCTVERSION 2,3,3,0
+ PRODUCTVERSION 2,3,3,2
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Anchorite (TeamX)"
             VALUE "FileDescription", "Fallout DAT file packer/unpacker"
-            VALUE "FileVersion", "2.33"
+            VALUE "FileVersion", "2.33b"
             VALUE "InternalName", "Fallout DAT file packer/unpacker"
-            VALUE "LegalCopyright", "Copyright (C) 2004-2023, Anchorite (TeamX)"
+            VALUE "LegalCopyright", "Copyright (C) 2004-2026, Anchorite (TeamX)"
             VALUE "OriginalFilename", "dat2.exe"
             VALUE "ProductName", "Fallout DAT file packer/unpacker"
-            VALUE "ProductVersion", "2.33"
+            VALUE "ProductVersion", "2.33b"
         END
     END
     BLOCK "VarFileInfo"

src/zlib/zconf.h

@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -33,7 +33,10 @@
 #  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
+#    define compress_z            z_compress_z
+#    define compress2_z           z_compress2_z
 #    define compressBound         z_compressBound
+#    define compressBound_z       z_compressBound_z
 #  endif
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
@@ -44,6 +47,7 @@
 #  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
+#  define deflateBound_z        z_deflateBound_z
 #  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
 #  define deflateGetDictionary  z_deflateGetDictionary
@@ -59,6 +63,7 @@
 #  define deflateSetDictionary  z_deflateSetDictionary
 #  define deflateSetHeader      z_deflateSetHeader
 #  define deflateTune           z_deflateTune
+#  define deflateUsed           z_deflateUsed
 #  define deflate_copyright     z_deflate_copyright
 #  define get_crc_table         z_get_crc_table
 #  ifndef Z_SOLO
@@ -128,9 +133,12 @@
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
+#  define inflate_fixed         z_inflate_fixed
 #  ifndef Z_SOLO
 #    define uncompress            z_uncompress
 #    define uncompress2           z_uncompress2
+#    define uncompress_z          z_uncompress_z
+#    define uncompress2_z         z_uncompress2_z
 #  endif
 #  define zError                z_zError
 #  ifndef Z_SOLO
@@ -234,10 +242,12 @@
 #  endif
 #endif
 
-#if defined(ZLIB_CONST) && !defined(z_const)
+#ifndef z_const
-#  define z_const const
+#  ifdef ZLIB_CONST
-#else
+#    define z_const const
-#  define z_const
+#  else
+#    define z_const
+#  endif
 #endif
 
 #ifdef Z_SOLO
@@ -433,11 +443,11 @@ typedef uLong FAR uLongf;
    typedef unsigned long z_crc_t;
 #endif
 
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#if HAVE_UNISTD_H-0     /* 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 */
+#if HAVE_STDARG_H-0     /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_STDARG_H
 #endif
 
@@ -470,12 +480,8 @@ typedef uLong FAR uLongf;
 #endif
 
 #ifndef Z_HAVE_UNISTD_H
-#  ifdef __WATCOMC__
+#  if defined(__WATCOMC__) || defined(__GO32__) || \
-#    define Z_HAVE_UNISTD_H
+      (defined(_LARGEFILE64_SOURCE) && !defined(_WIN32))
-#  endif
-#endif
-#ifndef Z_HAVE_UNISTD_H
-#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
 #    define Z_HAVE_UNISTD_H
 #  endif
 #endif
@@ -510,17 +516,19 @@ typedef uLong FAR uLongf;
 #endif
 
 #ifndef z_off_t
-#  define z_off_t long
+#  define z_off_t long long
 #endif
 
 #if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
+#elif defined(__MINGW32__)
+#  define z_off64_t long long
+#elif defined(_WIN32) && !defined(__GNUC__)
+#  define z_off64_t __int64
+#elif defined(__GO32__)
+#  define z_off64_t offset_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__)
+#  define z_off64_t z_off_t
-#    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 */