Merge vc90 update patch from IronLegend, thanks

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10555 e03df62e-2008-0410-955e-edbf42e46eb7

4 files changed, 741 insertions, 44 deletions

diff --git a/win/configure.cpp b/win/configure.cpp
index bd985bc24..0eaa73e3f 100644
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -515,13 +515,13 @@ void WriteCompileCommands()
 #ifdef WIN64
 	// /MACHINE:X64
 	#ifdef _DEBUG
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\lib\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\lib\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\debug", NULL);
 		CreateDirectory("..\\bin\\debug\\bin", NULL);
 		CreateDirectory("..\\bin\\debug\\lib", NULL);
 		CreateDirectory("..\\bin\\debug\\modules", NULL);
 	#else
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\lib\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\lib\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\release", NULL);
 		CreateDirectory("..\\bin\\release\\bin", NULL);
 		CreateDirectory("..\\bin\\release\\lib", NULL);
@@ -529,13 +529,13 @@ void WriteCompileCommands()
 	#endif
 #else
 	#ifdef _DEBUG
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug\\lib\\$*.so\" /PDB:\"..\\..\\bin\\debug\\lib\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\lib\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug\\lib\\$*.so\" /PDB:\"..\\..\\bin\\debug\\lib\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\lib\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\debug", NULL);
 		CreateDirectory("..\\bin\\debug\\bin", NULL);
 		CreateDirectory("..\\bin\\debug\\lib", NULL);
 		CreateDirectory("..\\bin\\debug\\modules", NULL);
 	#else
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release\\lib\\$*.so\" /PDB:\"..\\..\\bin\\release\\lib\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\lib\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release\\lib\\$*.so\" /PDB:\"..\\..\\bin\\release\\lib\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\lib\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\release", NULL);
 		CreateDirectory("..\\bin\\release\\bin", NULL);
 		CreateDirectory("..\\bin\\release\\lib", NULL);
@@ -596,21 +596,21 @@ void WriteCompileModules()
 #ifdef WIN64
 	// /MACHINE:X64
 	#ifdef _DEBUG
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\modules\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\modules\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\modules\\debug_x64", NULL);
 	#else
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\modules\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\modules\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\modules\\release_x64", NULL);
 	#endif
 #else
 	#ifdef _DEBUG
-		fprintf(f, "  cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\modules\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\modules\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\modules\\debug", NULL);
 		CreateDirectory("..\\src\\modules\\debug\\lib", NULL);
 		CreateDirectory("..\\src\\modules\\debug\\modules", NULL);
 		CreateDirectory("..\\src\\modules\\debug\\bin", NULL);
 	#else
-		fprintf(f, "  cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\modules\\release", NULL);
 		CreateDirectory("..\\src\\modules\\release\\lib", NULL);
 		CreateDirectory("..\\src\\modules\\release\\modules", NULL);
diff --git a/win/configureVC90.vcproj b/win/configureVC90.vcproj
index 0fed898f4..c9c9755c9 100644
--- a/win/configureVC90.vcproj
+++ b/win/configureVC90.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="configure"

 	ProjectGUID="{B922B569-727E-4EB0-827A-04E133A91DE7}"

 	RootNamespace="configure"

@@ -22,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="."

-			IntermediateDirectory="Debug_configureVc80"

+			IntermediateDirectory="Debug_configureVc90"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

@@ -200,7 +200,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="1"

+				AdditionalOptions="/I:&quot;include&quot;"

+				Optimization="0"

 				WholeProgramOptimization="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

 				MinimalRebuild="true"

@@ -208,7 +209,7 @@
 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="0"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -224,7 +225,7 @@
 				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"

 				OutputFile="$(OutDir)/configure.exe"

 				LinkIncremental="1"

-				GenerateDebugInformation="false"

+				GenerateDebugInformation="true"

 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

diff --git a/win/inspircdVC90.vcproj b/win/inspircdVC90.vcproj
index 1cccd0029..74e1e754a 100644
--- a/win/inspircdVC90.vcproj
+++ b/win/inspircdVC90.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="inspircd"

 	ProjectGUID="{FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}"

 	RootNamespace="inspircd"

@@ -22,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="..\bin\debug\bin"

-			IntermediateDirectory="DebugVc80"

+			IntermediateDirectory="DebugVc90"

 			ConfigurationType="1"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			CharacterSet="2"

@@ -69,7 +69,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dbghelp.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"

+				AdditionalDependencies="psapi.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"

 				ShowProgress="0"

 				OutputFile="$(OutDir)/inspircd.exe"

 				LinkIncremental="1"

@@ -240,11 +240,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="dbghelp.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"

+				AdditionalDependencies="psapi.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"

 				OutputFile="$(OutDir)/inspircd.exe"

 				LinkIncremental="1"

 				EmbedManagedResourceFile="inspircd.ico"

-				GenerateDebugInformation="false"

+				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

@@ -385,6 +385,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\cidr.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\src\command_parse.cpp"

 				>

 			</File>

@@ -425,6 +429,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\inspircd_namedpipe.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\src\inspsocket.cpp"

 				>

 			</File>

@@ -433,6 +441,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\listensocket.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\src\logger.cpp"

 				>

 			</File>

@@ -517,6 +529,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\win32service.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\src\xline.cpp"

 				>

 			</File>

@@ -579,10 +595,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\include\connection.h"

-				>

-			</File>

-			<File

 				RelativePath="..\include\ctables.h"

 				>

 			</File>

@@ -627,6 +639,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\inspircd_namedpipe.h"

+				>

+			</File>

+			<File

 				RelativePath="..\include\inspsocket.h"

 				>

 			</File>

@@ -647,6 +663,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\include\numerics.h"

+				>

+			</File>

+			<File

 				RelativePath="..\include\snomasks.h"

 				>

 			</File>

@@ -707,9 +727,229 @@
 				>

 			</File>

 			<File

+				RelativePath=".\win32service.h"

+				>

+			</File>

+			<File

 				RelativePath="..\include\xline.h"

 				>

 			</File>

+			<Filter

+				Name="commands"

+				>

+				<File

+					RelativePath="..\include\commands\cmd_admin.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_away.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_clearcache.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_commands.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_connect.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_die.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_eline.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_gline.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_info.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_invite.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_ison.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_join.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_kick.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_kill.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_kline.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_links.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_list.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_loadmodule.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_lusers.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_map.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_mode.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_modules.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_motd.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_names.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_nick.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_notice.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_oper.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_part.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_pass.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_ping.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_pong.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_privmsg.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_qline.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_quit.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_rehash.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_reloadmodule.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_restart.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_rules.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_server.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_squit.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_stats.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_time.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_topic.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_trace.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_unloadmodule.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_user.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_userhost.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_version.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_wallops.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_who.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_whois.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_whowas.h"

+					>

+				</File>

+				<File

+					RelativePath="..\include\commands\cmd_zline.h"

+					>

+				</File>

+			</Filter>

 		</Filter>

 		<Filter

 			Name="modes"

@@ -767,10 +1007,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\modes\umode_n.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\src\modes\umode_o.cpp"

 				>

 			</File>

@@ -787,6 +1023,26 @@
 			Name="Modules"

 			>

 			<File

+				RelativePath="..\src\modules\account.h"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\httpclient.h"

 				>

 				<FileConfiguration

@@ -827,6 +1083,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_abbreviation.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_alias.cpp"

 				>

 				<FileConfiguration

@@ -1067,6 +1343,46 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_cap.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\modules\m_cap.h"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_cban.cpp"

 				>

 				<FileConfiguration

@@ -1167,6 +1483,46 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_chanlog.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\modules\m_channelban.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_chanprotect.cpp"

 				>

 				<FileConfiguration

@@ -1407,6 +1763,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_connectban.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_connflood.cpp"

 				>

 				<FileConfiguration

@@ -1507,6 +1883,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_delayjoin.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_denychans.cpp"

 				>

 				<FileConfiguration

@@ -1627,6 +2023,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_gecosban.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_globalload.cpp"

 				>

 				<FileConfiguration

@@ -1787,6 +2203,46 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_httpd_acl.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\modules\m_httpd_config.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_httpd_stats.cpp"

 				>

 				<FileConfiguration

@@ -1967,6 +2423,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_maphide.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_md5.cpp"

 				>

 				<FileConfiguration

@@ -2007,6 +2483,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_muteban.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_namesx.cpp"

 				>

 				<FileConfiguration

@@ -2167,6 +2663,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_nopartmsg.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_oper_hash.cpp"

 				>

 				<FileConfiguration

@@ -2347,6 +2863,66 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_password_hash.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\modules\m_permchannels.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\modules\m_proxyscan.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_randquote.cpp"

 				>

 				<FileConfiguration

@@ -2507,6 +3083,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_ripemd160.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_rpc_json.cpp"

 				>

 				<FileConfiguration

@@ -2667,6 +3263,46 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_sasl.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\modules\m_satopic.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_securelist.cpp"

 				>

 				<FileConfiguration

@@ -2707,6 +3343,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_serverban.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_services.cpp"

 				>

 				<FileConfiguration

@@ -2887,6 +3543,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_shun.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_silence.cpp"

 				>

 				<FileConfiguration

@@ -3207,6 +3883,26 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_xline_db.cpp"

+				>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_xmlsocket.cpp"

 				>

 				<FileConfiguration

@@ -4763,7 +5459,7 @@
 				>

 			</File>

 			<File

-				RelativePath=".\inspircd.rc"

+				RelativePath=".\resource.rc"

 				>

 			</File>

 		</Filter>

diff --git a/win/m_spanningtreeVC90.vcproj b/win/m_spanningtreeVC90.vcproj
index 5cc078701..aa2e91444 100644
--- a/win/m_spanningtreeVC90.vcproj
+++ b/win/m_spanningtreeVC90.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="m_spanningtree"

 	ProjectGUID="{1EC86B60-AB2A-4984-8A7E-0422C15601E0}"

 	RootNamespace="m_spanningtree"

@@ -131,7 +131,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

@@ -217,6 +217,7 @@
 				UsePrecompiledHeader="0"

 				WarningLevel="2"

 				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -229,12 +230,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/MD"

 				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"

 				OutputFile="$(OutDir)/m_spanningtree.so"

 				LinkIncremental="1"

 				AdditionalLibraryDirectories="..\bin\release\bin;..\bin\release\lib"

-				GenerateDebugInformation="false"

+				GenerateDebugInformation="true"

 				SubSystem="2"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

@@ -298,7 +298,7 @@
 				AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD"

 				MinimalRebuild="true"

-				RuntimeLibrary="2"

+				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="2"

 				Detect64BitPortabilityProblems="true"

@@ -368,6 +368,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\modules\m_spanningtree\cachetimer.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_spanningtree\capab.cpp"

 				>

 			</File>

@@ -408,10 +412,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\inspircd_memory_functions.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\src\modules\m_spanningtree\kill.cpp"

 				>

 			</File>

@@ -564,10 +564,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\modules\m_spanningtree\timesynctimer.cpp"

-				>

-			</File>

-			<File

 				RelativePath="..\src\modules\m_spanningtree\treeserver.cpp"

 				>

 			</File>

@@ -602,6 +598,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

 			>

 			<File

+				RelativePath="..\src\modules\m_spanningtree\cachetimer.h"

+				>

+			</File>

+			<File

 				RelativePath="..\src\modules\m_spanningtree\handshaketimer.h"

 				>

 			</File>

@@ -626,10 +626,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\src\modules\m_spanningtree\timesynctimer.h"

-				>

-			</File>

-			<File

 				RelativePath="..\src\modules\m_spanningtree\treeserver.h"

 				>

 			</File>

@@ -647,6 +643,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

 			>

+			<File

+				RelativePath=".\inspircd_memory_functions.cpp"

+				>

+			</File>

 		</Filter>

 	</Files>

 	<Globals>