Apply patches to remove 200-odd dll limit on windows, made by GreenReaper, lots of thanks!

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

12 files changed, 617 insertions, 100 deletions

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index fff8653b3..dab770312 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -559,7 +559,7 @@ void CommandParser::SetupCommandTable(User* user)
 	if (library)
 	{
 		dirent* entry = NULL;
-		while ((entry = readdir(library)))
+		while (0 != (entry = readdir(library)))
 		{
 			if (match(entry->d_name, "cmd_*.so"))
 			{
@@ -663,3 +663,4 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
 	return translations;
 }
 
+
diff --git a/src/dns.cpp b/src/dns.cpp
index 4bb2da020..2e393de53 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -791,6 +791,7 @@ DNSInfo DNSRequest::ResultIsReady(DNSHeader &header, int length, int result_we_w
 	rr.type = DNS_QUERY_NONE;
 	rr.rdlength = 0;
 	rr.ttl = 1;	/* GCC is a whiney bastard -- see the XXX below. */
+	rr.rr_class = 0; /* Same for VC++ */
 
 	if (!(header.flags1 & FLAGS_MASK_QR))
 		return std::make_pair((unsigned char*)NULL,"Not a query result");
@@ -1175,3 +1176,4 @@ unsigned long DNS::PRNG()
 	return val;
 }
 
+
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index ee5d0a2bc..d533a6e45 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -12,8 +12,6 @@
  */
 
 /* $Install: src/inspircd $(BINPATH) */
-
-
 #include "inspircd.h"
 #include <signal.h>
 
@@ -28,6 +26,13 @@
 	#ifndef RUSAGE_SELF
 		#define RUSAGE_SELF 0
 	#endif
+
+	/* CRT memory debugging */
+	#ifdef DEBUG
+	#define _CRTDBG_MAP_ALLOC
+	#include <stdlib.h>
+	#include <crtdbg.h>
+	#endif
 #endif
 
 #include <fstream>
@@ -306,7 +311,9 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	 FloodQuitUser(&HandleFloodQuitUser)
 
 {
-
+#ifdef WIN32
+	_CrtSetDbgFlag ( _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
+#endif
 	int found_ports = 0;
 	FailedPortList pl;
 	int do_version = 0, do_nofork = 0, do_debug = 0,
diff --git a/src/modules.cpp b/src/modules.cpp
index 41e4e2606..df6876b1a 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -356,7 +356,7 @@ bool ModuleManager::Load(const char* filename)
 		{
 			/* Try and locate and load all modules matching the pattern */
 			dirent* entry = NULL;
-			while ((entry = readdir(library)))
+			while (0 != (entry = readdir(library)))
 			{
 				if (Instance->MatchText(entry->d_name, filename))
 				{
diff --git a/src/socket.cpp b/src/socket.cpp
index 17b98e28b..1341716f8 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -337,6 +337,7 @@ bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool ma
  */ 
 bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 {
+	_CrtCheckMemory();
 	/* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
 	sockaddr* servaddr = new sockaddr[2];
 	memset(servaddr,0,sizeof(sockaddr)*2);
@@ -510,7 +511,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 		{
 			irc::portparser portrange(configToken, false);
 			int portno = -1;
-			while ((portno = portrange.GetToken()))
+			while (0 != (portno = portrange.GetToken()))
 			{
 				if (*Addr == '*')
 					*Addr = 0;
@@ -583,3 +584,4 @@ int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
 	return inet_pton(AF_FAMILY, a, n);
 }
 
+
diff --git a/src/socketengines/socketengine_iocp.cpp b/src/socketengines/socketengine_iocp.cpp
index 9ae394e56..c1e97ce74 100644
--- a/src/socketengines/socketengine_iocp.cpp
+++ b/src/socketengines/socketengine_iocp.cpp
@@ -455,7 +455,7 @@ EventHandler * IOCPEngine::GetIntRef(int fd)
 
 int IOCPEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
 {
-	SOCKET s = fd->GetFd();
+	//SOCKET s = fd->GetFd();
 
 	Overlapped* acceptevent = NULL;
 	if (!fd->GetExt("windows_acceptevent", acceptevent))
@@ -465,7 +465,7 @@ int IOCPEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
 	Overlapped* ovl = acceptevent;
 	accept_overlap* ov = (accept_overlap*)ovl->m_params;
 	
-	sockaddr_in* server_address = (sockaddr_in*)&ov->buf[10];
+	//sockaddr_in* server_address = (sockaddr_in*)&ov->buf[10];
 	sockaddr_in* client_address = (sockaddr_in*)&ov->buf[38];
 
 	memcpy(addr, client_address, sizeof(sockaddr_in));
@@ -484,7 +484,7 @@ int IOCPEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen
 	accept_overlap* ov = (accept_overlap*)ovl->m_params;
 
 	sockaddr_in* server_address = (sockaddr_in*)&ov->buf[10];
-	sockaddr_in* client_address = (sockaddr_in*)&ov->buf[38];
+	//sockaddr_in* client_address = (sockaddr_in*)&ov->buf[38];
 
 	memcpy(name, server_address, sizeof(sockaddr_in));
 	*namelen = sizeof(sockaddr_in);
@@ -524,3 +524,4 @@ int IOCPEngine::Close(EventHandler* fd)
 	return this->Close(fd->GetFd());
 }
 
+
diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index 07d1b2373..566611367 100644
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -27,11 +27,11 @@ void Win32ThreadEngine::Create(Thread* thread_to_init)
 	HANDLE* MyThread = new HANDLE;
 	DWORD ThreadId = 0;
 
-	if (!(*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
+	if (NULL == (*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
 	{
 		delete MyThread;
 		Mutex(false);
-		throw CoreException(std::string("Unable to reate new Win32ThreadEngine: ") + dlerror());
+		throw CoreException(std::string("Unable to create new Win32ThreadEngine: ") + dlerror());
 	}
 
 	NewThread = thread_to_init;
@@ -85,3 +85,4 @@ void Win32ThreadEngine::FreeThread(Thread* thread)
 	}
 }
 
+
diff --git a/win/configure.cpp b/win/configure.cpp
index fab082780..a7351739e 100644
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -432,13 +432,21 @@ void Rebase()
 	*dest = 0;
 
 	WIN32_FIND_DATA fd;
+#ifdef _DEBUG
+	HANDLE fh = FindFirstFile("..\\bin\\debug\\lib\\*.so", &fd);
+#else
 	HANDLE fh = FindFirstFile("..\\bin\\release\\lib\\*.so", &fd);
+#endif
 	if(fh == INVALID_HANDLE_VALUE)
 		return;
 
 	do
 	{
+#ifdef _DEBUG
+		strcat(dest, " ..\\bin\\debug\\lib\\");
+#else
 		strcat(dest, " ..\\bin\\release\\lib\\");
+#endif
 		strcat(dest, fd.cFileName);
 	}
 	while (FindNextFile(fh, &fd));
@@ -449,7 +457,11 @@ void Rebase()
 	printf("%s\n", command);
 	system(command);
 
+#ifdef _DEBUG
+	fh = FindFirstFile("..\\bin\\debug\\modules\\*.so", &fd);
+#else
 	fh = FindFirstFile("..\\bin\\release\\modules\\*.so", &fd);
+#endif
 	if(fh == INVALID_HANDLE_VALUE)
 		return;
 
@@ -457,7 +469,11 @@ void Rebase()
 
 	do
 	{
+#ifdef _DEBUG
+		strcat(dest, " ..\\bin\\debug\\modules\\");
+#else
 		strcat(dest, " ..\\bin\\release\\modules\\");
+#endif
 		strcat(dest, fd.cFileName);
 	}
 	while (FindNextFile(fh, &fd));
@@ -508,13 +524,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 /MT /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 /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");
 		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 /MT /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 /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");
 		CreateDirectory("..\\src\\release", NULL);
 		CreateDirectory("..\\bin\\release\\bin", NULL);
 		CreateDirectory("..\\bin\\release\\lib", NULL);
@@ -522,13 +538,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 /MT /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 /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");
 		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 /MT /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 /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");
 		CreateDirectory("..\\src\\release", NULL);
 		CreateDirectory("..\\bin\\release\\bin", NULL);
 		CreateDirectory("..\\bin\\release\\lib", NULL);
@@ -585,21 +601,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 /MT /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 /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");
 		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 /MT /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 /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");
 		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 /MT /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 /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");
 		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 /MT /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 /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");
 		CreateDirectory("..\\src\\modules\\release", NULL);
 		CreateDirectory("..\\src\\modules\\release\\lib", NULL);
 		CreateDirectory("..\\src\\modules\\release\\modules", NULL);
diff --git a/win/configureVC80.vcproj b/win/configureVC80.vcproj
index e46cad94e..547091660 100644
--- a/win/configureVC80.vcproj
+++ b/win/configureVC80.vcproj
@@ -47,7 +47,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

@@ -98,9 +98,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

+			Name="Debug|x64"

 			OutputDirectory="."

-			IntermediateDirectory="Release"

+			IntermediateDirectory="x64Debug_Configure"

 			ConfigurationType="1"

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

 			CharacterSet="2"

@@ -119,16 +119,18 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WIN64"

 				MinimalRebuild="true"

-				RuntimeLibrary="0"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

+				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -142,14 +144,12 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				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"

+				LinkIncremental="2"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/configure.pdb"

 				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -177,9 +177,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

+			Name="Release|Win32"

 			OutputDirectory="."

-			IntermediateDirectory="x64Debug_Configure"

+			IntermediateDirectory="Release"

 			ConfigurationType="1"

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

 			CharacterSet="2"

@@ -198,18 +198,17 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WIN64"

+				WholeProgramOptimization="true"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

 				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

+				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -223,12 +222,15 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

+				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="2"

+				LinkIncremental="1"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/configure.pdb"

 				SubSystem="2"

-				TargetMachine="17"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				LinkTimeCodeGeneration="1"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj
index 305c6628f..4e3cf25b2 100644
--- a/win/inspircdVC80.vcproj
+++ b/win/inspircdVC80.vcproj
@@ -50,11 +50,12 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

-				WarningLevel="3"

+				WarningLevel="4"

 				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

+				DisableSpecificWarnings="4100; 4512; 4127"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -101,21 +102,20 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="@echo off&#x0D;&#x0A;echo Compiling Command Modules...&#x0D;&#x0A;cd ..\src&#x0D;&#x0A;nmake -f commands.mak&#x0D;&#x0A;echo Compiling Modules...&#x0D;&#x0A;cd modules&#x0D;&#x0A;nmake -f modules.mak&#x0D;&#x0A;"

+				CommandLine="@echo off&#x0D;&#x0A;echo Compiling Command Modules...&#x0D;&#x0A;cd ..\src\commands&#x0D;&#x0A;nmake -f commands.mak&#x0D;&#x0A;echo Compiling Modules...&#x0D;&#x0A;cd ..\modules&#x0D;&#x0A;nmake -f modules.mak&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\bin\release\bin"

-			IntermediateDirectory="Release"

+			Name="Debug|x64"

+			OutputDirectory="..\bin\debug_x64\bin"

+			IntermediateDirectory="x64DebugVc80"

 			ConfigurationType="1"

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

 			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

-				Description="running configure..."

-				CommandLine="&quot;$(InputDir)\configure.exe&quot;"

+				CommandLine=""

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -128,14 +128,16 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN64"

 				MinimalRebuild="true"

-				RuntimeLibrary="0"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

@@ -152,15 +154,16 @@
 			/>

 			<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="ws2_32.lib mswsock.lib"

+				ShowProgress="0"

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

 				LinkIncremental="1"

-				EmbedManagedResourceFile="inspircd.ico"

+				IgnoreDefaultLibraryNames=""

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/inspircd.pdb"

 				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

+				TargetMachine="17"

+				FixedBaseAddress="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -185,20 +188,21 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine="@echo off&#x0D;&#x0A;echo Compiling Command Modules...&#x0D;&#x0A;cd ..\src\commands&#x0D;&#x0A;nmake -f commands.mak&#x0D;&#x0A;echo Compiling Modules...&#x0D;&#x0A;cd ..\modules&#x0D;&#x0A;nmake -f modules.mak&#x0D;&#x0A;"

+				CommandLine=""

 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\bin\debug_x64\bin"

-			IntermediateDirectory="x64DebugVc80"

+			Name="Release|Win32"

+			OutputDirectory="..\bin\release\bin"

+			IntermediateDirectory="Release"

 			ConfigurationType="1"

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

 			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

-				CommandLine=""

+				Description="running configure..."

+				CommandLine="&quot;$(InputDir)\configure.exe&quot;"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -211,20 +215,19 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

+				Optimization="1"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN64"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

 				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

+				DebugInformationFormat="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -237,16 +240,16 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib mswsock.lib"

-				ShowProgress="0"

+				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"

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

 				LinkIncremental="1"

-				IgnoreDefaultLibraryNames=""

+				EmbedManagedResourceFile="inspircd.ico"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/inspircd.pdb"

 				SubSystem="1"

-				TargetMachine="17"

-				FixedBaseAddress="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				LinkTimeCodeGeneration="1"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -271,7 +274,7 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				CommandLine=""

+				CommandLine="@echo off&#x0D;&#x0A;echo Compiling Command Modules...&#x0D;&#x0A;cd ..\src\commands&#x0D;&#x0A;nmake -f commands.mak&#x0D;&#x0A;echo Compiling Modules...&#x0D;&#x0A;cd ..\modules&#x0D;&#x0A;nmake -f modules.mak&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

@@ -1049,6 +1052,14 @@
 				RelativePath="..\src\modules\m_callerid.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -2401,6 +2412,14 @@
 				RelativePath="..\src\modules\m_remoteinclude_http.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3276,6 +3295,14 @@
 					RelativePath="..\src\modules\extra\m_geoip.cpp"

 					>

 					<FileConfiguration

+						Name="Debug|Win32"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

 						Name="Release|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -3288,6 +3315,14 @@
 					RelativePath="..\src\modules\extra\m_ldapauth.cpp"

 					>

 					<FileConfiguration

+						Name="Debug|Win32"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

 						Name="Release|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -3300,6 +3335,14 @@
 					RelativePath="..\src\modules\extra\m_ldapoper.cpp"

 					>

 					<FileConfiguration

+						Name="Debug|Win32"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

 						Name="Release|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -3312,6 +3355,14 @@
 					RelativePath="..\src\modules\extra\m_mssql.cpp"

 					>

 					<FileConfiguration

+						Name="Debug|Win32"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

 						Name="Release|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -3364,6 +3415,14 @@
 					RelativePath="..\src\modules\extra\m_rline.cpp"

 					>

 					<FileConfiguration

+						Name="Debug|Win32"

+						ExcludedFromBuild="true"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+						/>

+					</FileConfiguration>

+					<FileConfiguration

 						Name="Release|Win32"

 						ExcludedFromBuild="true"

 						>

@@ -3641,6 +3700,14 @@
 				RelativePath="..\src\commands\cmd_admin.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3653,6 +3720,14 @@
 				RelativePath="..\src\commands\cmd_away.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3665,6 +3740,14 @@
 				RelativePath="..\src\commands\cmd_clearcache.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3677,6 +3760,14 @@
 				RelativePath="..\src\commands\cmd_commands.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3689,6 +3780,14 @@
 				RelativePath="..\src\commands\cmd_connect.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3701,6 +3800,14 @@
 				RelativePath="..\src\commands\cmd_die.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3713,6 +3820,14 @@
 				RelativePath="..\src\commands\cmd_eline.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3725,6 +3840,14 @@
 				RelativePath="..\src\commands\cmd_gline.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3737,6 +3860,14 @@
 				RelativePath="..\src\commands\cmd_info.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3749,6 +3880,14 @@
 				RelativePath="..\src\commands\cmd_invite.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3761,6 +3900,14 @@
 				RelativePath="..\src\commands\cmd_ison.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3773,6 +3920,14 @@
 				RelativePath="..\src\commands\cmd_join.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3785,6 +3940,14 @@
 				RelativePath="..\src\commands\cmd_kick.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3797,6 +3960,14 @@
 				RelativePath="..\src\commands\cmd_kill.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3809,6 +3980,14 @@
 				RelativePath="..\src\commands\cmd_kline.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3821,6 +4000,14 @@
 				RelativePath="..\src\commands\cmd_links.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3833,6 +4020,14 @@
 				RelativePath="..\src\commands\cmd_list.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3845,6 +4040,14 @@
 				RelativePath="..\src\commands\cmd_loadmodule.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3857,6 +4060,14 @@
 				RelativePath="..\src\commands\cmd_lusers.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3869,6 +4080,14 @@
 				RelativePath="..\src\commands\cmd_map.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3881,6 +4100,14 @@
 				RelativePath="..\src\commands\cmd_mode.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3893,6 +4120,14 @@
 				RelativePath="..\src\commands\cmd_modules.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3905,6 +4140,14 @@
 				RelativePath="..\src\commands\cmd_motd.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3917,6 +4160,14 @@
 				RelativePath="..\src\commands\cmd_names.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3929,6 +4180,14 @@
 				RelativePath="..\src\commands\cmd_nick.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3941,6 +4200,14 @@
 				RelativePath="..\src\commands\cmd_notice.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3953,6 +4220,14 @@
 				RelativePath="..\src\commands\cmd_oper.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3965,6 +4240,14 @@
 				RelativePath="..\src\commands\cmd_part.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3977,6 +4260,14 @@
 				RelativePath="..\src\commands\cmd_pass.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -3989,6 +4280,14 @@
 				RelativePath="..\src\commands\cmd_ping.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4001,6 +4300,14 @@
 				RelativePath="..\src\commands\cmd_pong.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4013,6 +4320,14 @@
 				RelativePath="..\src\commands\cmd_privmsg.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4025,6 +4340,14 @@
 				RelativePath="..\src\commands\cmd_qline.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4037,6 +4360,14 @@
 				RelativePath="..\src\commands\cmd_quit.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4049,6 +4380,14 @@
 				RelativePath="..\src\commands\cmd_rehash.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4061,6 +4400,14 @@
 				RelativePath="..\src\commands\cmd_reloadmodule.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4073,6 +4420,14 @@
 				RelativePath="..\src\commands\cmd_restart.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4085,6 +4440,14 @@
 				RelativePath="..\src\commands\cmd_rules.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4097,6 +4460,14 @@
 				RelativePath="..\src\commands\cmd_server.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4109,6 +4480,14 @@
 				RelativePath="..\src\commands\cmd_squit.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4121,6 +4500,14 @@
 				RelativePath="..\src\commands\cmd_stats.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4133,6 +4520,14 @@
 				RelativePath="..\src\commands\cmd_time.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4145,6 +4540,14 @@
 				RelativePath="..\src\commands\cmd_topic.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4157,6 +4560,14 @@
 				RelativePath="..\src\commands\cmd_trace.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4169,6 +4580,14 @@
 				RelativePath="..\src\commands\cmd_unloadmodule.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4181,6 +4600,14 @@
 				RelativePath="..\src\commands\cmd_user.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4193,6 +4620,14 @@
 				RelativePath="..\src\commands\cmd_userhost.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4205,6 +4640,14 @@
 				RelativePath="..\src\commands\cmd_version.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4217,6 +4660,14 @@
 				RelativePath="..\src\commands\cmd_wallops.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4229,6 +4680,14 @@
 				RelativePath="..\src\commands\cmd_who.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4241,6 +4700,14 @@
 				RelativePath="..\src\commands\cmd_whois.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4253,6 +4720,14 @@
 				RelativePath="..\src\commands\cmd_whowas.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

@@ -4265,6 +4740,14 @@
 				RelativePath="..\src\commands\cmd_zline.cpp"

 				>

 				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

 					Name="Release|Win32"

 					ExcludedFromBuild="true"

 					>

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index 7f183f19f..c32d31d5a 100644
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -302,7 +302,6 @@ int getopt_long_only(int ___argc, char *const *___argv, const char *__shortopts,
 		return -1;
 
 	const char * opt = ___argv[arg_counter];
-	int return_val = 0;
 
 	// if we're not an option, return an error.
 	if (strnicmp(opt, "--", 2) != 0)
diff --git a/win/m_spanningtreeVC80.vcproj b/win/m_spanningtreeVC80.vcproj
index f17fbfb52..fde969cba 100644
--- a/win/m_spanningtreeVC80.vcproj
+++ b/win/m_spanningtreeVC80.vcproj
@@ -101,9 +101,9 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\bin\release\modules"

-			IntermediateDirectory="Release"

+			Name="Debug|x64"

+			OutputDirectory="..\bin\debug_x64\modules"

+			IntermediateDirectory="x64Debug_spanningtree"

 			ConfigurationType="2"

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

 			CharacterSet="2"

@@ -122,16 +122,18 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"

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

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64"

 				MinimalRebuild="true"

-				RuntimeLibrary="0"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

-				WarningLevel="2"

+				WarningLevel="3"

 				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

@@ -146,16 +148,15 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				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"

+				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib"

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

 				LinkIncremental="1"

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

+				AdditionalLibraryDirectories="..\bin\debug_x64\bin;..\bin\debug_x64\lib"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/m_spanningtree.pdb"

 				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

 				ImportLibrary="$(OutDir)/m_spanningtree.lib"

-				TargetMachine="1"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -180,14 +181,12 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

-				Description="Re-basing shared objects..."

-				CommandLine="@cd $(InputDir)&#x0D;&#x0A;@$(InputDir)\rebase.bat&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

-			OutputDirectory="..\bin\debug_x64\modules"

-			IntermediateDirectory="x64Debug_spanningtree"

+			Name="Release|Win32"

+			OutputDirectory="..\bin\release\modules"

+			IntermediateDirectory="Release"

 			ConfigurationType="2"

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

 			CharacterSet="2"

@@ -206,18 +205,17 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

+				Optimization="1"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64"

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

 				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

-				WarningLevel="3"

+				WarningLevel="2"

 				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

@@ -232,15 +230,18 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib"

+				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\debug_x64\bin;..\bin\debug_x64\lib"

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

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/m_spanningtree.pdb"

 				SubSystem="2"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				LinkTimeCodeGeneration="1"

 				ImportLibrary="$(OutDir)/m_spanningtree.lib"

-				TargetMachine="17"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -265,6 +266,8 @@
 			/>

 			<Tool

 				Name="VCPostBuildEventTool"

+				Description="Re-basing shared objects..."

+				CommandLine="@cd $(InputDir)&#x0D;&#x0A;@$(InputDir)\rebase.bat&#x0D;&#x0A;"

 			/>

 		</Configuration>

 		<Configuration