From 90386d884e8e27d4e014cf79761c9272a230def9 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <steve.lhomme@free.fr>
Date: Sat, 12 Jun 2004 11:14:44 +0000
Subject: [PATCH] prepare to compile the testsuite with MSVC

Original commit message from CVS:
prepare to compile the testsuite with MSVC
---
 ChangeLog                          |   6 ++
 win32/msvc71.sln                   | 164 ++++++++++++++++++++++++++++-
 win32/testsuite/bins.vcproj        | 138 ++++++++++++++++++++++++
 win32/testsuite/bytestream.vcproj  | 138 ++++++++++++++++++++++++
 win32/testsuite/caps.vcproj        | 141 +++++++++++++++++++++++++
 win32/testsuite/cleanup.vcproj     | 135 ++++++++++++++++++++++++
 win32/testsuite/clock.vcproj       | 135 ++++++++++++++++++++++++
 win32/testsuite/debug.vcproj       | 135 ++++++++++++++++++++++++
 win32/testsuite/dlopen.vcproj      | 135 ++++++++++++++++++++++++
 win32/testsuite/dynparams.vcproj   | 135 ++++++++++++++++++++++++
 win32/testsuite/elements.vcproj    | 135 ++++++++++++++++++++++++
 win32/testsuite/ghostpads.vcproj   | 135 ++++++++++++++++++++++++
 win32/testsuite/indexers.vcproj    | 135 ++++++++++++++++++++++++
 win32/testsuite/negotiation.vcproj | 135 ++++++++++++++++++++++++
 win32/testsuite/parse.vcproj       | 135 ++++++++++++++++++++++++
 win32/testsuite/plugin.vcproj      | 135 ++++++++++++++++++++++++
 win32/testsuite/refcounting.vcproj | 135 ++++++++++++++++++++++++
 win32/testsuite/schedulers.vcproj  | 135 ++++++++++++++++++++++++
 win32/testsuite/states.vcproj      | 135 ++++++++++++++++++++++++
 win32/testsuite/tags.vcproj        | 135 ++++++++++++++++++++++++
 win32/testsuite/threads.vcproj     | 135 ++++++++++++++++++++++++
 win32/vs7/msvc71.sln               | 164 ++++++++++++++++++++++++++++-
 22 files changed, 2903 insertions(+), 8 deletions(-)
 create mode 100644 win32/testsuite/bins.vcproj
 create mode 100644 win32/testsuite/bytestream.vcproj
 create mode 100644 win32/testsuite/caps.vcproj
 create mode 100644 win32/testsuite/cleanup.vcproj
 create mode 100644 win32/testsuite/clock.vcproj
 create mode 100644 win32/testsuite/debug.vcproj
 create mode 100644 win32/testsuite/dlopen.vcproj
 create mode 100644 win32/testsuite/dynparams.vcproj
 create mode 100644 win32/testsuite/elements.vcproj
 create mode 100644 win32/testsuite/ghostpads.vcproj
 create mode 100644 win32/testsuite/indexers.vcproj
 create mode 100644 win32/testsuite/negotiation.vcproj
 create mode 100644 win32/testsuite/parse.vcproj
 create mode 100644 win32/testsuite/plugin.vcproj
 create mode 100644 win32/testsuite/refcounting.vcproj
 create mode 100644 win32/testsuite/schedulers.vcproj
 create mode 100644 win32/testsuite/states.vcproj
 create mode 100644 win32/testsuite/tags.vcproj
 create mode 100644 win32/testsuite/threads.vcproj

diff --git a/ChangeLog b/ChangeLog
index 5f9c0e99e2..57e1890602 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-12  Steve Lhomme  <steve.lhomme@free.fr>
+
+	* win32/msvc71.sln:
+	* win32/testsuite/:
+          prepare to compile the testsuite with MSVC
+
 2004-06-12  Steve Lhomme  <steve.lhomme@free.fr>
 
 	* docs/manual/win32.xml:
diff --git a/win32/msvc71.sln b/win32/msvc71.sln
index 79e4f323ba..df645f5c04 100644
--- a/win32/msvc71.sln
+++ b/win32/msvc71.sln
@@ -38,12 +38,96 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstbytestream", "gstbytestr
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "states", "testsuite\states.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bins", "testsuite\bins.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC639}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bytestream", "testsuite\bytestream.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC641}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "caps", "testsuite\caps.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC640}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cleanup", "testsuite\cleanup.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63E}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clock", "testsuite\clock.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63D}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug", "testsuite\debug.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlopen", "testsuite\dlopen.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynparams", "testsuite\dynparams.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63A}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elements", "testsuite\elements.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC642}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpads", "testsuite\ghostpads.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC638}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "indexers", "testsuite\indexers.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC637}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "negotiation", "testsuite\negotiation.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC636}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parse", "testsuite\parse.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC635}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin", "testsuite\plugin.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC634}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "refcounting", "testsuite\refcounting.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC633}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "schedulers", "testsuite\schedulers.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC632}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tags", "testsuite\tags.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC631}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threads", "testsuite\threads.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC630}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.ActiveCfg = Debug|Win32
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.Build.0 = Debug|Win32
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.ActiveCfg = Release|Win32
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.Build.0 = Release|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Debug.ActiveCfg = Debug|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Debug.Build.0 = Debug|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Release.ActiveCfg = Release|Win32
@@ -72,10 +156,82 @@ Global
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Debug.Build.0 = Debug|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Release.ActiveCfg = Release|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Release.Build.0 = Release|Win32
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.ActiveCfg = Debug|Win32
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.Build.0 = Debug|Win32
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.ActiveCfg = Release|Win32
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63F}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63F}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63F}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63F}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC639}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC639}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC639}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC639}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC641}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC641}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC641}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC641}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC640}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC640}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC640}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC640}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63E}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63E}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63E}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63E}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63D}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63D}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63D}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63D}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63C}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63C}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63C}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63C}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63B}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63B}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63B}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63B}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63A}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63A}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63A}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63A}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC642}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC642}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC642}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC642}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC638}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC638}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC638}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC638}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC637}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC637}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC637}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC637}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC636}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC636}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC636}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC636}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC635}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC635}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC635}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC635}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC634}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC634}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC634}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC634}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC633}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC633}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC633}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC633}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC632}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC632}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC632}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC632}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC631}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC631}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC631}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC631}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC630}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC630}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC630}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC630}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/win32/testsuite/bins.vcproj b/win32/testsuite/bins.vcproj
new file mode 100644
index 0000000000..9418422731
--- /dev/null
+++ b/win32/testsuite/bins.vcproj
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="bins"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC639}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/bins.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/bins.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/bins.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\testsuite\bins\interface.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/bytestream.vcproj b/win32/testsuite/bytestream.vcproj
new file mode 100644
index 0000000000..5fc720639d
--- /dev/null
+++ b/win32/testsuite/bytestream.vcproj
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="bytestream"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC641}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/bytestream.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/bytestream.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/bytestream.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\testsuite\bytestream\test1.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/caps.vcproj b/win32/testsuite/caps.vcproj
new file mode 100644
index 0000000000..27ed490e48
--- /dev/null
+++ b/win32/testsuite/caps.vcproj
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="caps"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC640}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/caps.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/caps.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/caps.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\testsuite\caps\caps.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\..\testsuite\caps\caps.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/cleanup.vcproj b/win32/testsuite/cleanup.vcproj
new file mode 100644
index 0000000000..0eb8c4f9cb
--- /dev/null
+++ b/win32/testsuite/cleanup.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="cleanup"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC63E}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/cleanup.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/cleanup.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/cleanup.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/clock.vcproj b/win32/testsuite/clock.vcproj
new file mode 100644
index 0000000000..f6891b8916
--- /dev/null
+++ b/win32/testsuite/clock.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="clock"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC63D}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/clock.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/clock.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/clock.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/debug.vcproj b/win32/testsuite/debug.vcproj
new file mode 100644
index 0000000000..d9120f2788
--- /dev/null
+++ b/win32/testsuite/debug.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="debug"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC63C}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/debug.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/debug.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/debug.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/dlopen.vcproj b/win32/testsuite/dlopen.vcproj
new file mode 100644
index 0000000000..ce9a4f3c59
--- /dev/null
+++ b/win32/testsuite/dlopen.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="dlopen"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC63B}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/dlopen.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/dlopen.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/dlopen.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/dynparams.vcproj b/win32/testsuite/dynparams.vcproj
new file mode 100644
index 0000000000..ef9a76d4a8
--- /dev/null
+++ b/win32/testsuite/dynparams.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="dynparams"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC63A}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/dynparams.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/dynparams.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/dynparams.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/elements.vcproj b/win32/testsuite/elements.vcproj
new file mode 100644
index 0000000000..d69fd10f36
--- /dev/null
+++ b/win32/testsuite/elements.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="elements"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC642}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/elements.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/elements.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/elements.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/ghostpads.vcproj b/win32/testsuite/ghostpads.vcproj
new file mode 100644
index 0000000000..d86cc13b70
--- /dev/null
+++ b/win32/testsuite/ghostpads.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="ghostpads"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC638}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/ghostpads.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/ghostpads.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/ghostpads.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/indexers.vcproj b/win32/testsuite/indexers.vcproj
new file mode 100644
index 0000000000..ef4882bc7f
--- /dev/null
+++ b/win32/testsuite/indexers.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="indexers"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC637}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/indexers.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/indexers.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/indexers.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/negotiation.vcproj b/win32/testsuite/negotiation.vcproj
new file mode 100644
index 0000000000..833e709a3a
--- /dev/null
+++ b/win32/testsuite/negotiation.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="negotiation"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC636}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/negotiation.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/negotiation.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/negotiation.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/parse.vcproj b/win32/testsuite/parse.vcproj
new file mode 100644
index 0000000000..37c51cf4d9
--- /dev/null
+++ b/win32/testsuite/parse.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="parse"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC635}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/parse.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/parse.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/parse.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/plugin.vcproj b/win32/testsuite/plugin.vcproj
new file mode 100644
index 0000000000..326d5054f6
--- /dev/null
+++ b/win32/testsuite/plugin.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="plugin"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC634}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/plugin.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/plugin.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/plugin.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/refcounting.vcproj b/win32/testsuite/refcounting.vcproj
new file mode 100644
index 0000000000..8c346724df
--- /dev/null
+++ b/win32/testsuite/refcounting.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="refcounting"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC633}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/refcounting.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/refcounting.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/refcounting.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/schedulers.vcproj b/win32/testsuite/schedulers.vcproj
new file mode 100644
index 0000000000..506647f4cf
--- /dev/null
+++ b/win32/testsuite/schedulers.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="schedulers"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC632}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/schedulers.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/schedulers.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/schedulers.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/states.vcproj b/win32/testsuite/states.vcproj
new file mode 100644
index 0000000000..5292dc7ee1
--- /dev/null
+++ b/win32/testsuite/states.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="states"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC63F}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/states.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/states.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/states.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/tags.vcproj b/win32/testsuite/tags.vcproj
new file mode 100644
index 0000000000..284f6cc4df
--- /dev/null
+++ b/win32/testsuite/tags.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="tags"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC631}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/tags.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/tags.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/tags.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/testsuite/threads.vcproj b/win32/testsuite/threads.vcproj
new file mode 100644
index 0000000000..aa0166a1bc
--- /dev/null
+++ b/win32/testsuite/threads.vcproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="threads"
+	ProjectGUID="{5B645596-556B-4BAB-8612-3AC4F17BC630}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/threads.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/threads.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../;../../../glib/glib;../../../glib;..\..\..\popt\include;..\..\..\libiconv\include;..\..\..\glib\gmodule;..\..\..\libxml\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="4"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				OutputFile="$(OutDir)/threads.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../glib/glib;../../../glib/gobject"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/vs7/msvc71.sln b/win32/vs7/msvc71.sln
index 79e4f323ba..df645f5c04 100644
--- a/win32/vs7/msvc71.sln
+++ b/win32/vs7/msvc71.sln
@@ -38,12 +38,96 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstbytestream", "gstbytestr
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "states", "testsuite\states.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bins", "testsuite\bins.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC639}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bytestream", "testsuite\bytestream.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC641}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "caps", "testsuite\caps.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC640}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cleanup", "testsuite\cleanup.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63E}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clock", "testsuite\clock.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63D}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug", "testsuite\debug.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlopen", "testsuite\dlopen.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynparams", "testsuite\dynparams.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC63A}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elements", "testsuite\elements.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC642}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghostpads", "testsuite\ghostpads.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC638}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "indexers", "testsuite\indexers.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC637}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "negotiation", "testsuite\negotiation.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC636}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parse", "testsuite\parse.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC635}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin", "testsuite\plugin.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC634}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "refcounting", "testsuite\refcounting.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC633}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "schedulers", "testsuite\schedulers.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC632}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tags", "testsuite\tags.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC631}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threads", "testsuite\threads.vcproj", "{5B645596-556B-4BAB-8612-3AC4F17BC630}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.ActiveCfg = Debug|Win32
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.Build.0 = Debug|Win32
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.ActiveCfg = Release|Win32
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.Build.0 = Release|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Debug.ActiveCfg = Debug|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Debug.Build.0 = Debug|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Release.ActiveCfg = Release|Win32
@@ -72,10 +156,82 @@ Global
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Debug.Build.0 = Debug|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Release.ActiveCfg = Release|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Release.Build.0 = Release|Win32
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.ActiveCfg = Debug|Win32
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.Build.0 = Debug|Win32
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.ActiveCfg = Release|Win32
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63F}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63F}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63F}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63F}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC639}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC639}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC639}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC639}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC641}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC641}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC641}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC641}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC640}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC640}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC640}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC640}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63E}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63E}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63E}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63E}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63D}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63D}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63D}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63D}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63C}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63C}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63C}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63C}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63B}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63B}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63B}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63B}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63A}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63A}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63A}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC63A}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC642}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC642}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC642}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC642}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC638}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC638}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC638}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC638}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC637}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC637}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC637}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC637}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC636}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC636}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC636}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC636}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC635}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC635}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC635}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC635}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC634}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC634}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC634}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC634}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC633}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC633}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC633}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC633}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC632}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC632}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC632}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC632}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC631}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC631}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC631}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC631}.Release.Build.0 = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC630}.Debug.ActiveCfg = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC630}.Debug.Build.0 = Debug|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC630}.Release.ActiveCfg = Release|Win32
+		{5B645596-556B-4BAB-8612-3AC4F17BC630}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection