From 19da22b16a0ef80e8bd1a27491174d70fa6b59ee Mon Sep 17 00:00:00 2001
From: jez <jez@ISLA>
Date: Sat, 13 Sep 2008 18:36:46 +0100
Subject: [PATCH] vs7 project files munged from vs9 files - don't try this at
 home

---
 vs7/example_SAX_Taggle.vcproj | 156 +++++---
 vs7/example_SAX_pyx.vcproj    | 178 ++++++---
 vs7/test_DOM.vcproj           | 686 ++++++++++++++++-----------------
 vs7/test_DOM_silly.vcproj     | 702 +++++++++++++++++-----------------
 vs7/test_DOM_wide.vcproj      | 686 ++++++++++++++++-----------------
 vs7/test_xpath.vcproj         | 678 ++++++++++++++++----------------
 vs7/test_xpath_silly.vcproj   | 690 ++++++++++++++++-----------------
 vs7/test_xpath_wide.vcproj    | 674 ++++++++++++++++----------------
 8 files changed, 2288 insertions(+), 2162 deletions(-)

diff --git a/vs7/example_SAX_Taggle.vcproj b/vs7/example_SAX_Taggle.vcproj
index 77b0a49c..4838a94d 100644
--- a/vs7/example_SAX_Taggle.vcproj
+++ b/vs7/example_SAX_Taggle.vcproj
@@ -4,58 +4,90 @@
 	Version="7.10"
 	Name="example_SAX_Taggle"
 	ProjectGUID="{274EB942-0AA8-4715-8419-4722868A22BA}"
-	RootNamespace="example_SAX_Taggle">
+	RootNamespace="example_SAX_Taggle"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\bin"
 			IntermediateDirectory=".\Debug_example_SAX_taggle"
 			ConfigurationType="1"
-			CharacterSet="2">
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\..\include"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="4"/>
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)\taggle.exe"
-				GenerateDebugInformation="TRUE"
-				TargetMachine="1"/>
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -63,46 +95,76 @@
 			IntermediateDirectory=".\Release_example_SAX_taggle"
 			ConfigurationType="1"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				EnableIntrinsicFunctions="TRUE"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories=".\..\include"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="3"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)\taggle.exe"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -111,9 +173,11 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath="..\examples\Taggle\taggle.cpp">
+				RelativePath="..\examples\Taggle\taggle.cpp"
+				>
 			</File>
 		</Filter>
 	</Files>
diff --git a/vs7/example_SAX_pyx.vcproj b/vs7/example_SAX_pyx.vcproj
index 6d0f0655..cc596c1e 100644
--- a/vs7/example_SAX_pyx.vcproj
+++ b/vs7/example_SAX_pyx.vcproj
@@ -3,130 +3,190 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="example_SAX_Pyx"
-	ProjectGUID="{5214A867-2768-4CD0-9E29-6EED20718556}">
+	ProjectGUID="{5214A867-2768-4CD0-9E29-6EED20718556}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\bin"
 			IntermediateDirectory=".\Debug_examples_SAX_pyx"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200
-"
+				AdditionalOptions="/Zm200&#x0A;"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				RuntimeTypeInfo="TRUE"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug_examples_SAX_pyx/pyx.pch"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="..\lib\arabica-debug.lib"
 				OutputFile="$(OutDir)/pyx.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/pyx.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\bin"
 			IntermediateDirectory=".\Release_examples_SAX_pyx"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			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"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
-				RuntimeTypeInfo="TRUE"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release_examples_SAX_pyx/pyx.pch"
 				AssemblerListingLocation=".\Release_examples_SAX_pyx/"
 				ObjectFile=".\Release_examples_SAX_pyx/"
 				ProgramDataBaseFileName=".\Release_examples_SAX_pyx/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="..\lib\arabica.lib"
 				OutputFile="$(OutDir)/pyx.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				SubSystem="1"/>
+				SuppressStartupBanner="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -134,9 +194,11 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath="..\examples\Sax\pyx.cpp">
+				RelativePath="..\examples\Sax\pyx.cpp"
+				>
 			</File>
 		</Filter>
 	</Files>
diff --git a/vs7/test_DOM.vcproj b/vs7/test_DOM.vcproj
index 4a3a7961..04083e9a 100644
--- a/vs7/test_DOM.vcproj
+++ b/vs7/test_DOM.vcproj
@@ -1,343 +1,343 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="test_DOM"
-	ProjectGUID="{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_DOM"
-			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"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Debug_test_DOM/DOM_test.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"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/DOM_test.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/DOM_test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_DOM"
-			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"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
-				AssemblerListingLocation=".\Release_test_DOM/"
-				ObjectFile=".\Release_test_DOM/"
-				ProgramDataBaseFileName=".\Release_test_DOM/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/DOM_test.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<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\DOM\main.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath=".\..\tests\DOM\dom_test_suite.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_Attribute.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_CDATA.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_CharacterData.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_Document.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_DocumentFragment.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_DocumentType.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_DOMImplementation.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_Element.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_ProcessingInstruction.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_SAX2DOM.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_Siblings.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\tests\DOM\test_Text.hpp"
-				>
-			</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\textui\TableTestResult.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
-				>
-			</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>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_DOM"
+	ProjectGUID="{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Debug_test_DOM"
+			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"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug_test_DOM/DOM_test.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"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/DOM_test.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/DOM_test.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Release_test_DOM"
+			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"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
+				AssemblerListingLocation=".\Release_test_DOM/"
+				ObjectFile=".\Release_test_DOM/"
+				ProgramDataBaseFileName=".\Release_test_DOM/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/DOM_test.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<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\DOM\main.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath=".\..\tests\DOM\dom_test_suite.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_Attribute.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_CDATA.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_CharacterData.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_Document.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_DocumentFragment.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_DocumentType.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_DOMImplementation.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_Element.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_ProcessingInstruction.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_SAX2DOM.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_Siblings.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\tests\DOM\test_Text.hpp"
+				>
+			</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\textui\TableTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
+				>
+			</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>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs7/test_DOM_silly.vcproj b/vs7/test_DOM_silly.vcproj
index 0e03b49f..914bb73a 100644
--- a/vs7/test_DOM_silly.vcproj
+++ b/vs7/test_DOM_silly.vcproj
@@ -1,351 +1,351 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="test_DOM_silly"
-	ProjectGUID="{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_DOM_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"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Debug_test_DOM/SAX2DOM_test.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"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/DOM_test_silly.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_DOM_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"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
-				AssemblerListingLocation=".\Release_test_DOM/"
-				ObjectFile=".\Release_test_DOM/"
-				ProgramDataBaseFileName=".\Release_test_DOM/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/DOM_test_silly.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\Release_test_DOM/DOM_test_silly.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<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\DOM\main_silly.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\silly_string\silly_string.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\tests\Dom\dom_test_suite.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\silly_string\silly_string.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Attribute.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_CDATA.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_CharacterData.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Document.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DocumentFragment.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DocumentType.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DOMImplementation.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Element.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_ProcessingInstruction.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_SAX2DOM.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Siblings.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Text.hpp"
-				>
-			</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\textui\TableTestResult.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
-				>
-			</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>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_DOM_silly"
+	ProjectGUID="{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Debug_test_DOM_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"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug_test_DOM/SAX2DOM_test.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"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/DOM_test_silly.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Release_test_DOM_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"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
+				AssemblerListingLocation=".\Release_test_DOM/"
+				ObjectFile=".\Release_test_DOM/"
+				ProgramDataBaseFileName=".\Release_test_DOM/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/DOM_test_silly.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release_test_DOM/DOM_test_silly.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<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\DOM\main_silly.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\silly_string\silly_string.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\tests\Dom\dom_test_suite.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\silly_string\silly_string.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_Attribute.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_CDATA.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_CharacterData.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_Document.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_DocumentFragment.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_DocumentType.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_DOMImplementation.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_Element.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_ProcessingInstruction.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_SAX2DOM.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_Siblings.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_Text.hpp"
+				>
+			</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\textui\TableTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
+				>
+			</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>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs7/test_DOM_wide.vcproj b/vs7/test_DOM_wide.vcproj
index fd330e93..747259d3 100644
--- a/vs7/test_DOM_wide.vcproj
+++ b/vs7/test_DOM_wide.vcproj
@@ -1,343 +1,343 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="test_DOM_wide"
-	ProjectGUID="{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_DOM"
-			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"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Debug_test_DOM/SAX2DOM_test.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"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/DOM_test_wide.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/DOM_test_wide.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_DOM_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"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
-				AssemblerListingLocation=".\Release_test_DOM/"
-				ObjectFile=".\Release_test_DOM/"
-				ProgramDataBaseFileName=".\Release_test_DOM/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/DOM_test_wide.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<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\DOM\main_wide.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\tests\DOM\dom_test_suite.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Attribute.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_CDATA.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_CharacterData.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Document.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DocumentFragment.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DocumentType.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_DOMImplementation.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Element.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_ProcessingInstruction.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_SAX2DOM.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Siblings.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\Dom\test_Text.hpp"
-				>
-			</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\textui\TableTestResult.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
-				>
-			</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>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_DOM_wide"
+	ProjectGUID="{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Debug_test_DOM"
+			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"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug_test_DOM/SAX2DOM_test.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"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/DOM_test_wide.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/DOM_test_wide.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Release_test_DOM_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"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
+				AssemblerListingLocation=".\Release_test_DOM/"
+				ObjectFile=".\Release_test_DOM/"
+				ProgramDataBaseFileName=".\Release_test_DOM/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/DOM_test_wide.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<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\DOM\main_wide.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\tests\DOM\dom_test_suite.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_Attribute.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_CDATA.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_CharacterData.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_Document.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_DocumentFragment.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_DocumentType.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_DOMImplementation.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_Element.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_ProcessingInstruction.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_SAX2DOM.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_Siblings.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\Dom\test_Text.hpp"
+				>
+			</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\textui\TableTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
+				>
+			</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>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs7/test_xpath.vcproj b/vs7/test_xpath.vcproj
index c76252aa..25f93932 100644
--- a/vs7/test_xpath.vcproj
+++ b/vs7/test_xpath.vcproj
@@ -1,339 +1,339 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="test_xpath"
-	ProjectGUID="{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_xpath"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/xpath_test.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/xpath_test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_xpath"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/xpath_test.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</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="..\tests\XPath\main.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\tests\XPath\arithmetic_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\attr_value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\axis_enumerator_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\execute_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\expression_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\logical_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\match_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\node_test_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\parse_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\relational_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\step_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\xpath_test_suite.hpp"
-				>
-			</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\textui\TableTestResult.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
-				>
-			</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>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_xpath"
+	ProjectGUID="{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Debug_test_xpath"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm1000 "
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/xpath_test.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/xpath_test.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Release_test_xpath"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm1000 "
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				DisableLanguageExtensions="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/xpath_test.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</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="..\tests\XPath\main.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\tests\XPath\arithmetic_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\attr_value_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\axis_enumerator_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\execute_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\expression_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\logical_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\match_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\node_test_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\parse_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\relational_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\step_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\value_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\xpath_test_suite.hpp"
+				>
+			</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\textui\TableTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
+				>
+			</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>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs7/test_xpath_silly.vcproj b/vs7/test_xpath_silly.vcproj
index e28c4c16..795b0f06 100644
--- a/vs7/test_xpath_silly.vcproj
+++ b/vs7/test_xpath_silly.vcproj
@@ -1,345 +1,345 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="test_xpath_silly"
-	ProjectGUID="{92BC362C-4B23-4444-A9A8-81933D01D283}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_xpath_silly"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="false"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/xpath_test_ss.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/xpath_test_ss.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_xpath_silly"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/xpath_test_ss.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</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="..\tests\XPath\main_silly.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\silly_string\silly_string.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
-			<File
-				RelativePath="..\tests\XPath\arithmetic_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\attr_value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\axis_enumerator_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\execute_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\expression_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\logical_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\match_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\node_test_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\parse_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\relational_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\silly_string\silly_string.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\step_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\xpath_test_suite.hpp"
-				>
-			</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\textui\TableTestResult.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
-				>
-			</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>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_xpath_silly"
+	ProjectGUID="{92BC362C-4B23-4444-A9A8-81933D01D283}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Debug_test_xpath_silly"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm1000 "
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="false"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/xpath_test_ss.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/xpath_test_ss.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Release_test_xpath_silly"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm1000 "
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				DisableLanguageExtensions="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/xpath_test_ss.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</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="..\tests\XPath\main_silly.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\silly_string\silly_string.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="..\tests\XPath\arithmetic_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\attr_value_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\axis_enumerator_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\execute_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\expression_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\logical_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\match_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\node_test_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\parse_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\relational_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\silly_string\silly_string.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\step_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\value_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\xpath_test_suite.hpp"
+				>
+			</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\textui\TableTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
+				>
+			</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>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/vs7/test_xpath_wide.vcproj b/vs7/test_xpath_wide.vcproj
index 5119b470..561bf301 100644
--- a/vs7/test_xpath_wide.vcproj
+++ b/vs7/test_xpath_wide.vcproj
@@ -1,337 +1,337 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="test_xpath_wide"
-	ProjectGUID="{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug_test_xpath_wide"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="false"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica-debug.lib"
-				OutputFile="$(OutDir)/xpath_test_wide.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/xpath_test_wide.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Release_test_xpath_wide"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm1000 "
-				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="true"
-				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\arabica.lib"
-				OutputFile="$(OutDir)/xpath_test_wide.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</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="..\tests\XPath\main_wide.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			>
-			<File
-				RelativePath="..\tests\XPath\arithmetic_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\attr_value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\axis_enumerator_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\execute_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\expression_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\logical_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\match_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\node_test_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\parse_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\relational_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\step_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\value_test.hpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\XPath\xpath_test_suite.hpp"
-				>
-			</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\textui\TableTestResult.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
-				>
-			</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>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_xpath_wide"
+	ProjectGUID="{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Debug_test_xpath_wide"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm1000 "
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="3"
+				DisableLanguageExtensions="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="false"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica-debug.lib"
+				OutputFile="$(OutDir)/xpath_test_wide.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/xpath_test_wide.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Release_test_xpath_wide"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/Zm1000 "
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				DisableLanguageExtensions="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\lib\arabica.lib"
+				OutputFile="$(OutDir)/xpath_test_wide.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</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="..\tests\XPath\main_wide.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="..\tests\XPath\arithmetic_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\attr_value_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\axis_enumerator_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\execute_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\expression_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\logical_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\match_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\node_test_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\parse_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\relational_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\step_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\value_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\XPath\xpath_test_suite.hpp"
+				>
+			</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\textui\TableTestResult.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tests\CppUnit\textui\TableTestResult.hpp"
+				>
+			</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>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>