From 8103580a5e32ca454e51305701e0b0797b39857f Mon Sep 17 00:00:00 2001
From: jez <>
Date: Tue, 28 Aug 2007 12:47:30 +0000
Subject: [PATCH] added filter tests

---
 vs8/Arabica.sln                  |  29 +
 vs8/Arabica_noboost.sln          |  55 +-
 vs8/lib_arabica.vcproj           |   4 +-
 vs8/lib_arabica_noboost.vcproj   | 948 -------------------------------
 vs8/test_SAX_filter.vcproj       | 447 +++++++++------
 vs8/test_SAX_filter_silly.vcproj | 287 ++++++++++
 vs8/test_SAX_filter_wide.vcproj  | 287 ++++++++++
 7 files changed, 943 insertions(+), 1114 deletions(-)
 delete mode 100644 vs8/lib_arabica_noboost.vcproj
 create mode 100644 vs8/test_SAX_filter_silly.vcproj
 create mode 100644 vs8/test_SAX_filter_wide.vcproj

diff --git a/vs8/Arabica.sln b/vs8/Arabica.sln
index 4b8d9545..2d9d4538 100644
--- a/vs8/Arabica.sln
+++ b/vs8/Arabica.sln
@@ -159,6 +159,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XSLT_Mangle", "exam
 		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter", "test_SAX_filter.vcproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "test_SAX_filter_silly.vcproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -233,6 +250,18 @@ Global
 		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.Build.0 = Debug|Win32
 		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.ActiveCfg = Release|Win32
 		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.Build.0 = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|Win32.Build.0 = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.ActiveCfg = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.Build.0 = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|Win32.Build.0 = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.ActiveCfg = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.Build.0 = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.Build.0 = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.ActiveCfg = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/vs8/Arabica_noboost.sln b/vs8/Arabica_noboost.sln
index d3ab5e8c..f8f37568 100644
--- a/vs8/Arabica_noboost.sln
+++ b/vs8/Arabica_noboost.sln
@@ -1,7 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
@@ -11,12 +9,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_
 	ProjectSection(ProjectDependencies) = postProject
 		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
 		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
+		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "test_DOM_wide.vcproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
 		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
+		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Pyx", "example_SAX_pyx.vcproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
@@ -32,6 +38,31 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_Transcode", "example_Utils_transcode.vcproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_utils", "test_utils.vcproj", "{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter", "test_SAX_filter.vcproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "test_SAX_filter_silly.vcproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,10 +70,6 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
 		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
 		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
@@ -83,6 +110,22 @@ Global
 		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|Win32.Build.0 = Debug|Win32
 		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.ActiveCfg = Release|Win32
 		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.Build.0 = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|Win32.Build.0 = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.ActiveCfg = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.Build.0 = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|Win32.Build.0 = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.ActiveCfg = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.Build.0 = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.Build.0 = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.ActiveCfg = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.Build.0 = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/vs8/lib_arabica.vcproj b/vs8/lib_arabica.vcproj
index f8eb847d..4925b4f0 100644
--- a/vs8/lib_arabica.vcproj
+++ b/vs8/lib_arabica.vcproj
@@ -895,7 +895,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP  -D USE_EXPAT ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h&#x0D;&#x0A;"
+						CommandLine="cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h"
 						Outputs="..\include\SAX\ArabicaConfig.h"
 					/>
 				</FileConfiguration>
@@ -904,7 +904,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP -D USE_MSXML  ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h&#x0D;&#x0A;"
+						CommandLine="cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h"
 						Outputs="..\include\SAX\ArabicaConfig.h"
 					/>
 				</FileConfiguration>
diff --git a/vs8/lib_arabica_noboost.vcproj b/vs8/lib_arabica_noboost.vcproj
deleted file mode 100644
index fd9b85ac..00000000
--- a/vs8/lib_arabica_noboost.vcproj
+++ /dev/null
@@ -1,948 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ArabicaLib"
-	ProjectGUID="{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
-	RootNamespace="ArabicaLib"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\lib"
-			IntermediateDirectory=".\Debug_Arabica"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\lib\Arabica-debug.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\lib"
-			IntermediateDirectory=".\Release_Arabica"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Release/SAX.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\lib\Arabica.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="include"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<Filter
-				Name="SAX"
-				>
-				<File
-					RelativePath="..\include\Sax\AttributeList.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\Attributes.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\ContentHandler.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\DocumentHandler.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\DTDHandler.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\EntityResolver.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\ErrorHandler.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\HandlerBase.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\InputSource.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\IStreamHandle.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\Locator.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\Parser.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\saxfwd.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXNotRecognizedException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXNotSupportedException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXParseException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\XMLFilter.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Sax\XMLReader.h"
-					>
-				</File>
-				<Filter
-					Name="ext"
-					>
-					<File
-						RelativePath="..\include\Sax\ext\Attributes2.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\DeclHandler.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\DefaultHandler2.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\LexicalHandler.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\Locator2.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\ProgressiveParser.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="filter"
-					>
-					<File
-						RelativePath="..\include\Sax\filter\Writer.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="helpers"
-					>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeDefaults.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeListImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributesImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeTypes.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\CatchErrorHandler.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\DefaultHandler.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\FeatureNames.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\InputSourceResolver.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\LocatorImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\NamespaceSupport.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\ParserAdaptor.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\PropertyNames.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\XMLBaseSupport.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\XMLFilterImpl.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="parsers"
-					>
-					<File
-						RelativePath="..\include\Sax\parsers\saxgarden.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="wrappers"
-					>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxexpat.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxlibxml2.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxmsxml2.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxxerces.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\XercesFeatureNames.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\XercesPropertyNames.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="DOM"
-				>
-				<File
-					RelativePath="..\include\Dom\Attr.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\CDATASection.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\CharacterData.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Comment.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Document.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DocumentFragment.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DocumentType.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DOMException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\DOMImplementation.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Element.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Entity.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\EntityReference.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\NamedNodeMap.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Node.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\NodeList.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Notation.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\ProcessingInstruction.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Proxy.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Dom\Text.h"
-					>
-				</File>
-				<Filter
-					Name="DualMode"
-					>
-					<File
-						RelativePath="..\include\Dom\DualMode\DualMode.hpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Events"
-					>
-					<File
-						RelativePath="..\include\Dom\Events\DocumentEvent.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\Event.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\EventException.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\EventListener.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\EventTarget.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Events\MutationEvent.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="SAX2DOM"
-					>
-					<File
-						RelativePath="..\include\Dom\Sax2dom\DocumentTypeImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Sax2dom\SAX2DOM.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Simple"
-					>
-					<File
-						RelativePath="..\include\Dom\Simple\AttrImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\AttrMap.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\AttrNSImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\CDATASectionImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\CharacterDataImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\CommentImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DocumentFragmentImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DocumentImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DocumentTypeImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\DOMImplementation.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ElementByTagImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ElementImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ElementNSImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\EntityImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\EntityReferenceImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\Helpers.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\NamedNodeMapImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\NodeImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\NotationImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\ProcessingInstructionImpl.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Simple\TextImpl.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Traversal"
-					>
-					<File
-						RelativePath="..\include\Dom\Traversal\DocumentTraversal.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\NodeFilter.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\NodeIterator.h"
-						>
-					</File>
-					<File
-						RelativePath="..\include\Dom\Traversal\TreeWalker.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="Utils"
-					>
-					<File
-						RelativePath="..\include\Dom\Utils\Stream.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="XPath"
-				>
-				<File
-					RelativePath="..\include\XPath\XPath.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_arithmetic.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_ast.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_ast_ids.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_axis_enumerator.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_compile_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_execution_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_expression.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_function.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_function_holder.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_function_resolver.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_grammar.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_logical.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_namespace_context.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_namespace_node.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_node_test.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_object.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_parser.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_relational.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_resolver_holder.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_step.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_union.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_value.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_variable.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_variable_resolver.hpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Utils"
-				>
-				<File
-					RelativePath="..\include\Utils\base64codecvt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\impl\codecvt_specialisations.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\convert_adaptor.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\convertstream.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\getparam.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\impl\iso88591_utf8.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\iso88591utf8codecvt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\rot13codecvt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\socket_stream.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\StringAdaptor.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\stringadaptortag.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\impl\ucs2_utf16.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\impl\ucs2_utf8.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\ucs2utf8codecvt.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\utf16beucs2codecvt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\utf16leucs2codecvt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\utf16utf8codecvt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\utf8iso88591codecvt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\utf8ucs2codecvt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Utils\impl\VS6Workaround.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="XML"
-				>
-				<File
-					RelativePath="..\include\Xml\escaper.hpp"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xml\UnicodeCharacters.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\Xml\XMLCharacterClasses.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="src"
-			>
-			<File
-				RelativePath="..\src\arabica.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\vs7\ArabicaConfig.S"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP  -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h&#x0D;&#x0A;"
-						Outputs="..\include\SAX\ArabicaConfig.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h&#x0D;&#x0A;"
-						Outputs="ArabicaConfig.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<Filter
-				Name="Utils"
-				>
-				<File
-					RelativePath="..\src\Utils\base64codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\iso88591utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\rot13codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\ucs2utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\uri.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\utf16beucs2codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\utf16leucs2codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\utf16utf8codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\utf8iso88591codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\Utils\utf8ucs2codecvt.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\src\XML\XMLCharacterClasses.cpp"
-					>
-				</File>
-				<Filter
-					Name="impl"
-					>
-					<File
-						RelativePath="..\src\Utils\impl\iso88591_utf8.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\src\Utils\impl\ucs2_utf16.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\src\Utils\impl\ucs2_utf8.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="SAX"
-				>
-				<Filter
-					Name="Helpers"
-					>
-					<File
-						RelativePath="..\src\SAX\helpers\InputSourceResolver.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vs8/test_SAX_filter.vcproj b/vs8/test_SAX_filter.vcproj
index 8643ab54..e9da85c4 100644
--- a/vs8/test_SAX_filter.vcproj
+++ b/vs8/test_SAX_filter.vcproj
@@ -1,158 +1,289 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="test_SAXFilter"
-	ProjectGUID="{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200
-"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Debug/Writer.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/sax_filter_test.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/sax_filter_test.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
-				StringPooling="TRUE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Release/Writer.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/sax_filter_test.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/Writer.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-				AdditionalIncludeDirectories=""/>
-			<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;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath=".\test\SAX\FilterTest.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Libs"
-			Filter="lib">
-			<File
-				RelativePath="..\..\lib\Arabica.lib">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_SAX_filter"
+	ProjectGUID="{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Debug_test_SAXFilter"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm200&#x0A;"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/Writer.pch"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/sax_filter_test.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/sax_filter_test.pdb"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Release_test_SAXFilter"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/Writer.pch"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+				AdditionalIncludeDirectories=""
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/sax_filter_test.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\tests\Sax\filter_test.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="..\tests\Sax\test_WhitespaceStripper.hpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs8/test_SAX_filter_silly.vcproj b/vs8/test_SAX_filter_silly.vcproj
new file mode 100644
index 00000000..c41ea583
--- /dev/null
+++ b/vs8/test_SAX_filter_silly.vcproj
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_SAX_filter_silly"
+	ProjectGUID="{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Debug_test_SAXFilter_silly"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm200&#x0D;&#x0A;"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/sax_filter_test_ss.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/sax_filter_test_ss.pdb"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Release_test_SAXFilter_silly"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+				AdditionalIncludeDirectories=""
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/sax_filter_test_ss.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\tests\Sax\filter_test_silly.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="..\tests\Sax\test_WhitespaceStripper.hpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs8/test_SAX_filter_wide.vcproj b/vs8/test_SAX_filter_wide.vcproj
new file mode 100644
index 00000000..5a034b4c
--- /dev/null
+++ b/vs8/test_SAX_filter_wide.vcproj
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="test_SAX_filter_wide"
+	ProjectGUID="{FB5B88E9-DAB3-401C-B413-77403C562C49}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Debug_test_SAXFilter_wide"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm200&#x0D;&#x0A;"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/sax_filter_test_wide.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/sax_filter_test_wide.pdb"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory=".\Release_test_SAXFilter_wide"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+				AdditionalIncludeDirectories=""
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/sax_filter_test_wide.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\tests\Sax\filter_test_wide.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="CppUnit"
+			>
+			<File
+				RelativePath="..\tests\CppUnit\framework\CppUnitException.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\estring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Guards.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\Test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCaller.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestCase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestFailure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestResult.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\TestRunner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\framework\TestSuite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TextTestResult.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="..\tests\Sax\test_WhitespaceStripper.hpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>