[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
aCaB
acab at clamav.net
Sun Apr 4 01:07:55 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 2af15d1e8a40ae87e2c7b91f544dc880a2ea1750
Author: aCaB <acab at clamav.net>
Date: Wed Oct 14 01:28:02 2009 +0200
win32: add unrar s'port
diff --git a/ChangeLog b/ChangeLog
index 431929d..2c96963 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 14 01:26:47 CEST 2009 (acab)
+------------------------------------
+ * win32: unrar support
+
Tue Oct 13 20:13:53 CEST 2009 (acab)
------------------------------------
* win32: clamscan builds (and will scan soon...)
diff --git a/libclamunrar_iface/unrar_iface.c b/libclamunrar_iface/unrar_iface.c
index 6a03f14..de1dc63 100644
--- a/libclamunrar_iface/unrar_iface.c
+++ b/libclamunrar_iface/unrar_iface.c
@@ -21,8 +21,6 @@
#include "clamav-config.h"
#endif
-/* TODO: Add support for dlopen()&Co. */
-
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
diff --git a/win32/ClamAV.sln b/win32/ClamAV.sln
index a172e7b..907a8e8 100644
--- a/win32/ClamAV.sln
+++ b/win32/ClamAV.sln
@@ -8,6 +8,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clamscan", "clamscan.vcproj
{3AD5B16C-340A-40AC-96AD-6017B941A316} = {3AD5B16C-340A-40AC-96AD-6017B941A316}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamunrar_iface", "libclamunrar_iface.vcproj", "{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}"
+ ProjectSection(ProjectDependencies) = postProject
+ {41B2E193-92E3-429C-8DAC-9B287E3D7182} = {41B2E193-92E3-429C-8DAC-9B287E3D7182}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamunrar", "libclamunrar.vcproj", "{41B2E193-92E3-429C-8DAC-9B287E3D7182}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -22,6 +29,14 @@ Global
{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Debug|Win32.Build.0 = Debug|Win32
{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Release|Win32.ActiveCfg = Release|Win32
{F79E7CA7-E49D-479E-8D68-0EA9CB585575}.Release|Win32.Build.0 = Release|Win32
+ {3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Debug|Win32.Build.0 = Debug|Win32
+ {3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Release|Win32.ActiveCfg = Release|Win32
+ {3E9C718E-7670-4E33-9D94-C4E9ABE49F81}.Release|Win32.Build.0 = Release|Win32
+ {41B2E193-92E3-429C-8DAC-9B287E3D7182}.Debug|Win32.ActiveCfg = Debug|Win32
+ {41B2E193-92E3-429C-8DAC-9B287E3D7182}.Debug|Win32.Build.0 = Debug|Win32
+ {41B2E193-92E3-429C-8DAC-9B287E3D7182}.Release|Win32.ActiveCfg = Release|Win32
+ {41B2E193-92E3-429C-8DAC-9B287E3D7182}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win32/clamscan.vcproj b/win32/clamscan.vcproj
index b691515..875d3a9 100644
--- a/win32/clamscan.vcproj
+++ b/win32/clamscan.vcproj
@@ -63,7 +63,7 @@
/>
<Tool
Name="VCLinkerTool"
- LinkIncremental="2"
+ LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
diff --git a/win32/libclamav.vcproj b/win32/libclamav.vcproj
index 80cdb76..e92019d 100644
--- a/win32/libclamav.vcproj
+++ b/win32/libclamav.vcproj
@@ -64,7 +64,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
- LinkIncremental="2"
+ LinkIncremental="1"
IgnoreAllDefaultLibraries="false"
ModuleDefinitionFile="$(SolutionDir)libclamav.def"
GenerateDebugInformation="true"
diff --git a/win32/libclamunrar.def b/win32/libclamunrar.def
new file mode 100644
index 0000000..7fb7873
--- /dev/null
+++ b/win32/libclamunrar.def
@@ -0,0 +1,6 @@
+LIBRARY libclamunrar
+EXPORTS ppm_constructor
+EXPORTS ppm_destructor
+EXPORTS rar_init_filters
+EXPORTS rar_unpack
+EXPORTS rarvm_free
diff --git a/win32/clamscan.vcproj b/win32/libclamunrar.vcproj
similarity index 70%
copy from win32/clamscan.vcproj
copy to win32/libclamunrar.vcproj
index b691515..66f334e 100644
--- a/win32/clamscan.vcproj
+++ b/win32/libclamunrar.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="clamscan"
- ProjectGUID="{F79E7CA7-E49D-479E-8D68-0EA9CB585575}"
- RootNamespace="clamscan"
+ Name="libclamunrar"
+ ProjectGUID="{41B2E193-92E3-429C-8DAC-9B287E3D7182}"
+ RootNamespace="libclamunrar"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
@@ -20,7 +20,7 @@
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="1"
+ ConfigurationType="2"
CharacterSet="2"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir)..""
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..""
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -50,7 +50,7 @@
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
- DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
+ DisableSpecificWarnings="4996;4244;4018;4146"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -63,9 +63,10 @@
/>
<Tool
Name="VCLinkerTool"
- LinkIncremental="2"
+ LinkIncremental="1"
+ ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
GenerateDebugInformation="true"
- SubSystem="1"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
@@ -94,7 +95,7 @@
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="1"
+ ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -117,7 +118,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir)..""
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..""
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -125,7 +126,7 @@
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
- DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
+ DisableSpecificWarnings="4996;4244;4018;4146"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -139,8 +140,9 @@
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
+ ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
GenerateDebugInformation="true"
- SubSystem="1"
+ SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
@@ -177,49 +179,37 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\clamscan\clamscan.c"
+ RelativePath="..\libclamunrar\unrar.c"
>
</File>
<File
- RelativePath="..\clamscan\manager.c"
+ RelativePath="..\libclamunrar\unrar15.c"
>
</File>
<File
- RelativePath="..\clamscan\others.c"
+ RelativePath="..\libclamunrar\unrar20.c"
>
</File>
- <Filter
- Name="shared"
+ <File
+ RelativePath="..\libclamunrar\unrarcmd.c"
>
- <File
- RelativePath="..\shared\actions.c"
- >
- </File>
- <File
- RelativePath="..\shared\getopt.c"
- >
- </File>
- <File
- RelativePath="..\shared\misc.c"
- >
- </File>
- <File
- RelativePath="..\shared\optparser.c"
- >
- </File>
- <File
- RelativePath="..\shared\output.c"
- >
- </File>
- </Filter>
- <Filter
- Name="compat"
+ </File>
+ <File
+ RelativePath="..\libclamunrar\unrarfilter.c"
>
- <File
- RelativePath=".\compat\libgen.c"
- >
- </File>
- </Filter>
+ </File>
+ <File
+ RelativePath="..\libclamunrar\unrarhlp.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libclamunrar\unrarppm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\libclamunrar\unrarvm.c"
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -232,6 +222,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
+ <File
+ RelativePath=".\libclamunrar.def"
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/win32/libclamunrar_iface.def b/win32/libclamunrar_iface.def
new file mode 100644
index 0000000..ef995ba
--- /dev/null
+++ b/win32/libclamunrar_iface.def
@@ -0,0 +1,6 @@
+LIBRARY libclamunrar_iface
+EXPORTS libclamunrar_iface_LTX_unrar_open
+EXPORTS libclamunrar_iface_LTX_unrar_extract_next_prepare
+EXPORTS libclamunrar_iface_LTX_unrar_extract_next
+EXPORTS libclamunrar_iface_LTX_unrar_close
+
diff --git a/win32/clamscan.vcproj b/win32/libclamunrar_iface.vcproj
similarity index 70%
copy from win32/clamscan.vcproj
copy to win32/libclamunrar_iface.vcproj
index b691515..ae91fab 100644
--- a/win32/clamscan.vcproj
+++ b/win32/libclamunrar_iface.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="clamscan"
- ProjectGUID="{F79E7CA7-E49D-479E-8D68-0EA9CB585575}"
- RootNamespace="clamscan"
+ Name="libclamunrar_iface"
+ ProjectGUID="{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}"
+ RootNamespace="libclamunrar_iface"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
@@ -20,7 +20,7 @@
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="1"
+ ConfigurationType="2"
CharacterSet="2"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir)..""
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..""
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -50,7 +50,7 @@
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
- DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
+ DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -63,9 +63,10 @@
/>
<Tool
Name="VCLinkerTool"
- LinkIncremental="2"
+ LinkIncremental="1"
+ ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
GenerateDebugInformation="true"
- SubSystem="1"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
@@ -94,7 +95,7 @@
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="1"
+ ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -117,7 +118,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir)..""
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..""
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -125,7 +126,7 @@
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
- DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
+ DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -139,8 +140,9 @@
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
+ ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
GenerateDebugInformation="true"
- SubSystem="1"
+ SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
@@ -177,46 +179,14 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\clamscan\clamscan.c"
- >
- </File>
- <File
- RelativePath="..\clamscan\manager.c"
- >
- </File>
- <File
- RelativePath="..\clamscan\others.c"
+ RelativePath="..\libclamunrar_iface\unrar_iface.c"
>
</File>
<Filter
- Name="shared"
- >
- <File
- RelativePath="..\shared\actions.c"
- >
- </File>
- <File
- RelativePath="..\shared\getopt.c"
- >
- </File>
- <File
- RelativePath="..\shared\misc.c"
- >
- </File>
- <File
- RelativePath="..\shared\optparser.c"
- >
- </File>
- <File
- RelativePath="..\shared\output.c"
- >
- </File>
- </Filter>
- <Filter
Name="compat"
>
<File
- RelativePath=".\compat\libgen.c"
+ RelativePath=".\compat\snprintf.c"
>
</File>
</Filter>
@@ -232,6 +202,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
+ <File
+ RelativePath=".\libclamunrar_iface.def"
+ >
+ </File>
</Filter>
</Files>
<Globals>
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list