zlib 1.2.12v1.2.12

2 files changed, 9 insertions, 4 deletions

diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc
index 0e5b703..9475873 100644
--- a/contrib/vstudio/vc12/zlib.rc
+++ b/contrib/vstudio/vc12/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1, 2, 11, 1
-  PRODUCTVERSION 1, 2, 11, 1
+  FILEVERSION    1, 2, 12, 0
+  PRODUCTVERSION 1, 2, 12, 0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
   FILEOS        VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.2.11.1\0"
+      VALUE "FileVersion",      "1.2.12\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlibwapi.dll\0"
       VALUE "ProductName",      "ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def
index 54e683d..ba09bc1 100644
--- a/contrib/vstudio/vc12/zlibvc.def
+++ b/contrib/vstudio/vc12/zlibvc.def
@@ -151,3 +151,8 @@ EXPORTS
         deflateGetDictionary                    @173

         adler32_z                               @174

         crc32_z                                 @175

+

+; zlib1 v1.2.12 added:

+                crc32_combine_gen                                               @176

+                crc32_combine_gen64                                             @177

+                crc32_combine_op                                                @178