From 116f9ec19309bb43be4b6c61cfc1a01868079289 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Thu, 4 Nov 2010 12:12:11 +0000
Subject: [PATCH] Plugins (MSW only): Removed the Image Randomization flag from
 most plugins' projects.  They now default to the value specified by the PCSX2
 properties sheet, which enables image randomization by default.

Technical details: Image randomization is a feature on Vista/7 that loads DLLs at random(-ish) addresses, improving security and reducing the amount of DLL relocation work required.  This option has no effect on WinXP.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3993 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 .../CDVDnull/Windows/CDVDnull_vs2008.vcproj   |   2 +-
 plugins/CDVDolio/cdvd_vs2008.vcproj           |   1 +
 plugins/FWnull/Windows/FWnull_vc2008.vcproj   |   6 +-
 plugins/GSnull/Windows/GSnull_vc2008.vcproj   |   8 +-
 plugins/LilyPad/LilyPad_VC2008.vcproj         | 507 +++++++++---------
 plugins/PadNull/Windows/PadNull_vc2008.vcproj |   2 -
 plugins/SSSPSXPAD/PadSSSPSX_vc2008.vcproj     |   2 -
 plugins/USBnull/Windows/USBnull_vc2008.vcproj |   4 +-
 .../dev9null/Windows/DEV9null_vc2008.vcproj   |  10 +-
 .../spu2-x/src/Windows/Spu2-X_vs2008.vcproj   |   4 -
 plugins/xpad/xpad_vs2008.vcproj               |   1 +
 plugins/zerogs/dx/Windows/zerogs_2008.vcproj  |   3 -
 plugins/zerospu2/Windows/ZeroSPU2_2008.vcproj |   3 -
 .../opengl/Win32/zerogsogl_2008.vcproj        |   4 +-
 14 files changed, 268 insertions(+), 289 deletions(-)

diff --git a/plugins/CDVDnull/Windows/CDVDnull_vs2008.vcproj b/plugins/CDVDnull/Windows/CDVDnull_vs2008.vcproj
index cd11c1be10..b8ee342239 100644
--- a/plugins/CDVDnull/Windows/CDVDnull_vs2008.vcproj
+++ b/plugins/CDVDnull/Windows/CDVDnull_vs2008.vcproj
@@ -5,6 +5,7 @@
 	Name="CDVDnull"
 	ProjectGUID="{F38D9DF0-F68D-49D9-B3A0-932E74FB74A0}"
 	RootNamespace="CDVDnull"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -63,7 +64,6 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\CDVDnull.def"
-				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 			/>
 			<Tool
diff --git a/plugins/CDVDolio/cdvd_vs2008.vcproj b/plugins/CDVDolio/cdvd_vs2008.vcproj
index 62bf48a46e..d8d9f2bd75 100644
--- a/plugins/CDVDolio/cdvd_vs2008.vcproj
+++ b/plugins/CDVDolio/cdvd_vs2008.vcproj
@@ -6,6 +6,7 @@
 	ProjectGUID="{FCDF5AE2-EA47-4CC6-9F20-23A0517FEBCB}"
 	RootNamespace="cdvd"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
diff --git a/plugins/FWnull/Windows/FWnull_vc2008.vcproj b/plugins/FWnull/Windows/FWnull_vc2008.vcproj
index 4e73157e2f..9722c7ec56 100644
--- a/plugins/FWnull/Windows/FWnull_vc2008.vcproj
+++ b/plugins/FWnull/Windows/FWnull_vc2008.vcproj
@@ -54,7 +54,6 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
 				ModuleDefinitionFile="FireWireNull.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -117,7 +116,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				ModuleDefinitionFile="FireWireNull.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -164,11 +162,11 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath="..\FW.h"
+				RelativePath="..\Config.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Config.h"
+				RelativePath="..\FW.h"
 				>
 			</File>
 		</Filter>
diff --git a/plugins/GSnull/Windows/GSnull_vc2008.vcproj b/plugins/GSnull/Windows/GSnull_vc2008.vcproj
index bff4bbf56e..cee39ef0b4 100644
--- a/plugins/GSnull/Windows/GSnull_vc2008.vcproj
+++ b/plugins/GSnull/Windows/GSnull_vc2008.vcproj
@@ -160,10 +160,6 @@
 				RelativePath="..\GS.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\Registers.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\Linux\GSLinux.cpp"
 				>
@@ -192,6 +188,10 @@
 				RelativePath=".\GSwin.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\Registers.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\Win32.cpp"
 				>
diff --git a/plugins/LilyPad/LilyPad_VC2008.vcproj b/plugins/LilyPad/LilyPad_VC2008.vcproj
index 411038cb6c..9e6e1a1665 100644
--- a/plugins/LilyPad/LilyPad_VC2008.vcproj
+++ b/plugins/LilyPad/LilyPad_VC2008.vcproj
@@ -69,7 +69,6 @@
 				OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile=".\LilyPad.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -96,177 +95,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
-			UseOfMFC="0"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_EXPORTS"
-				ExceptionHandling="0"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="Global.h"
-				CallingConvention="1"
-				DisableSpecificWarnings="4995, 4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Setupapi.lib Winmm.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\LilyPad.def"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				EntryPointSymbol=""
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release No CRT|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
-			UseOfMFC="0"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				WholeProgramOptimization="false"
-				PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_EXPORTS;NO_CRT"
-				ExceptionHandling="0"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="Global.h"
-				CallingConvention="1"
-				DisableSpecificWarnings="4995, 4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ntdll.lib Setupapi.lib Winmm.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)-no CRT.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreAllDefaultLibraries="true"
-				ModuleDefinitionFile=".\LilyPad.def"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="0"
-				EntryPointSymbol="DllMain"
-				RandomizedBaseAddress="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="2"
@@ -350,6 +178,89 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
+			UseOfMFC="0"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_EXPORTS"
+				ExceptionHandling="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="Global.h"
+				CallingConvention="1"
+				DisableSpecificWarnings="4995, 4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Setupapi.lib Winmm.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ModuleDefinitionFile=".\LilyPad.def"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol=""
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="2"
@@ -450,6 +361,92 @@
 				ExcludedFromBuild="true"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release No CRT|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
+			UseOfMFC="0"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				WholeProgramOptimization="false"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_EXPORTS;NO_CRT"
+				ExceptionHandling="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="Global.h"
+				CallingConvention="1"
+				DisableSpecificWarnings="4995, 4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ntdll.lib Setupapi.lib Winmm.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-no CRT.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				IgnoreAllDefaultLibraries="true"
+				ModuleDefinitionFile=".\LilyPad.def"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="0"
+				EntryPointSymbol="DllMain"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release No CRT|x64"
 			ConfigurationType="2"
@@ -568,6 +565,14 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
@@ -577,23 +582,6 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release No CRT|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -604,6 +592,15 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release No CRT|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release No CRT|x64"
 					>
@@ -638,6 +635,14 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
@@ -647,23 +652,6 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release No CRT|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -674,6 +662,15 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release No CRT|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release No CRT|x64"
 					>
@@ -701,22 +698,6 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release No CRT|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -725,6 +706,14 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -733,6 +722,14 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release No CRT|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release No CRT|x64"
 					>
@@ -774,22 +771,6 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release No CRT|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -798,6 +779,14 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -806,6 +795,14 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release No CRT|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release No CRT|x64"
 					>
@@ -934,6 +931,14 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
@@ -943,23 +948,6 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release No CRT|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -970,6 +958,15 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release No CRT|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release No CRT|x64"
 					>
diff --git a/plugins/PadNull/Windows/PadNull_vc2008.vcproj b/plugins/PadNull/Windows/PadNull_vc2008.vcproj
index 98798b08db..5802e8d5a8 100644
--- a/plugins/PadNull/Windows/PadNull_vc2008.vcproj
+++ b/plugins/PadNull/Windows/PadNull_vc2008.vcproj
@@ -56,7 +56,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				ModuleDefinitionFile="PadNull.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -123,7 +122,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				ModuleDefinitionFile="PadNull.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/plugins/SSSPSXPAD/PadSSSPSX_vc2008.vcproj b/plugins/SSSPSXPAD/PadSSSPSX_vc2008.vcproj
index c31ebf8716..5a07e2ad99 100644
--- a/plugins/SSSPSXPAD/PadSSSPSX_vc2008.vcproj
+++ b/plugins/SSSPSXPAD/PadSSSPSX_vc2008.vcproj
@@ -58,7 +58,6 @@
 				AdditionalDependencies="user32.lib kernel32.lib dxguid.lib dinput8.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
 				ModuleDefinitionFile="PadSSSPSX.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -126,7 +125,6 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="dxguid.lib dinput8.lib"
 				ModuleDefinitionFile="PadSSSPSX.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/plugins/USBnull/Windows/USBnull_vc2008.vcproj b/plugins/USBnull/Windows/USBnull_vc2008.vcproj
index 8f0c65ccde..c42ab20773 100644
--- a/plugins/USBnull/Windows/USBnull_vc2008.vcproj
+++ b/plugins/USBnull/Windows/USBnull_vc2008.vcproj
@@ -54,7 +54,6 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
 				ModuleDefinitionFile="USBnull.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -117,7 +116,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				ModuleDefinitionFile="USBnull.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -157,7 +155,7 @@
 			<File
 				RelativePath="..\USB.cpp"
 				>
-			</File> 
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/plugins/dev9null/Windows/DEV9null_vc2008.vcproj b/plugins/dev9null/Windows/DEV9null_vc2008.vcproj
index 7d6ab5745f..913148d693 100644
--- a/plugins/dev9null/Windows/DEV9null_vc2008.vcproj
+++ b/plugins/dev9null/Windows/DEV9null_vc2008.vcproj
@@ -57,7 +57,6 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
 				ModuleDefinitionFile="DEV9null.def"
-				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
@@ -121,7 +120,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				ModuleDefinitionFile="DEV9null.def"
-				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
@@ -156,11 +154,11 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="..\DEV9.cpp"
+				RelativePath="..\Config.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\Config.cpp"
+				RelativePath="..\DEV9.cpp"
 				>
 			</File>
 			<File
@@ -169,11 +167,11 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\DEV9.h"
+			RelativePath="..\Config.h"
 			>
 		</File>
 		<File
-			RelativePath="..\Config.h"
+			RelativePath="..\DEV9.h"
 			>
 		</File>
 	</Files>
diff --git a/plugins/spu2-x/src/Windows/Spu2-X_vs2008.vcproj b/plugins/spu2-x/src/Windows/Spu2-X_vs2008.vcproj
index 8447a9d62e..90b2bae491 100644
--- a/plugins/spu2-x/src/Windows/Spu2-X_vs2008.vcproj
+++ b/plugins/spu2-x/src/Windows/Spu2-X_vs2008.vcproj
@@ -73,7 +73,6 @@
 				OutputFile="$(OutDir)\$(ProjectName)-dev.dll"
 				AdditionalLibraryDirectories="$(SolutionDir)\3rdparty\portaudio"
 				ModuleDefinitionFile=".\Spu2-X.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -155,7 +154,6 @@
 				OutputFile="$(OutDir)\$(ProjectName)-dbg.dll"
 				AdditionalLibraryDirectories="$(SolutionDir)\3rdparty\portaudio"
 				ModuleDefinitionFile=".\Spu2-X.def"
-				RandomizedBaseAddress="1"
 				SupportUnloadOfDelayLoadedDLL="false"
 				TargetMachine="1"
 			/>
@@ -242,7 +240,6 @@
 				ModuleDefinitionFile=".\Spu2-X.def"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				StripPrivateSymbols=""
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -326,7 +323,6 @@
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				ModuleDefinitionFile=".\Spu2-X.def"
-				RandomizedBaseAddress="1"
 				SupportUnloadOfDelayLoadedDLL="false"
 				ImportLibrary=".\Debug/spu2-x.lib"
 				TargetMachine="1"
diff --git a/plugins/xpad/xpad_vs2008.vcproj b/plugins/xpad/xpad_vs2008.vcproj
index ad5ed2257c..7a36c511e4 100644
--- a/plugins/xpad/xpad_vs2008.vcproj
+++ b/plugins/xpad/xpad_vs2008.vcproj
@@ -6,6 +6,7 @@
 	ProjectGUID="{6F3C4136-5801-4EBC-AC6E-37DF6FAB150A}"
 	RootNamespace="xpad"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
diff --git a/plugins/zerogs/dx/Windows/zerogs_2008.vcproj b/plugins/zerogs/dx/Windows/zerogs_2008.vcproj
index 57a48b27ba..10d86adceb 100644
--- a/plugins/zerogs/dx/Windows/zerogs_2008.vcproj
+++ b/plugins/zerogs/dx/Windows/zerogs_2008.vcproj
@@ -70,7 +70,6 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\"
 				ModuleDefinitionFile=".\GSsoftdx.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -138,7 +137,6 @@
 				AdditionalLibraryDirectories="..\"
 				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile=".\GSsoftdx.def"
-				RandomizedBaseAddress="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -218,7 +216,6 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\"
 				ModuleDefinitionFile=".\GSsoftdx.def"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/plugins/zerospu2/Windows/ZeroSPU2_2008.vcproj b/plugins/zerospu2/Windows/ZeroSPU2_2008.vcproj
index 782e7e1d2b..1ab9daf348 100644
--- a/plugins/zerospu2/Windows/ZeroSPU2_2008.vcproj
+++ b/plugins/zerospu2/Windows/ZeroSPU2_2008.vcproj
@@ -60,7 +60,6 @@
 				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile="ZeroSPU2.def"
 				SubSystem="2"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -128,7 +127,6 @@
 				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile="ZeroSPU2.def"
 				SubSystem="2"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -199,7 +197,6 @@
 				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile="ZeroSPU2.def"
 				SubSystem="2"
-				RandomizedBaseAddress="1"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj b/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
index 9b2502170d..d4a05f9252 100644
--- a/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
+++ b/plugins/zzogl-pg/opengl/Win32/zerogsogl_2008.vcproj
@@ -528,11 +528,11 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\ps2hw.dat"
+			RelativePath=".\ps2hw.dat"
 			>
 		</File>
 		<File
-			RelativePath=".\ps2hw.dat"
+			RelativePath="..\ps2hw.dat"
 			>
 		</File>
 	</Files>