Latest merge

git-svn: trunk@3083

contrib/Windows/Projects/clamAV/libclamav/clamav-config.h

@@ -347,14 +347,7 @@
 /* #define USE_SYSLOG 1 */
 
 /* Version number of package */
-#define VERSION "devel-20070416"
-
-/* use libcurl in mbox code */
-#ifdef	CL_EXPERIMENTAL
-/*#define WITH_CURL 1	/* A lie, since we're dropping curl, but it works */
-#else
-/* #undef WITH_CURL */
-#endif
+#define VERSION "devel-20070527"
 
 /* tcpwrappers support */
 /* #undef WITH_TCPWRAP */

contrib/Windows/Projects/clamAV/libclamav/compat.h

@@ -116,12 +116,17 @@ int	gettimeofday(struct timeval* tp, void* tz);
 #define	pause();
 
 #ifdef	_DEBUG
-#include	<crtdbg.h>
+
+/* http://msdn2.microsoft.com/en-us/library/e5ewb1h3(VS.80).asp */
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+
 /* breaks mspack/qtmd.c :-( */
 /* #define	free(p)	{ _free_dbg(p, _NORMAL_BLOCK); } */
-#define	_CRTDBG_MAP_ALLOC 
+
 #endif
 
 #endif	/* C_WINDOWS */
 
-#endif	/* CLAMAV_COMPAT_H */
+#endif	/* CLAMAV_COMPAT_H */

contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj

@@ -19,7 +19,7 @@
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
+			ConfigurationType="2"
 			CharacterSet="0"
 			>
 			<Tool
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\js&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\pthread&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\mspack&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\unrar&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\mspack&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\unrar&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\nsis&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\js&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\pthread&quot;"
 				PreprocessorDefinitions="_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_DEBUG"
 				StringPooling="true"
 				MinimalRebuild="true"
@@ -67,12 +67,17 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				UseUnicodeResponseFiles="false"
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				ModuleDefinitionFile="$(InputDir)/libclamav.def"
+				SubSystem="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -82,6 +87,12 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -90,7 +101,7 @@
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
+			ConfigurationType="2"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -112,7 +123,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\js&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\pthread&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\mspack&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\unrar&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\mspack&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\unrar&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\nsis&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\js&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\pthread&quot;"
 				PreprocessorDefinitions="_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB"
 				StringPooling="true"
 				ExceptionHandling="0"
@@ -137,12 +148,99 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				ModuleDefinitionFile="$(InputDir)/libclamav.def"
+				SubSystem="2"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release no .net|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="0"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\mspack&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\unrar&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\nsis&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\js&quot;;&quot;C:\Documents and Settings\Nigel Horne\My Documents\Visual Studio 2005\Projects\clamAV\libclamav\pthread&quot;"
+				PreprocessorDefinitions="_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				StructMemberAlignment="0"
+				DefaultCharIsUnsigned="false"
+				TreatWChar_tAsBuiltInType="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="0"
+				CallingConvention="0"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				GenerateManifest="false"
+				ModuleDefinitionFile="$(InputDir)/libclamav.def"
+				SubSystem="2"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -152,6 +250,12 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -212,11 +316,23 @@
 						WarningLevel="4"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release no .net|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\dconf.c"
 				>
 			</File>
+			<File
+				RelativePath=".\dllmain.c"
+				>
+			</File>
 			<File
 				RelativePath=".\dsig.c"
 				>
@@ -225,6 +341,10 @@
 				RelativePath=".\elf.c"
 				>
 			</File>
+			<File
+				RelativePath=".\entconv.c"
+				>
+			</File>
 			<File
 				RelativePath=".\filetypes.c"
 				>
@@ -233,6 +353,10 @@
 				RelativePath=".\fsg.c"
 				>
 			</File>
+			<File
+				RelativePath=".\hashtab.c"
+				>
+			</File>
 			<File
 				RelativePath=".\htmlnorm.c"
 				>
@@ -529,6 +653,26 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="nsis"
+				>
+				<File
+					RelativePath=".\nsis\bzlib.c"
+					>
+				</File>
+				<File
+					RelativePath=".\nsis\infblock.c"
+					>
+				</File>
+				<File
+					RelativePath=".\nsis\LZMADecode.c"
+					>
+				</File>
+				<File
+					RelativePath=".\nsis\nulsft.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -583,6 +727,10 @@
 				RelativePath=".\elf.h"
 				>
 			</File>
+			<File
+				RelativePath=".\entconv.h"
+				>
+			</File>
 			<File
 				RelativePath=".\execs.h"
 				>
@@ -595,6 +743,10 @@
 				RelativePath=".\fsg.h"
 				>
 			</File>
+			<File
+				RelativePath=".\hashtab.h"
+				>
+			</File>
 			<File
 				RelativePath=".\htmlnorm.h"
 				>
@@ -715,6 +867,10 @@
 				RelativePath=".\regex_list.h"
 				>
 			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
 			<File
 				RelativePath=".\rtf.h"
 				>
@@ -923,6 +1079,38 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="nsis"
+				>
+				<File
+					RelativePath=".\nsis\bzlib_private.h"
+					>
+				</File>
+				<File
+					RelativePath=".\nsis\LZMADecode.h"
+					>
+				</File>
+				<File
+					RelativePath=".\nsis\nsis_bzlib.h"
+					>
+				</File>
+				<File
+					RelativePath=".\nsis\nsis_zconf.h"
+					>
+				</File>
+				<File
+					RelativePath=".\nsis\nsis_zlib.h"
+					>
+				</File>
+				<File
+					RelativePath=".\nsis\nsis_zutil.h"
+					>
+				</File>
+				<File
+					RelativePath=".\nsis\nulsft.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -930,7 +1118,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\clamAV.ico"
+				RelativePath=".\libclamav.def"
 				>
 			</File>
 		</Filter>

contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj.NJH.Nigel Horne.user

@@ -61,5 +61,33 @@
 				MPIAcceptFilter=""
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release no .net|Win32"
+			>
+			<DebugSettings
+				Command=""
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="NJH"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
 	</Configurations>
 </VisualStudioUserFile>