tRead registry key correctly, and update zlib makefile for new zlib release. - … | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit ee740e6b3096510997d16713a6a2fea06314615a | |
parent c9fc299767990f27d2486f76fd51866a1c6c8589 | |
Author: Ben Webb <[email protected]> | |
Date: Mon, 25 Oct 2004 18:18:00 +0000 | |
Read registry key correctly, and update zlib makefile for new zlib release. | |
Diffstat: | |
M win32/util.c | 29 ++++++++++++++++++----------- | |
M win32/zlib/Makefile.nocygwin | 139 +++++++++++++++--------------… | |
2 files changed, 87 insertions(+), 81 deletions(-) | |
--- | |
diff --git a/win32/util.c b/win32/util.c | |
t@@ -209,20 +209,26 @@ void bstr_assign_progfilesdir(bstr *str) | |
void bstr_append_progfilesdir(bstr *str) | |
{ | |
HKEY key; | |
- int len; | |
- static const *subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion"; | |
- static const *subval = "ProgramFilesDir"; | |
+ static const char *subkey = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion"; | |
+ static const char *subval = "ProgramFilesDir"; | |
+ DWORD keylen, keytype; | |
BOOL ok = FALSE; | |
- len = str->bufsiz - str->length; | |
- if (RegGetValue(HKEY_LOCAL_MACHINE, subkey, subval, RRF_RT_REG_SZ, NULL, | |
- NULL, &len) == ERROR_SUCCESS) { | |
- len += 5; | |
- bstr_expandby(str, len); | |
- if (RegGetValue(HKEY_LOCAL_MACHINE, subkey, subval, RRF_RT_REG_SZ, NULL, | |
- str->text + str->length, &len) == ERROR_SUCCESS) { | |
- ok = TRUE; | |
+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, subkey, 0, | |
+ KEY_READ, &key) == ERROR_SUCCESS) { | |
+ if (RegQueryValueEx(key, subval, NULL, | |
+ &keytype, NULL, &keylen) == ERROR_SUCCESS && | |
+ keytype == REG_SZ) { | |
+ char *progfiledir = bmalloc(keylen); | |
+ | |
+ if (RegQueryValueEx(key, subval, NULL, | |
+ &keytype, progfiledir, &keylen) == ERROR_SUCCESS) { | |
+ bstr_append(str, progfiledir); | |
+ ok = TRUE; | |
+ } | |
+ bfree(progfiledir); | |
} | |
+ RegCloseKey(key); | |
} | |
if (!ok) { | |
bstr_append(str, "C:\\Program Files"); | |
t@@ -776,6 +782,7 @@ char *GetInstallDir(char *product) | |
&keytype, installdir, &keylen) != ERROR_SUCCESS) { | |
DisplayError("Could not get registry key value", FALSE, TRUE); | |
} | |
+ RegCloseKey(key); | |
bstr_free(str, TRUE); | |
return installdir; | |
diff --git a/win32/zlib/Makefile.nocygwin b/win32/zlib/Makefile.nocygwin | |
t@@ -1,18 +1,22 @@ | |
# Makefile for zlib | |
-# Copyright (C) 1995-1998 Jean-loup Gailly. | |
-# For conditions of distribution and use, see copyright notice in zlib.h | |
+# Copyright (C) 1995-2003 Jean-loup Gailly. | |
+# For conditions of distribution and use, see copyright notice in zlib.h | |
# To compile and test, type: | |
-# ./configure; make test | |
+# ./configure; make test | |
# The call of configure is optional if you don't have special requirements | |
# If you wish to build zlib as a shared library, use: ./configure -s | |
+# To use the asm code, type: | |
+# cp contrib/asm?86/match.S ./match.S | |
+# make LOC=-DASMV OBJA=match.o | |
+ | |
# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: | |
# make install | |
# To install in $HOME instead of /usr/local, use: | |
# make install prefix=$HOME | |
-CC=gcc -mno-cygwin | |
+CC=cc -mno-cygwin | |
CFLAGS=-O | |
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 | |
t@@ -20,42 +24,48 @@ CFLAGS=-O | |
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ | |
# -Wstrict-prototypes -Wmissing-prototypes | |
-LDFLAGS=-L. -lz | |
+LDFLAGS=libz.a | |
LDSHARED=$(CC) | |
CPP=$(CC) -E | |
-VER=1.1.3 | |
LIBS=libz.a | |
SHAREDLIB=libz.so | |
+SHAREDLIBV=libz.so.1.2.1 | |
+SHAREDLIBM=libz.so.1 | |
AR=ar rc | |
RANLIB=ranlib | |
TAR=tar | |
SHELL=/bin/sh | |
+EXE= | |
prefix = /usr/local | |
exec_prefix = ${prefix} | |
libdir = ${exec_prefix}/lib | |
includedir = ${prefix}/include | |
+mandir = ${prefix}/share/man | |
+man3dir = ${mandir}/man3 | |
OBJS = 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 | |
+ zutil.o inflate.o infback.o inftrees.o inffast.o | |
OBJA = | |
# to use the asm code: make OBJA=match.o | |
-DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] *.mms \ | |
- algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \ | |
- nt/Make*[a-z0-9] nt/zlib.dnt amiga/Make*.??? os2/M*.os2 os2/zlib.def \ | |
- contrib/RE*.contrib contrib/*.txt contrib/asm386/*.asm contrib/asm386/*.c \ | |
- contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/asm[56]86/*.?86 \ | |
- contrib/asm[56]86/*.S contrib/iostream/*.cpp \ | |
- contrib/iostream/*.h contrib/iostream2/*.h contrib/iostream2/*.cpp \ | |
- contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32 \ | |
- contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]?? \ | |
- contrib/delphi*/*.??? | |
+TEST_OBJS = example.o minigzip.o | |
+ | |
+all: example$(EXE) minigzip$(EXE) | |
-all: libz.a | |
+check: test | |
+test: all | |
+ @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ | |
+ echo hello world | ./minigzip | ./minigzip -d || \ | |
+ echo ' *** minigzip test FAILED ***' ; \ | |
+ if ./example; then \ | |
+ echo ' *** zlib test OK ***'; \ | |
+ else \ | |
+ echo ' *** zlib test FAILED ***'; \ | |
+ fi | |
libz.a: $(OBJS) $(OBJA) | |
$(AR) $@ $(OBJS) $(OBJA) | |
t@@ -67,68 +77,60 @@ match.o: match.S | |
mv _match.o match.o | |
rm -f _match.s | |
-$(SHAREDLIB).$(VER): $(OBJS) | |
+$(SHAREDLIBV): $(OBJS) | |
$(LDSHARED) -o $@ $(OBJS) | |
- rm -f $(SHAREDLIB) $(SHAREDLIB).1 | |
+ rm -f $(SHAREDLIB) $(SHAREDLIBM) | |
ln -s $@ $(SHAREDLIB) | |
- ln -s $@ $(SHAREDLIB).1 | |
+ ln -s $@ $(SHAREDLIBM) | |
+ | |
+example$(EXE): example.o $(LIBS) | |
+ $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) | |
+ | |
+minigzip$(EXE): minigzip.o $(LIBS) | |
+ $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) | |
install: $(LIBS) | |
- -@if [ ! -d $(includedir) ]; then mkdir $(includedir); fi | |
- -@if [ ! -d $(libdir) ]; then mkdir $(libdir); fi | |
+ -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi | |
+ -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi | |
+ -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi | |
+ -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi | |
cp zlib.h zconf.h $(includedir) | |
chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h | |
cp $(LIBS) $(libdir) | |
cd $(libdir); chmod 755 $(LIBS) | |
-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 | |
- cd $(libdir); if test -f $(SHAREDLIB).$(VER); then \ | |
- rm -f $(SHAREDLIB) $(SHAREDLIB).1; \ | |
- ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \ | |
- ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \ | |
+ cd $(libdir); if test -f $(SHAREDLIBV); then \ | |
+ rm -f $(SHAREDLIB) $(SHAREDLIBM); \ | |
+ ln -s $(SHAREDLIBV) $(SHAREDLIB); \ | |
+ ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ | |
(ldconfig || true) >/dev/null 2>&1; \ | |
fi | |
+ cp zlib.3 $(man3dir) | |
+ chmod 644 $(man3dir)/zlib.3 | |
# The ranlib in install is needed on NeXTSTEP which checks file times | |
# ldconfig is for Linux | |
uninstall: | |
cd $(includedir); \ | |
- v=$(VER); \ | |
- if test -f zlib.h; then \ | |
- v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \ | |
- rm -f zlib.h zconf.h; \ | |
- fi; \ | |
cd $(libdir); rm -f libz.a; \ | |
- if test -f $(SHAREDLIB).$$v; then \ | |
- rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \ | |
+ if test -f $(SHAREDLIBV); then \ | |
+ rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ | |
fi | |
+ cd $(man3dir); rm -f zlib.3 | |
+mostlyclean: clean | |
clean: | |
- rm -f *.o *~ libz.a libz.so* foo.gz so_locations \ | |
- _match.s maketree | |
- | |
-distclean: clean | |
- | |
-zip: | |
- mv Makefile Makefile~; cp -p Makefile.in Makefile | |
- rm -f test.c ztest*.c contrib/minizip/test.zip | |
- v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ | |
- zip -ul9 zlib$$v $(DISTFILES) | |
- mv Makefile~ Makefile | |
- | |
-dist: | |
- mv Makefile Makefile~; cp -p Makefile.in Makefile | |
- rm -f test.c ztest*.c contrib/minizip/test.zip | |
- d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ | |
- rm -f $$d.tar.gz; \ | |
- if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \ | |
- files=""; \ | |
- for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \ | |
- cd ..; \ | |
- GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \ | |
- if test ! -d $$d; then rm -f $$d; fi | |
- mv Makefile~ Makefile | |
- | |
-tags: | |
+ rm -f *.o *~ example$(EXE) minigzip$(EXE) \ | |
+ libz.* foo.gz so_locations \ | |
+ _match.s maketree contrib/infback9/*.o | |
+ | |
+maintainer-clean: distclean | |
+distclean: clean | |
+ cp -p Makefile.in Makefile | |
+ cp -p zconf.in.h zconf.h | |
+ rm -f .DS_Store | |
+ | |
+tags: | |
etags *.[ch] | |
depend: | |
t@@ -138,18 +140,15 @@ depend: | |
adler32.o: zlib.h zconf.h | |
compress.o: zlib.h zconf.h | |
-crc32.o: zlib.h zconf.h | |
+crc32.o: crc32.h zlib.h zconf.h | |
deflate.o: deflate.h zutil.h zlib.h zconf.h | |
+example.o: zlib.h zconf.h | |
gzio.o: zutil.h zlib.h zconf.h | |
-infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h | |
-infcodes.o: zutil.h zlib.h zconf.h | |
-infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h | |
-inffast.o: zutil.h zlib.h zconf.h inftrees.h | |
-inffast.o: infblock.h infcodes.h infutil.h inffast.h | |
-inflate.o: zutil.h zlib.h zconf.h infblock.h | |
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h | |
+inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h | |
+infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h | |
inftrees.o: zutil.h zlib.h zconf.h inftrees.h | |
-infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h | |
-minigzip.o: zlib.h zconf.h | |
+minigzip.o: zlib.h zconf.h | |
trees.o: deflate.h zutil.h zlib.h zconf.h trees.h | |
uncompr.o: zlib.h zconf.h | |
-zutil.o: zutil.h zlib.h zconf.h | |
+zutil.o: zutil.h zlib.h zconf.h |