From 5ca55f42f4330aa0257e664f588993ce0b3eac73 Mon Sep 17 00:00:00 2001 From: Guido Draheim Date: Fri, 18 Aug 2006 13:49:50 +0000 Subject: [PATCH] msvc8 (.) --- ChangeLog | 6 + Makefile.am | 3 +- Makefile.in | 3 +- configure | 2 +- msvc8/README.TXT | 5 + msvc8/zzcat.vcproj | 12 +- msvc8/zzdir.vcproj | 12 +- msvc8/zzip.sln | 12 ++ msvc8/zzipfseeko.vcproj | 209 +++++++++++++++++++++++++++++++++++ msvc8/zziplib.vcproj | 16 ++- msvc8/zzipmmapped.vcproj | 227 ++++++++++++++++++++++++++++++++++++++ msvc8/zzipself.vcproj | 12 +- msvc8/zzipsetstub.vcproj | 12 +- msvc8/zziptest.vcproj | 8 +- msvc8/zzobfuscated.vcproj | 12 +- zzip/__fnmatch.h | 3 +- zzip/__mmap.h | 2 +- zzip/fseeko.c | 18 +-- zzip/memdisk.c | 1 + zzip/mmapped.c | 3 +- 20 files changed, 539 insertions(+), 39 deletions(-) create mode 100755 msvc8/zzipfseeko.vcproj create mode 100755 msvc8/zzipmmapped.vcproj diff --git a/ChangeLog b/ChangeLog index 1d7b268..35412bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-18 + * updating msvc8 project files + * adding zlib.dll to cvs + * zzip/memdisk.c:183 overrides for off64_t will not work with off32_t !!! + * headers for mktime should return time_t - do we have the header ??? + 2006-08-17 * A report by Tuilipant Gergely had shown an "unaligned access" error on an alpha machine. So, I have added macro to test for diff --git a/Makefile.am b/Makefile.am index f95935f..e3fff19 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,8 @@ msvc8/zziplib.sln msvc8/zzipsetstub.sln msvc8/zzobfuscated.sln \ msvc8/zziplib.vcproj msvc8/zzipsetstub.vcproj msvc8/zzobfuscated.vcproj \ msvc8/zzcat.sln msvc8/zzipself.bat msvc8/zzip.sln \ msvc8/zzcat.vcproj msvc8/zzipself.sln msvc8/zziptest.sln \ -msvc8/zzdir.sln msvc8/zzipself.txt msvc8/zziptest.vcproj +msvc8/zzdir.sln msvc8/zzipself.txt msvc8/zziptest.vcproj \ + msvc8/zzipfseeko.vcproj msvc8/zzipmmapped.vcproj MSVC7 = msvc7/pkzip.exe msvc7/test1.zip msvc7/test.zip \ msvc7/zzdir.vcproj msvc7/zzipself.vcproj msvc7/zzip.vcproj \ diff --git a/Makefile.in b/Makefile.in index 8d12c9b..3c4ea51 100644 --- a/Makefile.in +++ b/Makefile.in @@ -239,7 +239,8 @@ msvc8/zziplib.sln msvc8/zzipsetstub.sln msvc8/zzobfuscated.sln \ msvc8/zziplib.vcproj msvc8/zzipsetstub.vcproj msvc8/zzobfuscated.vcproj \ msvc8/zzcat.sln msvc8/zzipself.bat msvc8/zzip.sln \ msvc8/zzcat.vcproj msvc8/zzipself.sln msvc8/zziptest.sln \ -msvc8/zzdir.sln msvc8/zzipself.txt msvc8/zziptest.vcproj +msvc8/zzdir.sln msvc8/zzipself.txt msvc8/zziptest.vcproj \ + msvc8/zzipfseeko.vcproj msvc8/zzipmmapped.vcproj MSVC7 = msvc7/pkzip.exe msvc7/test1.zip msvc7/test.zip \ msvc7/zzdir.vcproj msvc7/zzipself.vcproj msvc7/zzip.vcproj \ diff --git a/configure b/configure index 7217162..6065758 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.6 . +# From configure.ac Revision: 1.7 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # diff --git a/msvc8/README.TXT b/msvc8/README.TXT index dbbd5fe..3a45479 100644 --- a/msvc8/README.TXT +++ b/msvc8/README.TXT @@ -29,3 +29,8 @@ download.microsoft.com/download/A/9/1/A91D6B2B-A798-47DF-9C7E-A97854B7DD18/ VC.iso = Visual C++ Express CD-image download.microsoft.com/download/C/6/F/C6F4733B-67C7-4C15-9F21-61F7A3167505/ VCS.iso = Visual C# Express CD-image + +== Compiling Error == +'can not delete debug/*.idb' - occurs when running MSVC in a VMWare box +pointing to a Unix drive; create a symlink `ln -s Debug debug` to fix it. +There are Pre/Post-Build Rules to remove *.idb but sometimes its left over. diff --git a/msvc8/zzcat.vcproj b/msvc8/zzcat.vcproj index 076dd91..0ebbedb 100644 --- a/msvc8/zzcat.vcproj +++ b/msvc8/zzcat.vcproj @@ -24,6 +24,8 @@ > diff --git a/msvc8/zzdir.vcproj b/msvc8/zzdir.vcproj index 5f0be36..c15c65e 100644 --- a/msvc8/zzdir.vcproj +++ b/msvc8/zzdir.vcproj @@ -24,6 +24,8 @@ > diff --git a/msvc8/zzip.sln b/msvc8/zzip.sln index 74c2b12..42209e2 100644 --- a/msvc8/zzip.sln +++ b/msvc8/zzip.sln @@ -33,6 +33,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzipobfuscated", "zzobfusca {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD} = {CB440073-2ED3-48CE-A1A1-B6EACB3A44BD} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzipmmapped", "zzipmmapped.vcproj", "{E7474EF2-BF27-4482-B347-2075BEC6A0D4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzipfseeko", "zzipfseeko.vcproj", "{33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -62,6 +66,14 @@ Global {3EC53ADE-2D87-4023-B34A-BA1CF0EA0F01}.Debug|Win32.ActiveCfg = Debug|Win32 {3EC53ADE-2D87-4023-B34A-BA1CF0EA0F01}.Release|Win32.ActiveCfg = Release|Win32 {3EC53ADE-2D87-4023-B34A-BA1CF0EA0F01}.Release|Win32.Build.0 = Release|Win32 + {E7474EF2-BF27-4482-B347-2075BEC6A0D4}.Debug|Win32.ActiveCfg = Debug|Win32 + {E7474EF2-BF27-4482-B347-2075BEC6A0D4}.Debug|Win32.Build.0 = Debug|Win32 + {E7474EF2-BF27-4482-B347-2075BEC6A0D4}.Release|Win32.ActiveCfg = Release|Win32 + {E7474EF2-BF27-4482-B347-2075BEC6A0D4}.Release|Win32.Build.0 = Release|Win32 + {33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}.Debug|Win32.ActiveCfg = Debug|Win32 + {33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}.Debug|Win32.Build.0 = Debug|Win32 + {33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}.Release|Win32.ActiveCfg = Release|Win32 + {33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/msvc8/zzipfseeko.vcproj b/msvc8/zzipfseeko.vcproj new file mode 100755 index 0000000..88b4be1 --- /dev/null +++ b/msvc8/zzipfseeko.vcproj @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc8/zziplib.vcproj b/msvc8/zziplib.vcproj index 50be9bb..b7d830e 100644 --- a/msvc8/zziplib.vcproj +++ b/msvc8/zziplib.vcproj @@ -24,6 +24,8 @@ > diff --git a/msvc8/zzipmmapped.vcproj b/msvc8/zzipmmapped.vcproj new file mode 100755 index 0000000..580715a --- /dev/null +++ b/msvc8/zzipmmapped.vcproj @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msvc8/zzipself.vcproj b/msvc8/zzipself.vcproj index 9544f97..142eb1d 100644 --- a/msvc8/zzipself.vcproj +++ b/msvc8/zzipself.vcproj @@ -24,6 +24,8 @@ > diff --git a/msvc8/zzipsetstub.vcproj b/msvc8/zzipsetstub.vcproj index efb1f2a..7f98d46 100644 --- a/msvc8/zzipsetstub.vcproj +++ b/msvc8/zzipsetstub.vcproj @@ -24,6 +24,8 @@ > diff --git a/msvc8/zziptest.vcproj b/msvc8/zziptest.vcproj index a3a56c7..66486eb 100644 --- a/msvc8/zziptest.vcproj +++ b/msvc8/zziptest.vcproj @@ -24,6 +24,8 @@ > diff --git a/zzip/__fnmatch.h b/zzip/__fnmatch.h index 9759a74..55d96b6 100644 --- a/zzip/__fnmatch.h +++ b/zzip/__fnmatch.h @@ -3,6 +3,7 @@ /** included by fseeko.c, mmapped.c, memdisk.c */ #include +#include #ifdef ZZIP_HAVE_FNMATCH_H #include @@ -20,7 +21,7 @@ /* if your system does not have fnmatch, we fall back to strcmp: */ static int _zzip_fnmatch(char* pattern, char* string, int flags) { - puts (""); + fprintf (stderr, ""); return strcmp (pattern, string); } #endif diff --git a/zzip/__mmap.h b/zzip/__mmap.h index 121c8bd..d70419d 100644 --- a/zzip/__mmap.h +++ b/zzip/__mmap.h @@ -52,7 +52,7 @@ /* we (ab)use the "*user" variable to store the FileMapping handle */ /* which assumes (sizeof(long) == sizeof(HANDLE)) */ -static size_t win32_getpagesize () +static size_t win32_getpagesize (void) { SYSTEM_INFO si; GetSystemInfo (&si); return si.dwAllocationGranularity; diff --git a/zzip/fseeko.c b/zzip/fseeko.c index 2207f5d..290e694 100644 --- a/zzip/fseeko.c +++ b/zzip/fseeko.c @@ -1,5 +1,6 @@ /* * NOTE: this is part of libzzipfseeko (i.e. it is not libzzip). + * ================== * * These routines are fully independent from the traditional zzip * implementation. They assume a readonly seekable stdio handle @@ -355,23 +356,6 @@ zzip_entry_findfile(FILE* disk, char* filename, return 0; } -#ifdef ZZIP_HAVE_FNMATCH_H -#define _zzip_fnmatch fnmatch -# ifdef FNM_CASEFOLD -# define _zzip_fnmatch_CASEFOLD FNM_CASEFOLD -# else -# define _zzip_fnmatch_CASEFOLD 0 -# endif -#else -# define _zzip_fnmatch_CASEFOLD 0 -/* if your system does not have fnmatch, we fall back to strcmp: */ -static int _zzip_fnmatch(char* pattern, char* string, int flags) -{ - puts (""); - return strcmp (pattern, string); -} -#endif - /** => zzip_entry_findfile * * This function uses a compare-function with an additional argument diff --git a/zzip/memdisk.c b/zzip/memdisk.c index 7d66352..6f07a88 100644 --- a/zzip/memdisk.c +++ b/zzip/memdisk.c @@ -1,5 +1,6 @@ /* * NOTE: this is part of libzzipmmapped (i.e. it is not libzzip). + * ================== * * The mem_disk cache will parse the central information of a zip archive * and store it internally. One the one hand it allows to find files diff --git a/zzip/mmapped.c b/zzip/mmapped.c index fe28018..3cad54d 100644 --- a/zzip/mmapped.c +++ b/zzip/mmapped.c @@ -1,5 +1,6 @@ /* * NOTE: this is part of libzzipmmapped (i.e. it is not libzzip). + * ================== * * These routines are fully independent from the traditional zzip * implementation. They assume a readonly mmapped sharedmem block @@ -177,7 +178,7 @@ zzip_disk_close(ZZIP_DISK* disk) #define _zzip_strndup strndup #else /* if your system does not have strndup: */ -zzip__new__ static char* _zzip_strndup(char* p, int maxlen) +zzip__new__ static char* _zzip_strndup(char* p, size_t maxlen) { if (! p) return 0; ___ zzip_byte_t* r = malloc (maxlen+1); -- 2.40.0