zlib 1.2.2v1.2.2

3 files changed, 12 insertions, 11 deletions

diff --git a/win32/DLL_FAQ.txt b/win32/DLL_FAQ.txt
index a3ed5dd..1746a95 100644
--- a/win32/DLL_FAQ.txt
+++ b/win32/DLL_FAQ.txt
@@ -175,7 +175,7 @@ in the zlib distribution, or at the following location:
     zlib in other programming languages.  Some of them, like Ada
     (GNAT) and Fortran (GNU G77), have C bindings implemented
     initially on Unix, and relying on the C calling convention.
-    On the other hand, the pre- .NET versions of Microsoft Visual
+    On the other hand, the pre- .Net versions of Microsoft Visual
     Basic require STDCALL, while Borland Delphi prefers, although
     it does not require, FASTCALL.
 
@@ -203,13 +203,11 @@ in the zlib distribution, or at the following location:
     zlib distribution.
 
 
- 8. I need a DLL for my Microsoft .NET project.  What can I do?
+ 8. I need to use zlib in my Microsoft .Net project.  What can I
+    do?
 
-  - We did not implement a COM wrapper around zlib, so you will
-    have to develop it yourself, or to get it from somewhere else.
-
-    If you would be so generous as to contribute such a wrapper,
-    we would like to include it in a future zlib version.
+  - Henrik Ravn has contributed a .Net wrapper around zlib.  Look
+    into contrib/dotzlib/, inside the zlib distribution.
 
 
  9. If my application uses ZLIB1.DLL, should I link it to
diff --git a/win32/VisualC.txt b/win32/VisualC.txt
new file mode 100644
index 0000000..579a5fc
--- /dev/null
+++ b/win32/VisualC.txt
@@ -0,0 +1,3 @@
+
+To build zlib using the Microsoft Visual C++ environment,
+use the appropriate project from the projects/ directory.
diff --git a/win32/zlib1.rc b/win32/zlib1.rc
index 130493a..162ab8f 100644
--- a/win32/zlib1.rc
+++ b/win32/zlib1.rc
@@ -5,8 +5,8 @@ VS_VERSION_INFO		VERSIONINFO
 #else
 VS_VERSION_INFO         VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
 #endif
-  FILEVERSION           1,2,1,2
-  PRODUCTVERSION        1,2,1,2
+  FILEVERSION           1,2,2
+  PRODUCTVERSION        1,2,2
   FILEFLAGSMASK         VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS             1
@@ -23,12 +23,12 @@ BEGIN
     //language ID = U.S. English, char set = Windows, Multilingual
     BEGIN
       VALUE "FileDescription",  "zlib data compression library\0"
-      VALUE "FileVersion",      "1.2.1.2\0"
+      VALUE "FileVersion",      "1.2.2\0"
       VALUE "InternalName",     "zlib1.dll\0"
       VALUE "LegalCopyright",   "(C) 1995-2004 Jean-loup Gailly & Mark Adler\0"
       VALUE "OriginalFilename", "zlib1.dll\0"
       VALUE "ProductName",      "zlib\0"
-      VALUE "ProductVersion",   "1.2.1.2\0"
+      VALUE "ProductVersion",   "1.2.2\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
     END
   END