diff --git a/iis/ModSecurityIIS.sln b/iis/ModSecurityIIS.sln index 20b21acc..2a24d17e 100644 --- a/iis/ModSecurityIIS.sln +++ b/iis/ModSecurityIIS.sln @@ -9,6 +9,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mlogc", "mlogc.vcxproj", "{ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Custom Debug|Mixed Platforms = Custom Debug|Mixed Platforms + Custom Debug|Win32 = Custom Debug|Win32 + Custom Debug|x64 = Custom Debug|x64 + Custom Debug|x86 = Custom Debug|x86 Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 @@ -19,6 +23,14 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D1F7201F-064B-48AB-868C-FED22464841C}.Custom Debug|Mixed Platforms.ActiveCfg = Custom Debug|Win32 + {D1F7201F-064B-48AB-868C-FED22464841C}.Custom Debug|Mixed Platforms.Build.0 = Custom Debug|Win32 + {D1F7201F-064B-48AB-868C-FED22464841C}.Custom Debug|Win32.ActiveCfg = Custom Debug|Win32 + {D1F7201F-064B-48AB-868C-FED22464841C}.Custom Debug|Win32.Build.0 = Custom Debug|Win32 + {D1F7201F-064B-48AB-868C-FED22464841C}.Custom Debug|x64.ActiveCfg = Custom Debug|x64 + {D1F7201F-064B-48AB-868C-FED22464841C}.Custom Debug|x64.Build.0 = Custom Debug|x64 + {D1F7201F-064B-48AB-868C-FED22464841C}.Custom Debug|x86.ActiveCfg = Custom Debug|Win32 + {D1F7201F-064B-48AB-868C-FED22464841C}.Custom Debug|x86.Build.0 = Custom Debug|Win32 {D1F7201F-064B-48AB-868C-FED22464841C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {D1F7201F-064B-48AB-868C-FED22464841C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {D1F7201F-064B-48AB-868C-FED22464841C}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -34,6 +46,14 @@ Global {D1F7201F-064B-48AB-868C-FED22464841C}.Release|x64.Build.0 = Release|x64 {D1F7201F-064B-48AB-868C-FED22464841C}.Release|x86.ActiveCfg = Release|Win32 {D1F7201F-064B-48AB-868C-FED22464841C}.Release|x86.Build.0 = Release|Win32 + {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Custom Debug|Mixed Platforms.ActiveCfg = Custom Debug|Win32 + {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Custom Debug|Mixed Platforms.Build.0 = Custom Debug|Win32 + {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Custom Debug|Win32.ActiveCfg = Custom Debug|Win32 + {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Custom Debug|Win32.Build.0 = Custom Debug|Win32 + {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Custom Debug|x64.ActiveCfg = Custom Debug|x64 + {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Custom Debug|x64.Build.0 = Custom Debug|x64 + {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Custom Debug|x86.ActiveCfg = Custom Debug|Win32 + {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Custom Debug|x86.Build.0 = Custom Debug|Win32 {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {DD595511-33F2-475A-B36F-2A6B27E03FA0}.Debug|Win32.ActiveCfg = Debug|Win32 diff --git a/iis/ModSecurityIIS.vcxproj b/iis/ModSecurityIIS.vcxproj index 00ad4dcf..7f2822a4 100755 --- a/iis/ModSecurityIIS.vcxproj +++ b/iis/ModSecurityIIS.vcxproj @@ -1,6 +1,14 @@  + + Custom Debug + Win32 + + + Custom Debug + x64 + Debug Win32 @@ -36,10 +44,18 @@ DynamicLibrary v120 + + DynamicLibrary + v120 + DynamicLibrary v120 + + DynamicLibrary + v120 + @@ -52,24 +68,40 @@ + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)\$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ $(Configuration)\ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset AllRules.ruleset @@ -78,8 +110,13 @@ .dll .dll + .dll .dll + + Build + true + Disabled @@ -100,6 +137,26 @@ + + + Disabled + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;dependencies\build_dir\apache24\include;..\apache2;..\standalone;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include; + _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS + NotUsing + precomp.h + $(IntDir)$(TargetName).pch + ProgramDatabase + + + mymodule.def + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib + + + + + + Disabled @@ -124,6 +181,38 @@ + + + Disabled + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include; + _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC + NotUsing + precomp.h + $(IntDir)$(TargetName).pch + ProgramDatabase + + + mymodule.def + true + kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib; + + + + + + + net stop W3SVC /y + + + copy $(SolutionDir)\$(Configuration)\ModSecurityIIS.dll C:\Windows\System32\inetsrv\ + copy "$(SolutionDir)\$(Configuration)\ModSecurityIIS.dll" "C:\Windows\Sysnative\inetsrv\ModSecurityIIS.dll" +copy "$(SolutionDir)\$(Configuration)\ModSecurityIIS.dll" "C:\Windows\SysWOW64\inetsrv\ModSecurityIIS.dll" +echo "$(SolutionDir)\$(Configuration)\ModSecurityIIS.dll" "C:\Windows\Sysnative\inetsrv\ModSecurityIIS.dll" +echo "$(SolutionDir)\$(Configuration)\ModSecurityIIS.dll" "C:\Windows\SysWOW64\inetsrv\ModSecurityIIS.dll" + +net start W3SVC /y + + _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS diff --git a/iis/mlogc.vcxproj b/iis/mlogc.vcxproj index f19b8750..b8b56454 100644 --- a/iis/mlogc.vcxproj +++ b/iis/mlogc.vcxproj @@ -1,6 +1,14 @@  + + Custom Debug + Win32 + + + Custom Debug + x64 + Debug Win32 @@ -30,6 +38,12 @@ v120 Unicode + + Application + true + v120 + Unicode + Application false @@ -40,6 +54,9 @@ v120 + + v120 + v120 @@ -49,6 +66,9 @@ + + + @@ -67,6 +87,20 @@ false + + + _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC + NotUsing + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include;dependencies\build_dir\lloyd-yajl-f4b2b1a\build\yajl-2.0.1\include;dependencies\build_dir\curl\include; + + + Console + kernel32.lib;IPHLPAPI.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib;dependencies\build_dir\yajl\build\yajl-2.0.1\lib\yajl.lib;dependencies\build_dir\curl\lib\libcurl_imp.lib; + + + false + + _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC @@ -87,4 +121,4 @@ - + \ No newline at end of file