diff --git a/client/win/win_main.cpp b/client/win/win_main.cpp
index 006c55e244..76f80f6d58 100644
--- a/client/win/win_main.cpp
+++ b/client/win/win_main.cpp
@@ -39,6 +39,9 @@ int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR Args, int WinMod
 
 	// uh, why did MS have to "improve" on char*?
 
+	// possible buffer overrun fix by asmall_uk
+	argc = min(100,argc);
+
 	for (i=0; i<argc; i++) {
 		argv[i] = (char*)args[i];
 	}
@@ -46,4 +49,10 @@ int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR Args, int WinMod
 
 	return 0;
 }
+
+BOOL RequestNetConnect()
+{
+	return TRUE;
+}
+
 #endif
diff --git a/win_build/boinc_cli/boinc_cli.dsp b/win_build/boinc_cli/boinc_cli.dsp
index e356b8040e..5a9cfe5d33 100755
--- a/win_build/boinc_cli/boinc_cli.dsp
+++ b/win_build/boinc_cli/boinc_cli.dsp
@@ -43,7 +43,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MLd /W3 /GX /ZI /Od /I "../../lib/" /I "../../api/" /I "../../client/" /I "../../RSAEuro/source/" /I "../../client/win/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D MAJOR_VERSION=0 /D MINOR_VERSION=07 /YX /FD /c /Tp
+# ADD CPP /nologo /MT /W3 /GX /ZI /Od /I "../../lib/" /I "../../api/" /I "../../RSAEuro/source/" /I "../../client/win/" /I "../../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D MAJOR_VERSION=0 /D MINOR_VERSION=07 /D "WIN_CLI" /YX /FD /c /Tp
+# SUBTRACT CPP /Fr
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib wininet.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 wsock32.lib wininet.lib winmm.lib nafxcwd.lib libcmtd.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"nafxcwd" /nodefaultlib:"libcmtd" /nodefaultlib:"libcmt" /nodefaultlib:"libcd"
 
 !ELSEIF  "$(CFG)" == "boinc_cli - Win32 Debug"
 
@@ -69,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /GX /ZI /Od /I "../../lib/" /I "../../api/" /I "../../client/" /I "../../RSAEuro/source/" /I "../../client/win/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D MAJOR_VERSION=0 /D MINOR_VERSION=07 /FR /YX /FD /GZ /c /Tp
+# ADD CPP /nologo /MT /W3 /GX /ZI /Od /I "../../lib/" /I "../../api/" /I "../../RSAEuro/source/" /I "../../client/win/" /I "../../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D MAJOR_VERSION=0 /D MINOR_VERSION=07 /D "WIN_CLI" /FR /YX /FD /GZ /c /Tp
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib wininet.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 wsock32.lib wininet.lib winmm.lib nafxcwd.lib libcmtd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"nafxcwd" /nodefaultlib:"libcmtd" /nodefaultlib:"libcmt" /nodefaultlib:"libcd" /pdbtype:sept
 
 !ENDIF 
 
@@ -92,6 +93,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=..\..\client\account.C
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Client\app.C
 # End Source File
 # Begin Source File
@@ -136,6 +141,10 @@ SOURCE=..\..\lib\filesys.C
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\api\graphics_api.C
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Client\Hostinfo.c
 # End Source File
 # Begin Source File
diff --git a/win_build/boinc_gui/boinc_gui.dsp b/win_build/boinc_gui/boinc_gui.dsp
index a61ab46c4b..ef05a278c2 100755
--- a/win_build/boinc_gui/boinc_gui.dsp
+++ b/win_build/boinc_gui/boinc_gui.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /ZI /Od /I "../../lib/" /I "../../api/" /I "../../client/" /I "../../RSAEuro/source/" /I "../../client/win/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D MAJOR_VERSION=0 /D MINOR_VERSION=07 /YX /FD /c /Tp
+# ADD CPP /nologo /MT /W3 /GX /ZI /Od /I "../../lib/" /I "../../api/" /I "../../RSAEuro/source/" /I "../../client/win/" /I "../../client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D MAJOR_VERSION=0 /D MINOR_VERSION=07 /YX /FD /c /Tp
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
diff --git a/win_build/test_net_xfer/test_net_xfer.dsp b/win_build/test_net_xfer/test_net_xfer.dsp
index 3afc1a2c4d..78e20120d2 100644
--- a/win_build/test_net_xfer/test_net_xfer.dsp
+++ b/win_build/test_net_xfer/test_net_xfer.dsp
@@ -39,6 +39,7 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD CPP /nologo /W3 /GX /O2 /I "../../lib/" /I "../../api/" /I "../../client/" /I "../../RSAEuro/source/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
diff --git a/win_build/upper_case/upper_case.dsp b/win_build/upper_case/upper_case.dsp
index 8dcf80f7df..85b3b5960a 100755
--- a/win_build/upper_case/upper_case.dsp
+++ b/win_build/upper_case/upper_case.dsp
@@ -40,6 +40,7 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
 # ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c