* src/lib/dlfcn/dlfcn.c:

fix warnings
	* src/lib/evil_fnmatch_list_of_states.c:
	fix vc++ warning
	* win32/MANIFEST.txt:
	* win32/README.txt:
	* win32/start.bat:
	* win32/vs9/evil.sln:
	* win32/vs9/libdlfcn.vcproj:
	* win32/vs9/libevil.vcproj:
	* win32/vs9/test/out/update_deps.bat:
	* win32/vs9/test/start.bat:
	* win32/vs9/test/test.sln:
	* win32/vs9/test/test.vcproj:
	* win32/vs9/test/test_fnmatch.cpp:
	* win32/vs9 (added):
	* win32/vs9/test (added):
	* win32/vs9/test/test_fnmatch.cpp (added):
	* win32/vs9/test/test.vcproj (added):
	* win32/vs9/test/start.bat (added):
	* win32/vs9/test/out (added):
	* win32/vs9/test/out/update_deps.bat (added):
	* win32/vs9/test/test.sln (added):
	* win32/vs9/libdlfcn.vcproj (added):
	* win32/vs9/libevil.vcproj (added):
	* win32/vs9/evil.sln (added):
	* win32/start.bat (added):
	* win32/vs8/libmman.vcproj (deleted):
	* win32/vs8/start.bat (deleted):
	* win32/set_env.bat (deleted):
	update the Visual Studio environment. Now, there is only one
	script to launch (start.bat) in win32/. It detects automatically
	the latest Visual Studio environment which is installed and launch
	the solution. Currently	supported VS are 2005 and 2008.



SVN revision: 42029
This commit is contained in:
Vincent Torri 2009-08-27 08:19:06 +00:00
parent 654330e183
commit bb6e659965
15 changed files with 1054 additions and 273 deletions

View File

@ -1,3 +1,42 @@
2009-08-27 Vincent Torri <doursse at users dot sf dot net>
* src/lib/dlfcn/dlfcn.c:
fix warnings
* src/lib/evil_fnmatch_list_of_states.c:
fix vc++ warning
* win32/MANIFEST.txt:
* win32/README.txt:
* win32/start.bat:
* win32/vs9/evil.sln:
* win32/vs9/libdlfcn.vcproj:
* win32/vs9/libevil.vcproj:
* win32/vs9/test/out/update_deps.bat:
* win32/vs9/test/start.bat:
* win32/vs9/test/test.sln:
* win32/vs9/test/test.vcproj:
* win32/vs9/test/test_fnmatch.cpp:
* win32/vs9 (added):
* win32/vs9/test (added):
* win32/vs9/test/test_fnmatch.cpp (added):
* win32/vs9/test/test.vcproj (added):
* win32/vs9/test/start.bat (added):
* win32/vs9/test/out (added):
* win32/vs9/test/out/update_deps.bat (added):
* win32/vs9/test/test.sln (added):
* win32/vs9/libdlfcn.vcproj (added):
* win32/vs9/libevil.vcproj (added):
* win32/vs9/evil.sln (added):
* win32/start.bat (added):
* win32/vs8/libmman.vcproj (deleted):
* win32/vs8/start.bat (deleted):
* win32/set_env.bat (deleted):
update the Visual Studio environment. Now, there is only one
script to launch (start.bat) in win32/. It detects automatically
the latest Visual Studio environment which is installed and launch
the solution. Currently supported VS are 2005 and 2008.
2009-06-13 Lars Munch <lars at segv dot dk>
* src/lib/evil_main.c:

View File

@ -1,8 +1,8 @@
#include <stdlib.h>
#if defined(__CEGCC__) || defined(__MINGW32CE__)
#if defined(__CEGCC__) || defined(__MINGW32CE__) || defined(_MSC_VER)
# include <limits.h>
#endif /* __CEGCC__ || __MINGW32CE__ */
#endif /* __CEGCC__ || __MINGW32CE__ || _MSC_VER */
#include "../Evil.h"
@ -20,8 +20,8 @@ static void
get_last_error(char *desc)
{
char *str;
int l1;
int l2;
size_t l1;
size_t l2;
str = evil_last_error_get();
@ -57,9 +57,9 @@ dlopen(const char* path, int mode __UNUSED__)
}
else
{
char *new_path;
int l;
int i;
char *new_path;
size_t l;
unsigned int i;
/* according to MSDN, we must change the slash to backslash */
l = strlen(path);
@ -137,11 +137,11 @@ dlsym(void *handle, const char *symbol)
int
dladdr (const void *addr __UNUSED__, Dl_info *info)
{
TCHAR tpath[PATH_MAX];
char *path;
char *tmp;
int length;
int ret = 0;
TCHAR tpath[PATH_MAX];
char *path;
char *tmp;
size_t length;
int ret = 0;
if (!info)
return 0;

View File

@ -22,7 +22,8 @@ fnmatch_list_of_states_alloc(size_t n,
unsigned char *has;
size_t i;
if (! (l = malloc(n * struct_size)))
l = malloc(n * struct_size);
if (!l)
return 0;
states = (unsigned char *) (l + n);

View File

@ -14,12 +14,15 @@
fnmatch_private.h - fnmatch private header
vs8 - Visual Studio 8 project files
start.bat - batch script to start work with the solution
evil.sln - Evil MSVC solution
libdlfcn.vcproj - libdlfcn project
libevil.vcproj - libevil project
libmman.vcproj - libmman project
set_env.bat - common environment startup
vs9 - Visual Studio 9 project files
evil.sln - Evil MSVC solution
libdlfcn.vcproj - libdlfcn project
libevil.vcproj - libevil project
start.bat - batch script to start work with the solution
MANIFEST.txt - this file
README.txt - about this folder
README.txt - about this folder

View File

@ -4,10 +4,12 @@
Important:
Do not launch manually any solutions or projects in the folder, to start
a solution run proper start.bat script, it will setup environment for
projects and will check system requirements.
a solution run the start.bat script, it will setup environment for
projects and will check system requirements. start.bat will detect
automatically the version of Visual Studio which is installed. It
currently supports Visual Studio 2005 and 2008.
Before start make sure that set_env.bat:EXT_DIR variable points to proper
Before start make sure that the EXT_DIR variable points to proper
extern directory. Extern directory layout and content (may be different, but
this is guaranteed to be enough):

View File

@ -1,19 +0,0 @@
@echo off
rem Set external libraries directory.
set EXT_DIR=%cd%\..\..\..\extern
if not exist %EXT_DIR% (
set EXT_DIR=
echo ERROR: External libs dir is not set.
pause
goto END
)
rem Add installation directory pathes.
set INCLUDE=%EXT_DIR%\include;%INCLUDE%
set LIB=%EXT_DIR%\lib;%LIB%
set INCLUDE=%cd%\common;%cd%\..\src\lib;%INCLUDE%
:END

63
legacy/evil/win32/start.bat Executable file
View File

@ -0,0 +1,63 @@
@echo off
rem Set external libraries directory.
set EXT_DIR=%cd%\..\..\..\extern
if not exist %EXT_DIR% (
set EXT_DIR=
echo ERROR: External libs dir is not set.
pause
goto END
)
rem Setup common Win32 environment variables
rem Add installation directory pathes.
set INCLUDE=%EXT_DIR%\include;%INCLUDE%
set LIB=%EXT_DIR%\lib;%LIB%
set INCLUDE=%cd%\common;%cd%\..\src\lib;%INCLUDE%
rem Check for basic requirements for Visual Studio 2008
if "%VS90COMNTOOLS%" == "" (
echo ERROR: Microsoft Visual Studio 2008 is not installed.
pause
goto NOVS9
)
set SolutionDirectory=%cd%\vs9
set DebugOutputDirectory=%SolutionDirectory%\out
set ReleaseOutputDirectory=%SolutionDirectory%\out
set DebugLibraryDirectory=%SolutionDirectory%\out
set ReleaseLibraryDirectory=%SolutionDirectory%\out
set TemporaryDirectory=%SolutionDirectory%\temp
rem Setting environment for using Microsoft Visual Studio 2008 x86 tools.
call "%VS90COMNTOOLS%vsvars32.bat"
vs9\evil.sln
goto END
:NOVS9
rem Check for basic requirements for Visual Studio 2005
if "%VS80COMNTOOLS%" == "" (
echo ERROR: Microsoft Visual Studio 2005 is not installed.
pause
goto END
)
set SolutionDirectory=%cd%\vs8
set DebugOutputDirectory=%SolutionDirectory%\out
set ReleaseOutputDirectory=%SolutionDirectory%\out
set DebugLibraryDirectory=%SolutionDirectory%\out
set ReleaseLibraryDirectory=%SolutionDirectory%\out
set TemporaryDirectory=%SolutionDirectory%\temp
rem Setting environment for using Microsoft Visual Studio 2005 x86 tools.
call "%VS80COMNTOOLS%vsvars32.bat"
vs8\evil.sln
:END

View File

@ -0,0 +1,29 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevil", "libevil.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdlfcn", "libdlfcn.vcproj", "{2DAB1902-38E3-4F58-8403-C1BC7C077E1F}"
ProjectSection(ProjectDependencies) = postProject
{689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32
{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32
{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32
{689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32
{2DAB1902-38E3-4F58-8403-C1BC7C077E1F}.Debug|Win32.ActiveCfg = Debug|Win32
{2DAB1902-38E3-4F58-8403-C1BC7C077E1F}.Debug|Win32.Build.0 = Debug|Win32
{2DAB1902-38E3-4F58-8403-C1BC7C077E1F}.Release|Win32.ActiveCfg = Release|Win32
{2DAB1902-38E3-4F58-8403-C1BC7C077E1F}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -1,205 +1,200 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="libmman"
ProjectGUID="{799E26AA-26BC-4C21-B65F-0DF8F02E8F5F}"
RootNamespace="libmman"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(DebugOutputDirectory)"
IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(INCLUDE)"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;EFL_EVIL_MMAN_BUILD;DLL_EXPORT;__CRT_INLINE=__inline"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libevil.lib"
OutputFile="$(OutDir)\libmman.dll"
AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
/>
<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|Win32"
OutputDirectory="$(ReleaseOutputDirectory)"
IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(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"
AdditionalIncludeDirectories="$(INCLUDE)"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;EFL_EVIL_MMAN_BUILD;DLL_EXPORT;__CRT_INLINE=__inline"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libevil.lib"
OutputFile="$(OutDir)\libmman.dll"
AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
/>
<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>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\lib\mman\mman.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<Filter
Name="sys"
>
<File
RelativePath="..\..\src\lib\mman\sys\mman.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="Resource Files"
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}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="libdlfcn"
ProjectGUID="{2DAB1902-38E3-4F58-8403-C1BC7C077E1F}"
RootNamespace="libdlfcn"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(DebugOutputDirectory)"
IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(INCLUDE)"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;EFL_EVIL_DLFCN_BUILD;DLL_EXPORT;_POSIX_;__UNUSED__="
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libevil.lib"
OutputFile="$(OutDir)\libdl.dll"
AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(ReleaseOutputDirectory)"
IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(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"
AdditionalIncludeDirectories="$(INCLUDE)"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;EFL_EVIL_DLFCN_BUILD;DLL_EXPORT;_POSIX_;__UNUSED__="
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libevil.lib"
OutputFile="$(OutDir)\libdl.dll"
AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\lib\dlfcn\dlfcn.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\..\src\lib\dlfcn\dlfcn.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
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}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -0,0 +1,338 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="libevil"
ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
RootNamespace="libevil"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(DebugOutputDirectory)"
IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(INCLUDE)"
PreprocessorDefinitions="HAVE_ERRNO_H;SECURITY_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVIL_BUILD;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="false"
LinkLibraryDependencies="true"
AdditionalDependencies="wsock32.lib Secur32.lib"
OutputFile="$(OutDir)\libevil.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
GenerateDebugInformation="true"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(ReleaseOutputDirectory)"
IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(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"
AdditionalIncludeDirectories="$(INCLUDE)"
PreprocessorDefinitions="HAVE_ERRNO_H;SECURITY_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVIL_BUILD;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;__UNUSED__="
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="false"
LinkLibraryDependencies="true"
AdditionalDependencies="wsock32.lib Secur32.lib"
OutputFile="$(OutDir)\libevil.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\src\lib\evil_dirent.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_errno.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_fcntl.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_fnmatch.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_fnmatch_list_of_states.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_langinfo.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_link_xp.cpp"
>
</File>
<File
RelativePath="..\..\src\lib\evil_main.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_mman.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_pwd.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_stdio.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_stdlib.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_string.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_time.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_unistd.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_util.c"
>
</File>
<File
RelativePath="..\..\src\lib\evil_uuid.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\..\src\lib\dirent.h"
>
</File>
<File
RelativePath="..\..\src\lib\errno.h"
>
</File>
<File
RelativePath="..\..\src\lib\Evil.h"
>
</File>
<File
RelativePath="..\..\src\lib\evil_fcntl.h"
>
</File>
<File
RelativePath="..\..\src\lib\evil_fnmatch_private.h"
>
</File>
<File
RelativePath="..\..\src\lib\evil_langinfo.h"
>
</File>
<File
RelativePath="..\..\src\lib\evil_main.h"
>
</File>
<File
RelativePath="..\..\src\lib\evil_private.h"
>
</File>
<File
RelativePath="..\..\src\lib\evil_stdio.h"
>
</File>
<File
RelativePath="..\..\src\lib\evil_stdlib.h"
>
</File>
<File
RelativePath="..\..\src\lib\evil_string.h"
>
</File>
<File
RelativePath="..\..\src\lib\evil_unistd.h"
>
</File>
<File
RelativePath="..\..\src\lib\evil_util.h"
>
</File>
<File
RelativePath="..\..\src\lib\fnmatch.h"
>
</File>
<File
RelativePath="..\..\src\lib\sys\mman.h"
>
</File>
<File
RelativePath="..\..\src\lib\pwd.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
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}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -0,0 +1,15 @@
@echo off
set Target=%cd%
set e17=%cd%\..\..\..\..\..\..
set Libs=%e17%\libs
set Proto=%e17%\proto
set Extern=%e17%\..\extern
rem Copy proto
cd %Proto%\evil\win32\vs8\out
xcopy libdl.dll %Target%\ /Q /Y
if exist libdl.pdb xcopy libdl.pdb %Target%\ /Q /Y
xcopy libevil.dll %Target%\ /Q /Y
if exist libevil.pdb xcopy libevil.pdb %Target%\ /Q /Y

View File

@ -1,30 +1,35 @@
@echo off
rem Warning: environment is set for Win32 platform.
rem Setup common Win32 environment variables
pushd ..
call set_env.bat
popd
set SolutionDirectory=%cd%
set DebugOutputDirectory=%SolutionDirectory%\out
set ReleaseOutputDirectory=%SolutionDirectory%\out
set DebugLibraryDirectory=%SolutionDirectory%\out
set ReleaseLibraryDirectory=%SolutionDirectory%\out
set TemporaryDirectory=%SolutionDirectory%\temp
rem Check for basic requirements
if "%VS80COMNTOOLS%" == "" (
echo ERROR: Microsoft Visual Studio 2005 is not installed.
pause
goto END
)
rem Setting environment for using Microsoft Visual Studio 2005 x86 tools.
call "%VS80COMNTOOLS%vsvars32.bat"
evil.sln
@echo off
rem Warning: environment is set for Win32 platform.
set PROJECT_TYPE=vs8
pushd ..\..
call set_env.bat
popd
if "%EXT_DIR%" == "" goto END
rem Setup common Win32 environment variables
set SolutionDirectory=%cd%
set DebugOutputDirectory=%SolutionDirectory%\out
set ReleaseOutputDirectory=%SolutionDirectory%\out
set DebugLibraryDirectory=%SolutionDirectory%\out
set ReleaseLibraryDirectory=%SolutionDirectory%\out
set TemporaryDirectory=%SolutionDirectory%\temp
rem Check for basic requirements
if "%VS80COMNTOOLS%" == "" (
echo ERROR: Microsoft Visual Studio 2005 is not installed.
pause
goto END
)
rem Setting environment for using Microsoft Visual Studio 2005 x86 tools.
call "%VS80COMNTOOLS%vsvars32.bat"
set LIB=%SolutionDirectory%\..\out;%LIB%
test.sln
:END

View File

@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcproj", "{5C640EA7-6E65-46FF-A1FE-EB0955B0CC5A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5C640EA7-6E65-46FF-A1FE-EB0955B0CC5A}.Debug|Win32.ActiveCfg = Debug|Win32
{5C640EA7-6E65-46FF-A1FE-EB0955B0CC5A}.Debug|Win32.Build.0 = Debug|Win32
{5C640EA7-6E65-46FF-A1FE-EB0955B0CC5A}.Release|Win32.ActiveCfg = Release|Win32
{5C640EA7-6E65-46FF-A1FE-EB0955B0CC5A}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -0,0 +1,205 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="test"
ProjectGUID="{5C640EA7-6E65-46FF-A1FE-EB0955B0CC5A}"
RootNamespace="test"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(DebugOutputDirectory)"
IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(INCLUDE)"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_EVIL;__CRT_INLINE=__inline;snprintf=_snprintf_c;PACKAGE_DATA_DIR=;HAVE_EVAS_DIRECT3D;HAVE_EVAS_SOFTWARE_DDRAW;_USE_MATH_DEFINES"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libevil.lib libdl.lib"
OutputFile="$(OutDir)\test.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<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|Win32"
OutputDirectory="$(ReleaseOutputDirectory)"
IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(INCLUDE)"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_EVIL;__CRT_INLINE=__inline;snprintf=_snprintf_c;PACKAGE_DATA_DIR=;HAVE_EVAS_DIRECT3D;HAVE_EVAS_SOFTWARE_DDRAW;_USE_MATH_DEFINES"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libevil.lib libdl.lib"
OutputFile="$(OutDir)\test.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<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>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\test_fnmatch.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
Name="Resource Files"
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}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -0,0 +1,85 @@
#include <stdlib.h>
#include <stdio.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#include <Evil.h>
#include <fnmatch.h>
const char *translate_return_value(int ret)
{
static char buf[256] = "";
switch (ret)
{
case 0:
strcpy(buf, "Match");
break;
case FNM_NOMATCH:
strcpy(buf, "NoMatch");
break;
case FNM_SYNTAXERR:
strcpy(buf, "SyntaxErr");
break;
case FNM_NOMEM:
strcpy(buf, "NoMem");
break;
default:
sprintf(buf, "%d", ret);
break;
}
return buf;
}
#define TEST_CASE(a) printf(#a " = %s\n", translate_return_value(a));
int main()
{
TEST_CASE(fnmatch("", "", 0));
TEST_CASE(fnmatch("a", "a", 0));
TEST_CASE(fnmatch("a", "b", 0));
TEST_CASE(fnmatch("a", "ba", 0));
TEST_CASE(fnmatch("a", "ab", 0));
TEST_CASE(fnmatch("a", "ba", 0));
TEST_CASE(fnmatch("a", "b a", 0));
TEST_CASE(fnmatch("a", "aa", 0));
TEST_CASE(fnmatch("ab", "ab", 0));
TEST_CASE(fnmatch("ab", "ab ", 0));
TEST_CASE(fnmatch("ab", " ab", 0));
TEST_CASE(fnmatch("ab", "abc", 0));
TEST_CASE(fnmatch("ab", "ab c", 0));
TEST_CASE(fnmatch("ab", "ba", 0));
TEST_CASE(fnmatch("a*", "a", 0));
TEST_CASE(fnmatch("a*", "b", 0));
TEST_CASE(fnmatch("a*", "ab", 0));
TEST_CASE(fnmatch("a*", "ba", 0));
TEST_CASE(fnmatch("a*", "aba", 0));
TEST_CASE(fnmatch("a?", "a", 0));
TEST_CASE(fnmatch("a?", "b", 0));
TEST_CASE(fnmatch("a?", "ab", 0));
TEST_CASE(fnmatch("a?", "ba", 0));
TEST_CASE(fnmatch("a?", "aa", 0));
TEST_CASE(fnmatch("a?", "aba", 0));
TEST_CASE(fnmatch("a?", "a a", 0));
TEST_CASE(fnmatch("*.*", "a", 0));
TEST_CASE(fnmatch("*.*", "a.", 0));
TEST_CASE(fnmatch("*.*", ".", 0));
TEST_CASE(fnmatch("*.*", ".a", 0));
TEST_CASE(fnmatch("*.*", " . ", 0));
TEST_CASE(fnmatch("*.*", "aa.aa", 0));
TEST_CASE(fnmatch("*", "", 0));
TEST_CASE(fnmatch("*", "a", 0));
TEST_CASE(fnmatch("*?", "", 0));
TEST_CASE(fnmatch("*?", "a", 0));
TEST_CASE(fnmatch("*abc*", "aabbccabcaa", 0));
TEST_CASE(fnmatch("\\", "", 0));
}