5 files changed, 35 insertions, 27 deletions

diff --git a/win32/DLL_FAQ.txt b/win32/DLL_FAQ.txt
index fb18e07..12c0090 100644
--- a/win32/DLL_FAQ.txt
+++ b/win32/DLL_FAQ.txt
@@ -16,7 +16,7 @@ in the zlib distribution, or at the following location:
 
     Pointers to a precompiled ZLIB1.DLL can be found in the zlib
     web site at:
-      http://www.zlib.org/
+      http://www.zlib.net/
 
     Applications that link to ZLIB1.DLL can rely on the following
     specification:
@@ -350,9 +350,9 @@ in the zlib distribution, or at the following location:
     your build is unofficial.  You should give it a different file
     name, and/or install it in a private directory that can be
     accessed by your application only, and is not visible to the
-    others (e.g. it's not in the SYSTEM or the SYSTEM32 directory,
-    and it's not in the PATH).  Otherwise, your build may clash
-    with applications that link to the official build.
+    others (i.e. it's neither in the PATH, nor in the SYSTEM or
+    SYSTEM32 directories).  Otherwise, your build may clash with
+    applications that link to the official build.
 
     For example, in Cygwin, zlib is linked to the Cygwin runtime
     CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL.
diff --git a/win32/Makefile.bor b/win32/Makefile.bor
index b802519..67dafaa 100644
--- a/win32/Makefile.bor
+++ b/win32/Makefile.bor
@@ -1,9 +1,6 @@
 # Makefile for zlib
 # Borland C++ for Win32
 #
-# Updated for zlib 1.2.x by Cosmin Truta, 11-Mar-2003
-# Last updated: 28-Aug-2003
-#
 # Usage:
 #  make -f win32/Makefile.bor
 #  make -f win32/Makefile.bor LOCAL_ZLIB=-DASMV OBJA=match.obj OBJPA=+match.obj
@@ -99,8 +96,8 @@ minigzip.exe: minigzip.obj $(ZLIB_LIB)
 
 # cleanup
 clean:
+        -del $(ZLIB_LIB)
         -del *.obj
-        -del *.lib
         -del *.exe
         -del *.tds
         -del zlib.bak
diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index 528ecaa..5900d66 100644
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -1,11 +1,5 @@
-# Makefile for zlib -- Microsoft (Visual) C
-#
-# Authors:
-#   Cosmin Truta, 11-Mar-2003
-#   Christian Spieler, 19-Mar-2003
-#
-# Last updated:
-#   Cosmin Truta, 27-Aug-2003
+# Makefile for zlib using Microsoft (Visual) C
+# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
 #
 # Usage:
 #   nmake -f win32/Makefile.msc            (standard build)
@@ -27,9 +21,10 @@ AS = ml
 LD = link
 AR = lib
 RC = rc
-CFLAGS  = -nologo -MD -O2 $(LOC)
+CFLAGS  = -nologo -MD -O2 -Oy- $(LOC)
+WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
 ASFLAGS = -coff
-LDFLAGS = -nologo -release
+LDFLAGS = -nologo -debug -release
 ARFLAGS = -nologo
 RCFLAGS = /dWIN32 /r
 
@@ -50,21 +45,31 @@ $(IMPLIB): $(SHAREDLIB)
 $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res
         $(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \
           -out:$@ $(OBJS) $(OBJA) zlib1.res
+        if exist $@.manifest \
+          mt -nologo -manifest $@.manifest -outputresource:$@;2
 
 example.exe: example.obj $(STATICLIB)
         $(LD) $(LDFLAGS) example.obj $(STATICLIB)
+        if exist $@.manifest \
+          mt -nologo -manifest $@.manifest -outputresource:$@;1
 
 minigzip.exe: minigzip.obj $(STATICLIB)
         $(LD) $(LDFLAGS) minigzip.obj $(STATICLIB)
+        if exist $@.manifest \
+          mt -nologo -manifest $@.manifest -outputresource:$@;1
 
 example_d.exe: example.obj $(IMPLIB)
         $(LD) $(LDFLAGS) -out:$@ example.obj $(IMPLIB)
+        if exist $@.manifest \
+          mt -nologo -manifest $@.manifest -outputresource:$@;1
 
 minigzip_d.exe: minigzip.obj $(IMPLIB)
         $(LD) $(LDFLAGS) -out:$@ minigzip.obj $(IMPLIB)
+        if exist $@.manifest \
+          mt -nologo -manifest $@.manifest -outputresource:$@;1
 
 .c.obj:
-        $(CC) -c $(CFLAGS) $<
+        $(CC) -c $(WFLAGS) $(CFLAGS) $<
 
 .asm.obj:
         $(AS) -c $(ASFLAGS) $<
@@ -123,4 +128,6 @@ clean:
         -del *.res
         -del *.exp
         -del *.exe
+        -del *.pdb
+        -del *.manifest
         -del foo.gz
diff --git a/win32/zlib.def b/win32/zlib.def
index a47cbc1..dbea9c5 100644
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -43,12 +43,15 @@ EXPORTS
     gzrewind
     gztell
     gzeof
+    gzdirect
     gzclose
     gzerror
     gzclearerr
 ; checksum functions
     adler32
+    adler32_combine
     crc32
+    crc32_combine
 ; various hacks, don't look :)
     deflateInit_
     deflateInit2_
diff --git a/win32/zlib1.rc b/win32/zlib1.rc
index 99025c9..0d1d7ff 100644
--- a/win32/zlib1.rc
+++ b/win32/zlib1.rc
@@ -1,19 +1,20 @@
-#include <windows.h>
+#include <winver.h>
+#include "../zlib.h"
 
 #ifdef GCC_WINDRES
 VS_VERSION_INFO         VERSIONINFO
 #else
 VS_VERSION_INFO         VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
 #endif
-  FILEVERSION           1,2,2,0
-  PRODUCTVERSION        1,2,2,0
+  FILEVERSION           ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+  PRODUCTVERSION        ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
   FILEFLAGSMASK         VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS             1
 #else
   FILEFLAGS             0
 #endif
-  FILEOS                VOS_DOS_WINDOWS32
+  FILEOS                VOS__WINDOWS32
   FILETYPE              VFT_DLL
   FILESUBTYPE           0       // not used
 BEGIN
@@ -23,13 +24,13 @@ BEGIN
     //language ID = U.S. English, char set = Windows, Multilingual
     BEGIN
       VALUE "FileDescription",  "zlib data compression library\0"
-      VALUE "FileVersion",      "1.2.3\0"
+      VALUE "FileVersion",      ZLIB_VERSION "\0"
       VALUE "InternalName",     "zlib1.dll\0"
-      VALUE "LegalCopyright",   "(C) 1995-2004 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright",   "(C) 1995-2006 Jean-loup Gailly & Mark Adler\0"
       VALUE "OriginalFilename", "zlib1.dll\0"
       VALUE "ProductName",      "zlib\0"
-      VALUE "ProductVersion",   "1.2.3\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
+      VALUE "ProductVersion",   ZLIB_VERSION "\0"
+      VALUE "Comments",         "For more information visit http://www.zlib.net/\0"
     END
   END
   BLOCK "VarFileInfo"