msvc8

 (.)

diff --git a/ChangeLog b/ChangeLog
index 1d7b2684b7733c99fa164935953d2d2ef8b0cb7b..35412bdda66d149685ef4de1dadc9d20d062eaf9 100644 (file)
--- 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 f95935f30d987b2f657d510e211fdfbb0caa89e3..e3fff19c519550b3db284386ca4aff0135f1ad39 100644 (file)
--- 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 8d12c9b78f0141a6848a5b801f72d693037f0993..3c4ea516bd68a159cb10567544952bd2728f6497 100644 (file)
--- 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 72171626eb4149a72dbd6d3a2a1ec4a8882137d5..6065758668961ff05845048bbcb95ba23257e396 100755 (executable)
--- 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 dbbd5febabf8153f32fe831b82f1a8b6dd388b46..3a4547990bebfba12783bfd7dc7e5f4b3e662f72 100644 (file)
--- 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 076dd910ec659913a5571afc7a4cd7c1ec57183c..0ebbedb798400b109d1a2beee68a29deb52a8a30 100644 (file)
--- a/msvc8/zzcat.vcproj
+++ b/msvc8/zzcat.vcproj
@@ -24,6 +24,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -40,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -93,6 +95,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -105,6 +109,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -123,7 +129,7 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                OmitFramePointers="true"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
@@ -177,6 +183,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
        </Configurations>\r

diff --git a/msvc8/zzdir.vcproj b/msvc8/zzdir.vcproj
index 5f0be36b4b80262227bce8bfefe0bda7dfbb4a8b..c15c65e716fd57642447cc6dd31e1a5274af43e6 100644 (file)
--- a/msvc8/zzdir.vcproj
+++ b/msvc8/zzdir.vcproj
@@ -24,6 +24,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -40,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -93,6 +95,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -105,6 +109,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -123,7 +129,7 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                OmitFramePointers="true"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
@@ -177,6 +183,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
        </Configurations>\r

diff --git a/msvc8/zzip.sln b/msvc8/zzip.sln
index 74c2b1244202abf20f48c1ee28eccd5dd0fd1901..42209e2d7dc697915ca972e14372faf932574aa8 100644 (file)
--- 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}\r
        EndProjectSection\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzipmmapped", "zzipmmapped.vcproj", "{E7474EF2-BF27-4482-B347-2075BEC6A0D4}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzipfseeko", "zzipfseeko.vcproj", "{33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -62,6 +66,14 @@ Global
                {3EC53ADE-2D87-4023-B34A-BA1CF0EA0F01}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {3EC53ADE-2D87-4023-B34A-BA1CF0EA0F01}.Release|Win32.ActiveCfg = Release|Win32\r
                {3EC53ADE-2D87-4023-B34A-BA1CF0EA0F01}.Release|Win32.Build.0 = Release|Win32\r
+               {E7474EF2-BF27-4482-B347-2075BEC6A0D4}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {E7474EF2-BF27-4482-B347-2075BEC6A0D4}.Debug|Win32.Build.0 = Debug|Win32\r
+               {E7474EF2-BF27-4482-B347-2075BEC6A0D4}.Release|Win32.ActiveCfg = Release|Win32\r
+               {E7474EF2-BF27-4482-B347-2075BEC6A0D4}.Release|Win32.Build.0 = Release|Win32\r
+               {33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}.Debug|Win32.Build.0 = Debug|Win32\r
+               {33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}.Release|Win32.ActiveCfg = Release|Win32\r
+               {33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/msvc8/zzipfseeko.vcproj b/msvc8/zzipfseeko.vcproj
new file mode 100755 (executable)
index 0000000..88b4be1
--- /dev/null
+++ b/msvc8/zzipfseeko.vcproj
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8,00"\r
+       Name="zzipfseeko"\r
+       ProjectGUID="{33B3D8EF-5CF8-4B3A-93B5-5A9B262AB8A2}"\r
+       RootNamespace="zzipfseeko"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               AdditionalDependencies="zdll.lib"\r
+                               AdditionalLibraryDirectories="../msvc/zlib/lib"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="zlib.dll"\r
+                               AdditionalLibraryDirectories="../msvc/zlib/lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\zzip\fetch.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\zzip\fseeko.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\zzip\fetch.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\zzip\fseeko.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/msvc8/zziplib.vcproj b/msvc8/zziplib.vcproj
index 50be9bbe45b1f4b0bae37c50a036d6be621c5aa9..b7d830e4d44d67671ef50c09b47625691fb1dbd4 100644 (file)
--- a/msvc8/zziplib.vcproj
+++ b/msvc8/zziplib.vcproj
@@ -24,6 +24,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -40,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..;../zlib/include"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -64,7 +66,7 @@
                                Name="VCLibrarianTool"\r
                                AdditionalDependencies="zdll.lib"\r
                                OutputFile="zziplib-$(ConfigurationName).lib"\r
-                               AdditionalLibraryDirectories="../zlib/lib"\r
+                               AdditionalLibraryDirectories="../msvc/zlib/lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -80,6 +82,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -92,6 +96,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -110,7 +116,7 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                OmitFramePointers="true"\r
-                               AdditionalIncludeDirectories="..;../zlib/include"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
@@ -133,7 +139,7 @@
                                Name="VCLibrarianTool"\r
                                AdditionalDependencies="zdll.lib"\r
                                OutputFile="zziplib-$(ConfigurationName).lib"\r
-                               AdditionalLibraryDirectories="../zlib/lib"\r
+                               AdditionalLibraryDirectories="../msvc/zlib/lib"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -149,6 +155,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
        </Configurations>\r

diff --git a/msvc8/zzipmmapped.vcproj b/msvc8/zzipmmapped.vcproj
new file mode 100755 (executable)
index 0000000..580715a
--- /dev/null
+++ b/msvc8/zzipmmapped.vcproj
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8,00"\r
+       Name="zzipmmapped"\r
+       ProjectGUID="{E7474EF2-BF27-4482-B347-2075BEC6A0D4}"\r
+       RootNamespace="zzipmmapped"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="zdll.lib"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="../msvc/zlib/lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="kernel32.lib $(NoInherit)"\r
+                               LinkIncremental="1"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\zzip\fetch.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\zzip\memdisk.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\zzip\mmapped.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\zzip\fetch.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\zzip\memdisk.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\zzip\mmapped.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/msvc8/zzipself.vcproj b/msvc8/zzipself.vcproj
index 9544f979318e44874ea36025179214df41243fa1..142eb1d418647fe77de820667f9bcb473633b510 100644 (file)
--- a/msvc8/zzipself.vcproj
+++ b/msvc8/zzipself.vcproj
@@ -24,6 +24,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -40,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -93,6 +95,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -105,6 +109,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -123,7 +129,7 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                OmitFramePointers="true"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
@@ -177,6 +183,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
        </Configurations>\r

diff --git a/msvc8/zzipsetstub.vcproj b/msvc8/zzipsetstub.vcproj
index efb1f2a7a916880b1a5c41cdd6b3bbd30d940363..7f98d4686d77a383d7ab6a38f3601462c12a32fb 100644 (file)
--- a/msvc8/zzipsetstub.vcproj
+++ b/msvc8/zzipsetstub.vcproj
@@ -24,6 +24,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -40,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -93,6 +95,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -105,6 +109,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -123,7 +129,7 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                OmitFramePointers="true"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
@@ -176,6 +182,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
        </Configurations>\r

diff --git a/msvc8/zziptest.vcproj b/msvc8/zziptest.vcproj
index a3a56c77064d77061d73f9caa529f3a22af8531f..66486eb83184809662be93d391906b77f8063534 100644 (file)
--- a/msvc8/zziptest.vcproj
+++ b/msvc8/zziptest.vcproj
@@ -24,6 +24,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -40,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -106,6 +108,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -124,7 +128,7 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                OmitFramePointers="true"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r

diff --git a/msvc8/zzobfuscated.vcproj b/msvc8/zzobfuscated.vcproj
index 02ea1dfd6d071e7acda30fb073e313013b32d7ed..734d4f8d1739dff6c555c1a0691c43b3da8e6e46 100644 (file)
--- a/msvc8/zzobfuscated.vcproj
+++ b/msvc8/zzobfuscated.vcproj
@@ -24,6 +24,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -40,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -93,6 +95,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -105,6 +109,8 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -123,7 +129,7 @@
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                OmitFramePointers="true"\r
-                               AdditionalIncludeDirectories="..;../zlib/include;&quot;$(MSSdk)/Include&quot;"\r
+                               AdditionalIncludeDirectories="..;../msvc/zlib/include;&quot;$(MSSdk)/Include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
@@ -177,6 +183,8 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               Description="del $(ConfigurationName)\vc80.idb"\r
+                               CommandLine="del $(ConfigurationName)\vc80.idb"\r
                        />\r
                </Configuration>\r
        </Configurations>\r

diff --git a/zzip/__fnmatch.h b/zzip/__fnmatch.h
index 9759a7423d8c22aaeee534223a61638bbc30e1ae..55d96b6d1efeab57c9b24dcd5891c5dd6b0dfa23 100644 (file)
--- a/zzip/__fnmatch.h
+++ b/zzip/__fnmatch.h
@@ -3,6 +3,7 @@
 /** included by fseeko.c, mmapped.c, memdisk.c */
 
 #include <zzip/conf.h>
+#include <stdio.h>
 
 #ifdef ZZIP_HAVE_FNMATCH_H
 #include <fnmatch.h>
@@ -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 ("<zzip:mmapped:strcmp>");
+    fprintf (stderr, "<zzip:mmapped:strcmp>");
     return strcmp (pattern, string); 
 }
 #endif

diff --git a/zzip/__mmap.h b/zzip/__mmap.h
index 121c8bd82f837de1926494affa4a1bc13b6618d5..d70419dcb02f11a35f262801df7630f78211e2a4 100644 (file)
--- 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 2207f5dc981cd1e3c6dbe8964bca56a1eeac1dd6..290e6940cecbf1b4f0491e0dfd8d97e746809ba1 100644 (file)
--- 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 ("<zzip:strcmp>");
-    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 7d66352add827727a635e0733d61f41bff3872ed..6f07a886015273611489d43ecf572285c8b15523 100644 (file)
--- 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 fe280188b635eeffaf89d3aea0e82bd018e447f2..3cad54daf58d4ee8dfc3d1ecb2f85c0fdf07604d 100644 (file)
--- 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);