Added -table option to test executables. It outputs the results as a tab

seperated table, which can be pasted into spreadsheet/google docs/etc.
2025-01-18 22:26:32 +01:00 · 2008-08-09 23:19:21 +01:00 · 2008-08-09 23:19:21 +01:00 · 07ef52f308
commit 07ef52f308
parent 5870c68fa6
42 changed files with 2400 additions and 2079 deletions
--- a/include/XPath/impl/xpath_compile_context.hpp
+++ b/include/XPath/impl/xpath_compile_context.hpp
@ -1,56 +1,56 @@
-#ifndef ARABICA_XPATH_COMPILE_CONTEXT_HPP
-#define ARABICA_XPATH_COMPILE_CONTEXT_HPP
-
-namespace Arabica
-{
-namespace XPath
-{
-
-template<class string_type, class string_adaptor> class XPath;
-template<class string_type, class string_adaptor> class NamespaceContext;
-template<class string_type, class string_adaptor> class FunctionResolver;
-
-namespace impl
-{
-
-template<class string_type, class string_adaptor>
-class CompilationContext : private NamespaceContext<string_type, string_adaptor>
-{
-public:
-  CompilationContext(const XPath<string_type, string_adaptor>& xpathCompiler,
-                     const NamespaceContext<string_type, string_adaptor>& namespaceContext,
-                     const FunctionResolver<string_type, string_adaptor>& functionResolver) :
-      xpath_(xpathCompiler),
-      namespaceContext_(namespaceContext),
-      functionResolver_(functionResolver)
-  { 
-  } // CompilationContext
-
-  const XPath<string_type, string_adaptor>& xpath() const { return xpath_; }
-  const NamespaceContext<string_type, string_adaptor>& namespaceContext() const { return *this; }
-  const FunctionResolver<string_type, string_adaptor>& functionResolver() const { return functionResolver_; }
-
-private:
-  virtual string_type namespaceURI(const string_type& prefix) const
-  {
-    string_type uri = namespaceContext_.namespaceURI(prefix);
+#ifndef ARABICA_XPATH_COMPILE_CONTEXT_HPP
+#define ARABICA_XPATH_COMPILE_CONTEXT_HPP
+
+namespace Arabica
+{
+namespace XPath
+{
+
+template<class string_type, class string_adaptor> class XPath;
+template<class string_type, class string_adaptor> class NamespaceContext;
+template<class string_type, class string_adaptor> class FunctionResolver;
+
+namespace impl
+{
+
+template<class string_type, class string_adaptor>
+class CompilationContext : private NamespaceContext<string_type, string_adaptor>
+{
+public:
+  CompilationContext(const XPath<string_type, string_adaptor>& xpathCompiler,
+                     const NamespaceContext<string_type, string_adaptor>& namespaceContext,
+                     const FunctionResolver<string_type, string_adaptor>& functionResolver) :
+      xpath_(xpathCompiler),
+      namespaceContext_(namespaceContext),
+      functionResolver_(functionResolver)
+  { 
+  } // CompilationContext
+
+  const XPath<string_type, string_adaptor>& xpath() const { return xpath_; }
+  const NamespaceContext<string_type, string_adaptor>& namespaceContext() const { return *this; }
+  const FunctionResolver<string_type, string_adaptor>& functionResolver() const { return functionResolver_; }
+
+private:
+  virtual string_type namespaceURI(const string_type& prefix) const
+  {
+    string_type uri = namespaceContext_.namespaceURI(prefix);
    if(string_adaptor::empty(uri))
-      throw Arabica::XPath::UnboundNamespacePrefixException(prefix); 
-    return uri;
-  } // namespaceURI
-
-
-  const XPath<string_type, string_adaptor>& xpath_;
-  const NamespaceContext<string_type, string_adaptor>& namespaceContext_;
-  const FunctionResolver<string_type, string_adaptor>& functionResolver_;
-
-  CompilationContext(const CompilationContext&);
-  CompilationContext& operator=(const CompilationContext&);
-  bool operator==(const CompilationContext&) const;
-}; // class CompilationContext
-
-} // namespace impl
-} // namespace XPath
-} // namespace Arabica
-
-#endif
+      throw Arabica::XPath::UnboundNamespacePrefixException(string_adaptor::asStdString(prefix)); 
+    return uri;
+  } // namespaceURI
+
+
+  const XPath<string_type, string_adaptor>& xpath_;
+  const NamespaceContext<string_type, string_adaptor>& namespaceContext_;
+  const FunctionResolver<string_type, string_adaptor>& functionResolver_;
+
+  CompilationContext(const CompilationContext&);
+  CompilationContext& operator=(const CompilationContext&);
+  bool operator==(const CompilationContext&) const;
+}; // class CompilationContext
+
+} // namespace impl
+} // namespace XPath
+} // namespace Arabica
+
+#endif
--- a/include/XPath/impl/xpath_step.hpp
+++ b/include/XPath/impl/xpath_step.hpp
@ -379,7 +379,7 @@ private:
          ++node;
          if(axis == ATTRIBUTE)
          {
-            if(prefix == string_adaptor::construct("xmlns"))
+            if(prefix == string_adaptor::construct_from_utf8("xmlns"))
              return new FailNodeTest<string_type, string_adaptor>();
            return new AttributeQNameNodeTest<string_type, string_adaptor>(uri, name);
          }
@ -392,7 +392,7 @@ private:
          ++node;
          if(axis == ATTRIBUTE)
          {
-            if(name == string_adaptor::construct("xmlns"))
+            if(name == string_adaptor::construct_from_utf8("xmlns"))
              return new FailNodeTest<string_type, string_adaptor>();
            return new AttributeNameNodeTest<string_type, string_adaptor>(name);
          }
@ -456,7 +456,7 @@ private:
          string_type uri = namespaceContext.namespaceURI(prefix);
          if(axis == ATTRIBUTE)
          {
-            if(prefix == string_adaptor::construct("xmlns"))
+            if(prefix == string_adaptor::construct_from_utf8("xmlns"))
              return new FailNodeTest<string_type, string_adaptor>();
            return new AttributeQStarNodeTest<string_type, string_adaptor>(uri);
          }
--- a/tests/CppUnit/Makefile.am
+++ b/tests/CppUnit/Makefile.am
@ -15,7 +15,9 @@ cppunit_sources = framework/CppUnitException.h \
                  TestRunner.cpp \
                  TestRunner.hpp \
                  textui/TextTestResult.cpp \
-                  textui/TextTestResult.h
+                  textui/TextTestResult.h \
+                  textui/TableTestResult.cpp \
+                  textui/TableTestResult.h

 silly_string_sources = ../silly_string/silly_string.cpp \
                       ../silly_string/silly_string.hpp
--- a/tests/CppUnit/TestRunner.cpp
+++ b/tests/CppUnit/TestRunner.cpp
@ -1,5 +1,6 @@
 #include "TestRunner.hpp"
 #include "textui/TextTestResult.h"
+#include "textui/TableTestResult.hpp"
 #include <iostream>

 //////////////////////////////////////////
@ -23,27 +24,43 @@ using namespace std;
 typedef pair<string, Test *>           mapping;
 typedef vector<pair<string, Test *> >   mappings;

+template<typename result_type>
 bool run(const string& name, Test *test, bool verbose)
 {
  if(verbose)
    cout << "Running " << name << endl;
-  TextTestResult  result(name, verbose);
+  result_type  result(name, verbose);
  test->run (&result);
  cout << result;
  return result.wasSuccessful();
 } // run

+bool textrun(const string& name, Test *test, bool verbose)
+{
+  return run<TextTestResult>(name, test, verbose);
+} // textrun
+
+bool tablerun(const string& name, Test *test, bool verbose)
+{
+  return run<TableTestResult>(name, test, verbose);
+} // tablerun
+
+
+
 void printBanner ()
 {
-  cout << "Usage: driver [-v] [ -wait ] testName, where name is the name of a test case class" << endl;
+  cout << "Usage: driver [-v] [-table] [ -wait ] testName, where name is the name of a test case class" << endl;
 } // printBanner

+typedef bool (*runFn)(const string& name, Test *test, bool verbose);
+
 bool TestRunner::run(int ac, const char **av)
 {
  bool ok = true;
  string  testCase;
  int     numberOfTests = 0;
  int opt = 0;
+  runFn runner = textrun;

  for(int i = 1; i < ac; i++) 
  {
@ -61,6 +78,14 @@ bool TestRunner::run(int ac, const char **av)
      continue;
    }

+    if(string(av[i]) == "-table")
+    {
+      runner = tablerun;
+      ++opt;
+      continue;
+    }
+
+
    testCase = av[i];

    if(testCase == "") 
@ -78,7 +103,7 @@ bool TestRunner::run(int ac, const char **av)
      if((*it).first == testCase) 
      {
        testToRun = (*it).second;
-        ok &= ::run((*it).first, testToRun, verbose_);
+        ok &= runner((*it).first, testToRun, verbose_);
      }
    }

@ -96,7 +121,7 @@ bool TestRunner::run(int ac, const char **av)
    // run everything
    for(mappings::iterator it = m_mappings.begin(); it != m_mappings.end(); ++it) 
    {
-      ok &= ::run((*it).first, (*it).second, verbose_);
+      ok &= runner((*it).first, (*it).second, verbose_);
    }
    return ok;
  } 
--- a/tests/CppUnit/TestRunner.hpp
+++ b/tests/CppUnit/TestRunner.hpp
@ -7,7 +7,7 @@
 class TestRunner
 {
 protected:
-	bool verbose_;
+  bool verbose_;
 	bool m_wait;
 	std::vector<std::pair<std::string,Test *> > m_mappings;

--- a/tests/CppUnit/textui/TableTestResult.cpp
+++ b/tests/CppUnit/textui/TableTestResult.cpp
@ -0,0 +1,14 @@
+
+
+#include "TableTestResult.hpp"
+
+void TableTestResult::print(std::ostream& stream)
+{
+  stream 
+    << "\n"
+    << name() << "\t"
+    << runTests() << "\t"
+    << testFailures() << "\t"
+    << testErrors() << "\t"
+    << testSkips();
+} // print
--- a/tests/CppUnit/textui/TableTestResult.hpp
+++ b/tests/CppUnit/textui/TableTestResult.hpp
@ -0,0 +1,13 @@
+#ifndef CPPUNIT_TableTestResult_HPP
+#define CPPUNIT_TableTestResult_HPP
+
+#include "TextTestResult.h"
+
+class TableTestResult : public TextTestResult
+{
+public:
+    TableTestResult(const std::string& name, bool verbose) : TextTestResult(name, verbose) { }
+
+    virtual void print(std::ostream& stream);
+};
+#endif
--- a/tests/CppUnit/textui/TextTestResult.cpp
+++ b/tests/CppUnit/textui/TextTestResult.cpp
@ -125,7 +125,7 @@ void TextTestResult::print (ostream& stream)
    if(verbose_)
      printSkips (stream);
    if(verbose_ || !wasSuccessful())
-    cout << endl;
+    stream << endl;
 }


@ -135,15 +135,15 @@ void TextTestResult::printHeader (ostream& stream)
    {
      if(verbose_)
      {
-        cout << endl << name_;
+        stream << endl << name_;
        if(testSkips())
-          cout << endl << "OK (" << runTests () << " tests, with " << testSkips() << " skips)" << endl;
+          stream << endl << "OK (" << runTests () << " tests, with " << testSkips() << " skips)" << endl;
      else
-        cout << endl << "OK (" << runTests () << " tests)" << endl;
+        stream << endl << "OK (" << runTests () << " tests)" << endl;
      }
    }
    else
-        cout << endl
+        stream << endl
             << name_ << endl
             << "!!!FAILURES!!!" << endl
             << "Test Results:" << endl
--- a/tests/CppUnit/textui/TextTestResult.h
+++ b/tests/CppUnit/textui/TextTestResult.h
@ -20,6 +20,9 @@ public:
    virtual void        printSkips    (std::ostream& stream);
    virtual void        printHeader   (std::ostream& stream);

+protected:
+  const std::string& name() const { return name_; }
+
 private:
    std::string name_;
    bool verbose_;
--- a/vs7/test_DOM.vcproj
+++ b/vs7/test_DOM.vcproj
@ -1,335 +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\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>
--- a/vs7/test_DOM_silly.vcproj
+++ b/vs7/test_DOM_silly.vcproj
@ -1,343 +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\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>
--- a/vs7/test_DOM_wide.vcproj
+++ b/vs7/test_DOM_wide.vcproj
@ -1,335 +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\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>
--- a/vs7/test_SAX_filter.vcproj
+++ b/vs7/test_SAX_filter.vcproj
@ -216,6 +216,14 @@
 				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"
 				>
--- a/vs7/test_SAX_filter_silly.vcproj
+++ b/vs7/test_SAX_filter_silly.vcproj
@ -214,6 +214,14 @@
 				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"
 				>
--- a/vs7/test_SAX_filter_wide.vcproj
+++ b/vs7/test_SAX_filter_wide.vcproj
@ -214,6 +214,14 @@
 				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"
 				>
--- a/vs7/test_utils.vcproj
+++ b/vs7/test_utils.vcproj
@ -236,6 +236,14 @@
 				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"
 				>
--- a/vs7/test_xpath.vcproj
+++ b/vs7/test_xpath.vcproj
@ -1,331 +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\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>
--- a/vs7/test_xpath_silly.vcproj
+++ b/vs7/test_xpath_silly.vcproj
@ -1,337 +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\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>
--- a/vs7/test_xpath_wide.vcproj
+++ b/vs7/test_xpath_wide.vcproj
@ -1,329 +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\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>
--- a/vs7/test_xslt.vcproj
+++ b/vs7/test_xslt.vcproj
@ -224,6 +224,14 @@
 				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"
 				>
--- a/vs8/test_DOM.vcproj
+++ b/vs8/test_DOM.vcproj
@ -272,6 +272,14 @@
 				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"
 				>
--- a/vs8/test_DOM_silly.vcproj
+++ b/vs8/test_DOM_silly.vcproj
@ -280,6 +280,14 @@
 				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"
 				>
--- a/vs8/test_DOM_wide.vcproj
+++ b/vs8/test_DOM_wide.vcproj
@ -272,6 +272,14 @@
 				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"
 				>
--- a/vs8/test_SAX_filter.vcproj
+++ b/vs8/test_SAX_filter.vcproj
@ -216,6 +216,14 @@
 				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"
 				>
--- a/vs8/test_SAX_filter_silly.vcproj
+++ b/vs8/test_SAX_filter_silly.vcproj
@ -214,6 +214,14 @@
 				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"
 				>
--- a/vs8/test_SAX_filter_wide.vcproj
+++ b/vs8/test_SAX_filter_wide.vcproj
@ -214,6 +214,14 @@
 				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"
 				>
--- a/vs8/test_utils.vcproj
+++ b/vs8/test_utils.vcproj
@ -236,6 +236,14 @@
 				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"
 				>
--- a/vs8/test_xpath.vcproj
+++ b/vs8/test_xpath.vcproj
@ -268,6 +268,14 @@
 				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"
 				>
--- a/vs8/test_xpath_silly.vcproj
+++ b/vs8/test_xpath_silly.vcproj
@ -274,6 +274,14 @@
 				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"
 				>
--- a/vs8/test_xpath_wide.vcproj
+++ b/vs8/test_xpath_wide.vcproj
@ -266,6 +266,14 @@
 				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"
 				>
--- a/vs8/test_xslt.vcproj
+++ b/vs8/test_xslt.vcproj
@ -224,6 +224,14 @@
 				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"
 				>
--- a/vs9/test_DOM.vcproj
+++ b/vs9/test_DOM.vcproj
@ -273,6 +273,14 @@
 				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"
 				>
--- a/vs9/test_DOM_silly.vcproj
+++ b/vs9/test_DOM_silly.vcproj
@ -281,6 +281,14 @@
 				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"
 				>
--- a/vs9/test_DOM_wide.vcproj
+++ b/vs9/test_DOM_wide.vcproj
@ -273,6 +273,14 @@
 				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"
 				>
--- a/vs9/test_SAX_filter.vcproj
+++ b/vs9/test_SAX_filter.vcproj
@ -217,6 +217,14 @@
 				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"
 				>
--- a/vs9/test_SAX_filter_silly.vcproj
+++ b/vs9/test_SAX_filter_silly.vcproj
@ -215,6 +215,14 @@
 				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"
 				>
--- a/vs9/test_SAX_filter_wide.vcproj
+++ b/vs9/test_SAX_filter_wide.vcproj
@ -215,6 +215,14 @@
 				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"
 				>
--- a/vs9/test_utils.vcproj
+++ b/vs9/test_utils.vcproj
@ -237,6 +237,14 @@
 				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"
 				>
--- a/vs9/test_xpath.vcproj
+++ b/vs9/test_xpath.vcproj
@ -269,6 +269,14 @@
 				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"
 				>
--- a/vs9/test_xpath_silly.vcproj
+++ b/vs9/test_xpath_silly.vcproj
@ -275,6 +275,14 @@
 				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"
 				>
--- a/vs9/test_xpath_wide.vcproj
+++ b/vs9/test_xpath_wide.vcproj
@ -267,6 +267,14 @@
 				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"
 				>
--- a/vs9/test_xslt.vcproj
+++ b/vs9/test_xslt.vcproj
@ -225,6 +225,14 @@
 				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"
 				>