zlib is a static library, not (necessarily) a driver library. Moved it back to reactos/lib (who moved it?)

svn path=/trunk/; revision=4419

reactos/Makefile

@@ -30,7 +30,7 @@ BUS = acpi isapnp pci
 # advapi32 crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll ole32
 # oleaut32 psapi rpcrt4 secur32 shell32 user32 version ws2help ws2_32 wsock32 wshirda
 DLLS = advapi32 crtdll fmifs gdi32 kernel32 packet msafd msvcrt ntdll \
-       secur32 user32 version winedbgc ws2help ws2_32 wshirda #winmm 
+       secur32 user32 version winedbgc ws2help ws2_32 wshirda zlib #winmm 
 
 SUBSYS = smss win32k csrss ntvdm
 
@@ -46,7 +46,7 @@ LOADERS = dos
 
 # Driver support libraries
 #bzip2 zlib
-DRIVERS_LIB = bzip2 zlib
+DRIVERS_LIB = bzip2
 
 # Kernel mode device drivers
 # Obsolete: ide

reactos/drivers/lib/zlib/makefile.reactos

@@ -1,26 +0,0 @@
-# $Id: makefile.reactos,v 1.2 2002/06/07 22:59:01 ekohl Exp $
-
-PATH_TO_TOP = ../../..
-
-TARGET_TYPE = library
-
-TARGET_NAME = zlib
-
-TARGET_CFLAGS = \
- -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
- -Wstrict-prototypes -Wmissing-prototypes
-
-TARGET_OBJECTS = \
- adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o zutil.o \
- inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
- 
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# FIXME: this rule should be defined in helper.mk
-$(TARGET_NAME).nostrip.a:
-	@echo FIXME!
-	@echo FIXME!>$@
-
-# EOF

reactos/lib/zlib/ChangeLog

@@ -225,7 +225,7 @@ Changes in 1.0.6 (19 Jan 1998)
 - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
 - added makelcc.bat for lcc-win32 (Tom St Denis)
 - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id: ChangeLog,v 1.1 2002/03/17 21:05:01 hyperion Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- Avoid expanded $Id: ChangeLog,v 1.1 2003/03/24 01:28:35 hyperion Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
 - check for unistd.h in configure (for off_t)
 - remove useless check parameter in inflate_blocks_free
 - avoid useless assignment of s->check to itself in inflate_blocks_new

reactos/lib/zlib/Make_vms.com

@@ -1,115 +1,115 @@
-$! make libz under VMS
+$! make libz under VMS
-$! written by Martin P.J. Zinser <m.zinser@gsi.de>
+$! written by Martin P.J. Zinser <m.zinser@gsi.de>
-$!
+$!
-$! Look for the compiler used
+$! Look for the compiler used
-$!
+$!
-$ ccopt = ""
+$ ccopt = ""
-$ if f$getsyi("HW_MODEL").ge.1024
+$ if f$getsyi("HW_MODEL").ge.1024
-$ then
+$ then
-$  ccopt = "/prefix=all"+ccopt
+$  ccopt = "/prefix=all"+ccopt
-$  comp  = "__decc__=1"
+$  comp  = "__decc__=1"
-$  if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$  if f$trnlnm("SYS").eqs."" then define sys sys$library:
-$ else
+$ else
-$  if f$search("SYS$SYSTEM:DECC$COMPILER.EXE").eqs.""
+$  if f$search("SYS$SYSTEM:DECC$COMPILER.EXE").eqs.""
-$   then
+$   then
-$    comp  = "__vaxc__=1"
+$    comp  = "__vaxc__=1"
-$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
-$   else
+$   else
-$    if f$trnlnm("SYS").eqs."" then define sys decc$library_include:
+$    if f$trnlnm("SYS").eqs."" then define sys decc$library_include:
-$    ccopt = "/decc/prefix=all"+ccopt
+$    ccopt = "/decc/prefix=all"+ccopt
-$    comp  = "__decc__=1"
+$    comp  = "__decc__=1"
-$  endif
+$  endif
-$ endif
+$ endif
-$!
+$!
-$! Build the thing plain or with mms
+$! Build the thing plain or with mms
-$!
+$!
-$ write sys$output "Compiling Zlib sources ..."
+$ write sys$output "Compiling Zlib sources ..."
-$ if f$search("SYS$SYSTEM:MMS.EXE").eqs.""
+$ if f$search("SYS$SYSTEM:MMS.EXE").eqs.""
-$  then
+$  then
-$   dele example.obj;*,minigzip.obj;*
+$   dele example.obj;*,minigzip.obj;*
-$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
+$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
-                adler32.c zlib.h zconf.h
+                adler32.c zlib.h zconf.h
-$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
+$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
-                compress.c zlib.h zconf.h
+                compress.c zlib.h zconf.h
-$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
+$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
-                crc32.c zlib.h zconf.h
+                crc32.c zlib.h zconf.h
-$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
+$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
-                deflate.c deflate.h zutil.h zlib.h zconf.h
+                deflate.c deflate.h zutil.h zlib.h zconf.h
-$   CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" -
+$   CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" -
-                gzio.c zutil.h zlib.h zconf.h
+                gzio.c zutil.h zlib.h zconf.h
-$   CALL MAKE infblock.OBJ "CC ''CCOPT' infblock" -
+$   CALL MAKE infblock.OBJ "CC ''CCOPT' infblock" -
-                infblock.c zutil.h zlib.h zconf.h infblock.h
+                infblock.c zutil.h zlib.h zconf.h infblock.h
-$   CALL MAKE infcodes.OBJ "CC ''CCOPT' infcodes" -
+$   CALL MAKE infcodes.OBJ "CC ''CCOPT' infcodes" -
-                infcodes.c zutil.h zlib.h zconf.h inftrees.h
+                infcodes.c zutil.h zlib.h zconf.h inftrees.h
-$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
+$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
-                inffast.c zutil.h zlib.h zconf.h inffast.h
+                inffast.c zutil.h zlib.h zconf.h inffast.h
-$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
+$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
-                inflate.c zutil.h zlib.h zconf.h infblock.h
+                inflate.c zutil.h zlib.h zconf.h infblock.h
-$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
+$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
-                inftrees.c zutil.h zlib.h zconf.h inftrees.h
+                inftrees.c zutil.h zlib.h zconf.h inftrees.h
-$   CALL MAKE infutil.OBJ "CC ''CCOPT' infutil" -
+$   CALL MAKE infutil.OBJ "CC ''CCOPT' infutil" -
-                infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+                infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
-$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
+$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
-                trees.c deflate.h zutil.h zlib.h zconf.h
+                trees.c deflate.h zutil.h zlib.h zconf.h
-$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
+$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
-                uncompr.c zlib.h zconf.h
+                uncompr.c zlib.h zconf.h
-$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
+$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
-                zutil.c zutil.h zlib.h zconf.h
+                zutil.c zutil.h zlib.h zconf.h
-$   write sys$output "Building Zlib ..."
+$   write sys$output "Building Zlib ..."
-$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
+$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
-$   write sys$output "Building example..."
+$   write sys$output "Building example..."
-$   CALL MAKE example.OBJ "CC ''CCOPT' example" -
+$   CALL MAKE example.OBJ "CC ''CCOPT' example" -
-                example.c zlib.h zconf.h
+                example.c zlib.h zconf.h
-$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
+$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
-$   write sys$output "Building minigzip..."
+$   write sys$output "Building minigzip..."
-$   CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
+$   CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
-                minigzip.c zlib.h zconf.h
+                minigzip.c zlib.h zconf.h
-$   call make minigzip.exe - 
+$   call make minigzip.exe - 
-                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" - 
+                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" - 
-                minigzip.obj libz.olb
+                minigzip.obj libz.olb
-$  else
+$  else
-$   mms/macro=('comp')
+$   mms/macro=('comp')
-$  endif
+$  endif
-$ write sys$output "Zlib build completed"
+$ write sys$output "Zlib build completed"
-$ exit
+$ exit
-$!
+$!
-$!
+$!
-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
+$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
-$ V = 'F$Verify(0)
+$ V = 'F$Verify(0)
-$! P1 = What we are trying to make
+$! P1 = What we are trying to make
-$! P2 = Command to make it
+$! P2 = Command to make it
-$! P3 - P8  What it depends on
+$! P3 - P8  What it depends on
-$
+$
-$ If F$Search(P1) .Eqs. "" Then Goto Makeit
+$ If F$Search(P1) .Eqs. "" Then Goto Makeit
-$ Time = F$CvTime(F$File(P1,"RDT"))
+$ Time = F$CvTime(F$File(P1,"RDT"))
-$arg=3
+$arg=3
-$Loop:
+$Loop:
-$       Argument = P'arg
+$       Argument = P'arg
-$       If Argument .Eqs. "" Then Goto Exit
+$       If Argument .Eqs. "" Then Goto Exit
-$       El=0
+$       El=0
-$Loop2:
+$Loop2:
-$       File = F$Element(El," ",Argument)
+$       File = F$Element(El," ",Argument)
-$       If File .Eqs. " " Then Goto Endl
+$       If File .Eqs. " " Then Goto Endl
-$       AFile = ""
+$       AFile = ""
-$Loop3:
+$Loop3:
-$       OFile = AFile
+$       OFile = AFile
-$       AFile = F$Search(File)
+$       AFile = F$Search(File)
-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
+$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
+$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
-$       Goto Loop3
+$       Goto Loop3
-$NextEL:
+$NextEL:
-$       El = El + 1
+$       El = El + 1
-$       Goto Loop2
+$       Goto Loop2
-$EndL:
+$EndL:
-$ arg=arg+1
+$ arg=arg+1
-$ If arg .Le. 8 Then Goto Loop
+$ If arg .Le. 8 Then Goto Loop
-$ Goto Exit
+$ Goto Exit
-$
+$
-$Makeit:
+$Makeit:
-$ VV=F$VERIFY(0)
+$ VV=F$VERIFY(0)
-$ write sys$output P2
+$ write sys$output P2
-$ 'P2
+$ 'P2
-$ VV='F$Verify(VV)
+$ VV='F$Verify(VV)
-$Exit:
+$Exit:
-$ If V Then Set Verify
+$ If V Then Set Verify
-$ENDSUBROUTINE
+$ENDSUBROUTINE

reactos/lib/zlib/Makefile

@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.6 2003/01/01 11:11:48 robd Exp $
+# $Id: Makefile,v 1.1 2003/03/24 01:28:35 hyperion Exp $
 
-PATH_TO_TOP = ../../..
+PATH_TO_TOP = ../..
 
 TARGET_TYPE = library
 

reactos/lib/zlib/adler32.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: adler32.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: adler32.c,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #include "zlib.h"
 

reactos/lib/zlib/compress.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: compress.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: compress.c,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #include "zlib.h"
 

reactos/lib/zlib/contrib/asm386/zlibvc.dsw

@@ -1,41 +1,41 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
+Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
+
-###############################################################################
+###############################################################################
-
+
-Project: "zlibstat"=.\zlibstat.dsp - Package Owner=<4>
+Project: "zlibstat"=.\zlibstat.dsp - Package Owner=<4>
-
+
-Package=<5>
+Package=<5>
-{{{
+{{{
-}}}
+}}}
-
+
-Package=<4>
+Package=<4>
-{{{
+{{{
-}}}
+}}}
-
+
-###############################################################################
+###############################################################################
-
+
-Project: "zlibvc"=.\zlibvc.dsp - Package Owner=<4>
+Project: "zlibvc"=.\zlibvc.dsp - Package Owner=<4>
-
+
-Package=<5>
+Package=<5>
-{{{
+{{{
-}}}
+}}}
-
+
-Package=<4>
+Package=<4>
-{{{
+{{{
-}}}
+}}}
-
+
-###############################################################################
+###############################################################################
-
+
-Global:
+Global:
-
+
-Package=<5>
+Package=<5>
-{{{
+{{{
-}}}
+}}}
-
+
-Package=<3>
+Package=<3>
-{{{
+{{{
-}}}
+}}}
-
+
-###############################################################################
+###############################################################################
-
+

reactos/lib/zlib/contrib/iostream2/zstream.h

@@ -21,7 +21,7 @@
 
 /*
  * zstream.h - C++ interface to the 'zlib' general purpose compression library
- * $Id: zstream.h,v 1.1 2002/03/17 21:05:04 hyperion Exp $
+ * $Id: zstream.h,v 1.1 2003/03/24 01:28:38 hyperion Exp $
  */
 
 #include <strstream.h>

reactos/lib/zlib/contrib/minizip/zlibvc.dsw

@@ -1,41 +1,41 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
+Microsoft Developer Studio Workspace File, Format Version 5.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
+
-###############################################################################
+###############################################################################
-
+
-Project: "zlibstat"=.\zlibstat.dsp - Package Owner=<4>
+Project: "zlibstat"=.\zlibstat.dsp - Package Owner=<4>
-
+
-Package=<5>
+Package=<5>
-{{{
+{{{
-}}}
+}}}
-
+
-Package=<4>
+Package=<4>
-{{{
+{{{
-}}}
+}}}
-
+
-###############################################################################
+###############################################################################
-
+
-Project: "zlibvc"=.\zlibvc.dsp - Package Owner=<4>
+Project: "zlibvc"=.\zlibvc.dsp - Package Owner=<4>
-
+
-Package=<5>
+Package=<5>
-{{{
+{{{
-}}}
+}}}
-
+
-Package=<4>
+Package=<4>
-{{{
+{{{
-}}}
+}}}
-
+
-###############################################################################
+###############################################################################
-
+
-Global:
+Global:
-
+
-Package=<5>
+Package=<5>
-{{{
+{{{
-}}}
+}}}
-
+
-Package=<3>
+Package=<3>
-{{{
+{{{
-}}}
+}}}
-
+
-###############################################################################
+###############################################################################
-
+

reactos/lib/zlib/crc32.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: crc32.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: crc32.c,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #include "zlib.h"
 

reactos/lib/zlib/deflate.c

@@ -47,7 +47,7 @@
  *
  */
 
-/* @(#) $Id: deflate.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: deflate.c,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #include "deflate.h"
 

reactos/lib/zlib/deflate.h

@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: deflate.h,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: deflate.h,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #ifndef _DEFLATE_H
 #define _DEFLATE_H

reactos/lib/zlib/example.c

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: example.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: example.c,v 1.1 2003/03/24 01:28:35 hyperion Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"

reactos/lib/zlib/gzio.c

@@ -5,7 +5,7 @@
  * Compile this file with -DNO_DEFLATE to avoid the compression code.
  */
 
-/* @(#) $Id: gzio.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: gzio.c,v 1.1 2003/03/24 01:28:36 hyperion Exp $ */
 
 #include <stdio.h>
 

reactos/lib/zlib/minigzip.c

@@ -13,7 +13,7 @@
  * or in pipe mode.
  */
 
-/* @(#) $Id: minigzip.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: minigzip.c,v 1.1 2003/03/24 01:28:36 hyperion Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"

reactos/lib/zlib/trees.c

@@ -29,7 +29,7 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* @(#) $Id: trees.c,v 1.1 2002/03/17 21:05:02 hyperion Exp $ */
+/* @(#) $Id: trees.c,v 1.1 2003/03/24 01:28:36 hyperion Exp $ */
 
 /* #define GEN_TREES_H */