Src/cppunit/PlugInManager.

src/cppunit/PlugInManager.cpp: fixed bug in unload().

* include/cppunit/TypeInfoHelper.h:
* src/cppunit/TypeInfoHelper.cpp: Implementation is now always available
is CPPUNIT_HAVE_RTTI is not 0. This removes the need to use
different libraries. CPPUNIT_USE_TYPEINFO_NAME can be set on a
case by case basis for HelperMacros.

* src/cppunit/TestFactoryRegistry.cpp: removed unused include of
TypeInfoHelper.h.

* include/cppunit/TextTestProgressListener.h:
* src/cppunit/TextTestProgressListener.cpp: used endTest() instead
of done() to finalize.

* src/msvc6/TestPlugInRunner/TestPlugIn.h:
* src/msvc6/TestPlugInRunner/TestPlugIn.cpp: updated to use the
new test plug-in system.

* examples/simple/SimplePlugIn.cpp:
* examples/simple/simple_plugin.dsp: crossplatform test plug-in
example using 'simple'.

* examples/msvc6/EasyTestPlugIn/*: projects replaced with the
crossplatform projecct examples/simple/simple_plugin.dsp.

25 files changed, 224 insertions, 308 deletions

diff --git a/ChangeLog b/ChangeLog
index e609512..fb2b10c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,33 @@
 2002-04-19 Baptiste Lepilleur <gaiacrtn@free.fr>
 
+	* src/cppunit/PlugInManager.cpp: fixed bug in unload().
+
+	* include/cppunit/TypeInfoHelper.h:
+	* src/cppunit/TypeInfoHelper.cpp: Implementation is now always available
+	  is CPPUNIT_HAVE_RTTI is not 0. This removes the need to use
+	  different libraries. CPPUNIT_USE_TYPEINFO_NAME can be set on a 
+	  case by case basis for HelperMacros.
+
+	* src/cppunit/TestFactoryRegistry.cpp: removed unused include of
+	  TypeInfoHelper.h.
+
+	* include/cppunit/TextTestProgressListener.h:
+	* src/cppunit/TextTestProgressListener.cpp: used endTest() instead
+	  of done() to finalize.
+
+	* src/msvc6/TestPlugInRunner/TestPlugIn.h:
+	* src/msvc6/TestPlugInRunner/TestPlugIn.cpp: updated to use the
+	  new test plug-in system.
+
+	* examples/simple/SimplePlugIn.cpp:
+	* examples/simple/simple_plugin.dsp: crossplatform test plug-in
+	  example using 'simple'.
+
+	* examples/msvc6/EasyTestPlugIn/*: projects replaced with the 
+	  crossplatform projecct examples/simple/simple_plugin.dsp.
+
+2002-04-19 Baptiste Lepilleur <gaiacrtn@free.fr>
+
 	* configure.in: added some makefile.am
 
 	* contrib/readme.txt: updated.
diff --git a/INSTALL-WIN32.txt b/INSTALL-WIN32.txt
index 4b6b87d..728c8f6 100644
--- a/INSTALL-WIN32.txt
+++ b/INSTALL-WIN32.txt
@@ -24,6 +24,9 @@ to write unit tests.
 
 * cppunit_dll(cppunit_dll.dll/lib) : same as above, but build as a DLL.
 
+* DllPlugInTester(DllPlugInTester.exe) : test plug-in runner executable.
+Use this to test DLL in your post-build step, or debug them.
+
 * TestRunner (testrunner.dll) : a MFC extension DLL to run and browser unit 
 tests from a GUI.
 
@@ -57,7 +60,7 @@ it in a 'cleaner' way. That sample has not been updated for a long time).
 failure. Also demonstrates the MFC Unicode TestRunner.
 
 * TestPlugIn : a sample demonstrating how to write a TestPlugIn for the
-TestPlugInRunner (experimental).
+TestPlugInRunner.
 
 
 Configuration:
@@ -69,8 +72,6 @@ CppUnit and TestRunner comes with 3 configurations.
 * Debug (d): Debug Multithreaded DLL, debug mode
 * Unicode Release (u): Unicode Multihtreaded DLL, release mode
 * Unicode Debug (ud): Unicode Debug Multithreaded DLL, debug mode
-* Debug Crossplatform (cd): Debug Multithreaded DLL, suite name for
-test cases are not extracted from the class name using type_info.
 
 For CppUnit, when building as dll, "dll" is appended to the 'suffix'.
 
@@ -83,7 +84,6 @@ Building:
 ---------
 
 * Open the src/CppUnitLibraries.dsw workspace in VC++.
-* Make TestPlugInRunner the active project.
 * In the 'Build' menu, select 'Batch Build...'
 * In the batch build dialog, select all projects and press the build button.
 * The resulting libraries can be found in the lib/ directory.
@@ -133,23 +133,20 @@ Using CppUnit:
 
 * Writing unit tests:
   To write unit tests, you need to link against cppunitXX.lib, where
-  XX is the chosen configuration suffix letters. You must
-  enable RTTI (Project Settings/C++/C++ Language) in your project.
+  XX is the chosen configuration suffix letters. 
   CppUnit include directory must be in the include search path.
   You can do that by adding the include directory in 
   Project Settings/C++/Preprocessor/Additional include directories,
   or Tools/Options/Directories/Include.
 
   Quick steps:
-  - enable RTTI
   - link lib/cppunitXX.lib
   - include/ must be in the include search path
 
 * Using the TestRunner GUI:
   To use the test runner GUI you need to link against testrunnerXX.lib
   and cppunitXX.lib, where XX is the chosen configuration suffix 
-  letters. You must enable RTTI (Project Settings/C++/C++ Language) in 
-  your project. testrunner.dll must be in the path when your program is
+  letters. testrunner.dll must be in the path when your program is
   run (the Debug/Release directory, your project dsp directory, or
   in a directory specified in the PATH environment variable).
   One of the easiest way to do that is to either add a post-build
@@ -163,7 +160,6 @@ Using CppUnit:
   test" settings are different for each application.
 
   Quick steps:
-  - enable RTTI
   - link lib/cppunitXX.lib and lib/testrunnerXX.lib
   - include/ must be in the include search path
   - lib/testrunnerXX.dll must be available to run your project
diff --git a/NEWS b/NEWS
index 8849ff0..3f59d12 100644
--- a/NEWS
+++ b/NEWS
@@ -4,12 +4,38 @@
 	- More versatile, easier to make test plug-in.
 	- A PlugInManager to manage multiple test plug-ins.
 	- Crossplatform test plug-in runner.
+	- Crossplatform test plug-in example.
 	- A brief progress listener 
 	- Easier test hierarchy creation
 	- Improved documentation.
 	- Tracking of test run start/end.
-	- Added simple example
 	- Contribution: XML style sheet & borland 5.5 makefile.
+	- Help needed on the Unix side!
+
+* Buildling on Unix:
+
+  - I did not get any feed back on the previous build issue on Unix. Using
+    a simple autobook example was useless to try to solve the problem. Here
+	is the issue:
+
+	CppUnit library build fine, it is the example I'm having trouble with.
+
+	Since the test plug-in have been added, CppUnit use the function
+	dlopen(), dlsym() and dlclose() on unix to load/unload the plug-in.
+
+	Those functions apparently requires to link another library when
+	building an exectuable. Here is was should be done:
+	- linking against the said library for each example.
+	- generates the shared library for the examples/simple/simple_plugin 
+	  example (source files are ExampleTestCase.cpp, ExampleTestCase.cpp 
+	  and SimplePlugIn.cpp).
+	- if possible, makes the above optionnal if --disable-test-plug-in 
+	  is defined:
+	  - don't link the dlXXX library 
+	  - don't compile the plug-in example
+	  - add #define CPPUNIT_NO_TESTPLUGIN 1 to the config file
+
+	Contact me on the mailing-list for more details.
 
 * TestPlugIn:
 
@@ -76,15 +102,19 @@
   - A new TestListener that prints the test name before running it. Most useful when
     a test crashing, mean a application crash.
 
-* Simple example (example/simple): 
-
-  - Added crossplatform simple example. Equivalent to VC++ HostApp example.
-
 * Documentation:
 
   - More details about the test plug-in, how to use it, how does it works...
     See module/Writing Test Plug-in.
 
+* Examples:
+
+  - examAdded crossplatform simple example. Equivalent to VC++ HostApp example.
+  - examples/simple: a very simple example, demonstrating the use of CppUnit
+    with a single TestFixture. Demonstrate both how to build an application
+	using TestRunner, and how to build a test plug-in to use with the
+	test plug-in runner.
+
 * Contribution
 
   - Contributed by project cuppa team (http://sourceforge.jp/projects/cuppa/):
@@ -103,6 +133,9 @@
     been updated to preverse its apparent behavior. It should be of concern
 	if you created and registered custom TestFactory.
 
+  - Removed TextTestProgressListener::done(). No longer needed, it listens
+    for endTestRun().
+
 * Compatiblity Break for 1.9.2 users:
 
   - TestPlugIn.h: CppUnitTestPlugIn as been completly rewritten.
diff --git a/TODO b/TODO
index d2868e2..eefa039 100644
--- a/TODO
+++ b/TODO
@@ -6,9 +6,8 @@
   - [DONE] Update QtTestRunner to use findTest()
   - [DONE] Include DllPlugInTester, and update to use findTest() and TestPath().
   - [DONE] Add startSuite() and endSuite() to TestListener and TestResult
-  - Add TestResult::protectedRun( ProtectedTest * ) to allow custom exception and other
-    error catching (signal on Unix)
-  - Add a global set up decorator for all test run to TestResult 
+  - Add TestResult::protectedRun( ProtectedTest * ) to allow custom exception
+  - [DONE] Add a global set up decorator for all test run to TestResult 
     => extends TestListener: startTestRun(), endTestRun().
   - [DONE] Change CompilerOutputter to be customized with parameter instead of subclassing:
     provide a default string to the constructor that indicates the error report format:
@@ -34,6 +33,8 @@
   - [DONE] Wrap test plug-in suite retreival in a TestPlugInSuite.
   - [DONE] CrossPlatform TestPlugInSuite and TestPlugInInterface.
   - [DONE] CrossPlatform test runner for TestPlugIn.
+  - Advanced command line support for the plug-in runner 
+     (--xml, --compiler...) + plug-in parameter support.
 
   - STL orthodox template for container elements.
 
@@ -41,6 +42,7 @@
   - add tests for XmlOutputter::setStyleSheet (current assertion macro strip <?...> when
     testing )
   - add tests for TestRunner, TextUi::TestRunner, CompilerOutputter.
+  - add tests for test plug-in
 
 * VC++ TestRunner:
   - Make it possible to specify the registry path where settings are stored.
@@ -72,4 +74,6 @@ of a text (they disappear).
 	  - MSVC++ special stuff
 	- other custmization stuff I haven't understood yet
 
-	CppUnit: architecture overview.
\ No newline at end of file
+	CppUnit: architecture overview.
+	
+	- need to merge cookbook with Phil Verghese's contribution.
\ No newline at end of file
diff --git a/examples/cppunittest/CppUnitTestMain.dsp b/examples/cppunittest/CppUnitTestMain.dsp
index a566429..e3a6a30 100644
--- a/examples/cppunittest/CppUnitTestMain.dsp
+++ b/examples/cppunittest/CppUnitTestMain.dsp
@@ -19,7 +19,6 @@ CFG=CppUnitTestMain - Win32 Debug DLL
 !MESSAGE 
 !MESSAGE "CppUnitTestMain - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "CppUnitTestMain - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "CppUnitTestMain - Win32 Debug Crossplatform Setting" (based on "Win32 (x86) Console Application")
 !MESSAGE "CppUnitTestMain - Win32 Release DLL" (based on "Win32 (x86) Console Application")
 !MESSAGE "CppUnitTestMain - Win32 Debug DLL" (based on "Win32 (x86) Console Application")
 !MESSAGE 
@@ -93,39 +92,6 @@ PostBuild_Desc=Self test
 PostBuild_Cmds=$(TargetPath)
 # End Special Build Tool
 
-!ELSEIF  "$(CFG)" == "CppUnitTestMain - Win32 Debug Crossplatform Setting"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "CppUnitTestMain___Win32_Debug_Crossplatform_Setting"
-# PROP BASE Intermediate_Dir "CppUnitTestMain___Win32_Debug_Crossplatform_Setting"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugCrossplatform"
-# PROP Intermediate_Dir "DebugCrossplatform"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DONT_USE_TYPEINFO" /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../../lib/cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../../lib/cppunitcd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# Begin Special Build Tool
-TargetPath=.\DebugCrossplatform\CppUnitTestMain.exe
-SOURCE="$(InputPath)"
-PostBuild_Desc=Self test
-PostBuild_Cmds=$(TargetPath)
-# End Special Build Tool
-
 !ELSEIF  "$(CFG)" == "CppUnitTestMain - Win32 Release DLL"
 
 # PROP BASE Use_MFC 0
@@ -198,7 +164,6 @@ PostBuild_Cmds=$(TargetPath)
 
 # Name "CppUnitTestMain - Win32 Release"
 # Name "CppUnitTestMain - Win32 Debug"
-# Name "CppUnitTestMain - Win32 Debug Crossplatform Setting"
 # Name "CppUnitTestMain - Win32 Release DLL"
 # Name "CppUnitTestMain - Win32 Debug DLL"
 # Begin Group "Tests"
@@ -473,10 +438,6 @@ SOURCE=..\..\lib\cppunit_dll.dll
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "CppUnitTestMain - Win32 Debug Crossplatform Setting"
-
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "CppUnitTestMain - Win32 Release DLL"
 
 # Begin Custom Build - Updating DLL: $(InputPath)
@@ -508,10 +469,6 @@ SOURCE=..\..\lib\cppunitd_dll.dll
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "CppUnitTestMain - Win32 Debug Crossplatform Setting"
-
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "CppUnitTestMain - Win32 Release DLL"
 
 # PROP Exclude_From_Build 1
diff --git a/examples/examples.dsw b/examples/examples.dsw
index 86babe9..46a1fac 100644
--- a/examples/examples.dsw
+++ b/examples/examples.dsw
@@ -51,24 +51,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "EasyTestPlugIn"=.\MSVC6\EasyTestPlugIn\EasyTestPlugIn.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name DllPlugInTester
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name cppunit_dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "HostApp"=.\msvc6\HostApp\HostApp.dsp - Package Owner=<4>
 
 Package=<5>
@@ -110,6 +92,12 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name cppunit_dll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name TestRunner
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -183,6 +171,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "simple_plugin"=.\SIMPLE\simple_plugin.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name cppunit_dll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name DllPlugInTester
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Global:
 
 Package=<5>
diff --git a/examples/hierarchy/BoardGameTest.h b/examples/hierarchy/BoardGameTest.h
index 33f84f3..0b57b7e 100644
--- a/examples/hierarchy/BoardGameTest.h
+++ b/examples/hierarchy/BoardGameTest.h
@@ -2,6 +2,7 @@
 #define __BOARDGAMETEST_H__
 
 #include <cppunit/extensions/HelperMacros.h>
+#include <iostream>
 
 template<typename GAMECLASS> 
 class BoardGameTest : public CppUnit::TestFixture 
diff --git a/examples/hierarchy/hierarchy.dsp b/examples/hierarchy/hierarchy.dsp
index eac7bc0..ad10685 100644
--- a/examples/hierarchy/hierarchy.dsp
+++ b/examples/hierarchy/hierarchy.dsp
@@ -19,7 +19,6 @@ CFG=hierarchy - Win32 Debug Crossplatform Setting
 !MESSAGE 
 !MESSAGE "hierarchy - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "hierarchy - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "hierarchy - Win32 Debug Crossplatform Setting" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -77,38 +76,12 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\lib\cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
-!ELSEIF  "$(CFG)" == "hierarchy - Win32 Debug Crossplatform Setting"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "hierarchy___Win32_Debug_Without_CPPUNIT_USE_TYPEINFO"
-# PROP BASE Intermediate_Dir "hierarchy___Win32_Debug_Without_CPPUNIT_USE_TYPEINFO"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugCrossplatform"
-# PROP Intermediate_Dir "DebugCrossplatform"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "USE_TYPEINFO" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DONT_USE_TYPEINFO" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\lib\cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\lib\cppunitcd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
 !ENDIF 
 
 # Begin Target
 
 # Name "hierarchy - Win32 Release"
 # Name "hierarchy - Win32 Debug"
-# Name "hierarchy - Win32 Debug Crossplatform Setting"
 # Begin Source File
 
 SOURCE=.\BoardGame.cpp
diff --git a/examples/hierarchy/main.cpp b/examples/hierarchy/main.cpp
index 819eb4a..4de8275 100644
--- a/examples/hierarchy/main.cpp
+++ b/examples/hierarchy/main.cpp
@@ -1,29 +1,23 @@
-#include "cppunit/TextTestResult.h"
-#include "cppunit/TestSuite.h"
+#include <cppunit/ui/text/TestRunner.h>
 
 #include "BoardGame.h"
 #include "Chess.h"
-
 #include "BoardGameTest.h"
 #include "ChessTest.h"
 
 
-#include <vector>
-#include <iostream>
-
-
 
 int 
 main(int argc, char** argv)
 {
-  CppUnit::TestSuite suite;
+  CppUnit::TextUi::TestRunner runner;
 
-  suite.addTest( BoardGameTest<BoardGame>::suite() );
-  suite.addTest( ChessTest<Chess>::suite() );
+  runner.addTest( BoardGameTest<BoardGame>::suite() );
+  runner.addTest( ChessTest<Chess>::suite() );
 
-  CppUnit::TextTestResult res;
+  bool wasSucessful = runner.run();
 
-  suite.run( &res );
-  std::cout << res << std::endl;
+  // should be:
+  //  return wasSuccessful ? 0 : 1;
   return 0;
 }
diff --git a/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp b/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp
index e47a748..0312c4c 100644
--- a/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp
+++ b/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp
@@ -164,11 +164,6 @@ InputName=testrunner
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\lib\testrunnercd.dll
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\lib\testrunnerd.dll
 
 !IF  "$(CFG)" == "CppUnitTestApp - Win32 Release"
diff --git a/examples/msvc6/HostApp/HostApp.dsp b/examples/msvc6/HostApp/HostApp.dsp
index 65a427d..3af2bbb 100644
--- a/examples/msvc6/HostApp/HostApp.dsp
+++ b/examples/msvc6/HostApp/HostApp.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=HostApp - Win32 Debug Unicode
+CFG=HostApp - Win32 Debug No Type Info Name
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,15 +13,15 @@ CFG=HostApp - Win32 Debug Unicode
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "HostApp.mak" CFG="HostApp - Win32 Debug Unicode"
+!MESSAGE NMAKE /f "HostApp.mak" CFG="HostApp - Win32 Debug No Type Info Name"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "HostApp - Win32 Release" (based on "Win32 (x86) Application")
 !MESSAGE "HostApp - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "HostApp - Win32 Debug Crossplatform Setting" (based on "Win32 (x86) Application")
 !MESSAGE "HostApp - Win32 Release Unicode" (based on "Win32 (x86) Application")
 !MESSAGE "HostApp - Win32 Debug Unicode" (based on "Win32 (x86) Application")
+!MESSAGE "HostApp - Win32 Debug No Type Info Name" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -85,35 +85,6 @@ LINK32=link.exe
 # ADD LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none /map /nodefaultlib
 
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "HostApp___Win32_Debug_Without_CPPUNIT_USE_TYPEINFO"
-# PROP BASE Intermediate_Dir "HostApp___Win32_Debug_Without_CPPUNIT_USE_TYPEINFO"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugCrossplatform"
-# PROP Intermediate_Dir "DebugCrossplatform"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "CPPUNIT_USE_TYPEINFO" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "CPPUNIT_DONT_USE_TYPEINFO" /Yu"stdafx.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# SUBTRACT BASE LINK32 /pdb:none /map /nodefaultlib
-# ADD LINK32 ..\..\..\lib\cppunitcd.lib ..\..\..\lib\testrunnercd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /map /nodefaultlib
-
 !ELSEIF  "$(CFG)" == "HostApp - Win32 Release Unicode"
 
 # PROP BASE Use_MFC 6
@@ -170,15 +141,44 @@ LINK32=link.exe
 # ADD LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerud.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none /map /nodefaultlib
 
+!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug No Type Info Name"
+
+# PROP BASE Use_MFC 6
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "HostApp___Win32_Debug_No_Type_Info_Name"
+# PROP BASE Intermediate_Dir "HostApp___Win32_Debug_No_Type_Info_Name"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 6
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugNoTypeInfoName"
+# PROP Intermediate_Dir "DebugNoTypeInfoName"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\include\msvc6" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D CPPUNIT_USE_TYPEINFO_NAME=0 /Yu"stdafx.h" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# SUBTRACT BASE LINK32 /pdb:none /map /nodefaultlib
+# ADD LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none /map /nodefaultlib
+
 !ENDIF 
 
 # Begin Target
 
 # Name "HostApp - Win32 Release"
 # Name "HostApp - Win32 Debug"
-# Name "HostApp - Win32 Debug Crossplatform Setting"
 # Name "HostApp - Win32 Release Unicode"
 # Name "HostApp - Win32 Debug Unicode"
+# Name "HostApp - Win32 Debug No Type Info Name"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -288,10 +288,6 @@ InputName=testrunner
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting"
-
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "HostApp - Win32 Release Unicode"
 
 # Begin Custom Build - $(IntDir)\$(InputName).dll
@@ -309,12 +305,17 @@ InputName=testrunner
 # PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug No Type Info Name"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\lib\testrunnercd.dll
+SOURCE=..\..\..\lib\testrunnerd.dll
 
 !IF  "$(CFG)" == "HostApp - Win32 Release"
 
@@ -322,14 +323,10 @@ SOURCE=..\..\..\lib\testrunnercd.dll
 
 !ELSEIF  "$(CFG)" == "HostApp - Win32 Debug"
 
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting"
-
 # Begin Custom Build - $(IntDir)\$(InputName).dll
-IntDir=.\DebugCrossplatform
-InputPath=..\..\..\lib\testrunnercd.dll
-InputName=testrunnercd
+IntDir=.\Debug
+InputPath=..\..\..\lib\testrunnerd.dll
+InputName=testrunnerd
 
 "$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	copy $(InputPath) $(IntDir)\$(InputName).dll
@@ -343,24 +340,8 @@ InputName=testrunnercd
 
 !ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Unicode"
 
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\lib\testrunnerd.dll
-
-!IF  "$(CFG)" == "HostApp - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug"
-
 # Begin Custom Build - $(IntDir)\$(InputName).dll
-IntDir=.\Debug
+IntDir=.\DebugUnicode
 InputPath=..\..\..\lib\testrunnerd.dll
 InputName=testrunnerd
 
@@ -369,19 +350,10 @@ InputName=testrunnerd
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Release Unicode"
-
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Unicode"
+!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug No Type Info Name"
 
 # Begin Custom Build - $(IntDir)\$(InputName).dll
-IntDir=.\DebugUnicode
+IntDir=.\DebugNoTypeInfoName
 InputPath=..\..\..\lib\testrunnerd.dll
 InputName=testrunnerd
 
@@ -405,10 +377,6 @@ SOURCE=..\..\..\lib\testrunneru.dll
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting"
-
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "HostApp - Win32 Release Unicode"
 
 # Begin Custom Build - Updating DLL $(InputPath)
@@ -425,6 +393,11 @@ InputName=testrunneru
 
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug No Type Info Name"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
@@ -440,10 +413,6 @@ SOURCE=..\..\..\lib\testrunnerud.dll
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting"
-
-# PROP Exclude_From_Build 1
-
 !ELSEIF  "$(CFG)" == "HostApp - Win32 Release Unicode"
 
 # PROP Exclude_From_Build 1
@@ -460,6 +429,11 @@ InputName=testrunnerud
 
 # End Custom Build
 
+!ELSEIF  "$(CFG)" == "HostApp - Win32 Debug No Type Info Name"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
 !ENDIF 
 
 # End Source File
diff --git a/examples/simple/Main.cpp b/examples/simple/Main.cpp
index 4115812..fb50396 100644
--- a/examples/simple/Main.cpp
+++ b/examples/simple/Main.cpp
@@ -4,8 +4,6 @@
 #include <cppunit/TestResult.h>
 #include <cppunit/TestResultCollector.h>
 #include <cppunit/TestRunner.h>
-#include <cppunit/XmlOutputter.h>
-#include <fstream>
 
 
 int
@@ -27,13 +25,6 @@ main( int argc, char* argv[] )
   runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
   runner.run( controller );
 
-  // Write an XML file with the result
-  std::ofstream file( "tests.xml" );
-  CppUnit::XmlOutputter xml( &result, file );
-  xml.setStyleSheet( "report.xsl" );
-  xml.write();
-  file.close();
-
   // Print test in a compiler compatible format.
   CppUnit::CompilerOutputter outputter( &result, std::cerr );
   outputter.write(); 
diff --git a/examples/simple/Makefile.am b/examples/simple/Makefile.am
index 243c857..47e7d68 100644
--- a/examples/simple/Makefile.am
+++ b/examples/simple/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = simple.dsp
+EXTRA_DIST = simple.dsp simple_plugin.dsp SimplePlugIn.cpp
 
 INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
 
diff --git a/examples/msvc6/EasyTestPlugIn/EasyTestPlugIn.cpp b/examples/simple/SimplePlugIn.cpp
index e19fa7e..1d24f06 100644
--- a/examples/msvc6/EasyTestPlugIn/EasyTestPlugIn.cpp
+++ b/examples/simple/SimplePlugIn.cpp
@@ -3,4 +3,6 @@
 
 #include <cppunit/plugin/TestPlugIn.h>
 
+
+// Implements all the plug-in stuffs, WinMain...
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/examples/msvc6/EasyTestPlugIn/EasyTestPlugIn.dsp b/examples/simple/simple_plugin.dsp
index ccadf3b..70d79da 100644
--- a/examples/msvc6/EasyTestPlugIn/EasyTestPlugIn.dsp
+++ b/examples/simple/simple_plugin.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="EasyTestPlugIn" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="simple_plugin" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=EasyTestPlugIn - Win32 Debug
+CFG=simple_plugin - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "EasyTestPlugIn.mak".
+!MESSAGE NMAKE /f "simple_plugin.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "EasyTestPlugIn.mak" CFG="EasyTestPlugIn - Win32 Debug"
+!MESSAGE NMAKE /f "simple_plugin.mak" CFG="simple_plugin - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "EasyTestPlugIn - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "EasyTestPlugIn - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "simple_plugin - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "simple_plugin - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,22 +29,22 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "EasyTestPlugIn - Win32 Release"
+!IF  "$(CFG)" == "simple_plugin - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Output_Dir "simple_plugin___Win32_Release"
+# PROP BASE Intermediate_Dir "simple_plugin___Win32_Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "ReleasePlugIn"
+# PROP Intermediate_Dir "ReleasePlugIn"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EASYTESTPLUGIN_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EASYTESTPLUGIN_EXPORTS" /D "CPPUNIT_DLL" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLE_PLUGIN_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLE_PLUGIN_EXPORTS" /D "CPPUNIT_DLL" /FD /c
+# SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
@@ -54,30 +54,30 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../../../lib/cppunit_dll.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /dll /machine:I386 /libpath:"../../lib/"
 # Begin Special Build Tool
-TargetPath=.\Release\EasyTestPlugIn.dll
+TargetPath=.\ReleasePlugIn\simple_plugin.dll
 SOURCE="$(InputPath)"
-PostBuild_Desc=Unit testing...
-PostBuild_Cmds=..\..\..\lib\DllPlugInTester_dll.exe $(TargetPath)
+PostBuild_Desc=Running tests...
+PostBuild_Cmds=..\..\lib\DllPlugInTester_dll.exe $(TargetPath)
 # End Special Build Tool
 
-!ELSEIF  "$(CFG)" == "EasyTestPlugIn - Win32 Debug"
+!ELSEIF  "$(CFG)" == "simple_plugin - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Output_Dir "simple_plugin___Win32_Debug"
+# PROP BASE Intermediate_Dir "simple_plugin___Win32_Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "DebugPlugIn"
+# PROP Intermediate_Dir "DebugPlugIn"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EASYTESTPLUGIN_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EASYTESTPLUGIN_EXPORTS" /D "CPPUNIT_DLL" /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLE_PLUGIN_EXPORTS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLE_PLUGIN_EXPORTS" /D "CPPUNIT_DLL" /FD /GZ  /c
+# SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
@@ -87,31 +87,31 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../../../lib/cppunitd_dll.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"DebugPlugIn/simple_plugind.dll" /pdbtype:sept /libpath:"../../lib/"
 # Begin Special Build Tool
-TargetPath=.\Debug\EasyTestPlugIn.dll
+TargetPath=.\DebugPlugIn\simple_plugind.dll
 SOURCE="$(InputPath)"
-PostBuild_Desc=Unit testing...
-PostBuild_Cmds=..\..\..\lib\DllPlugInTesterd_dll.exe $(TargetPath)
+PostBuild_Desc=Running tests...
+PostBuild_Cmds=..\..\lib\DllPlugInTesterd_dll.exe $(TargetPath)
 # End Special Build Tool
 
 !ENDIF 
 
 # Begin Target
 
-# Name "EasyTestPlugIn - Win32 Release"
-# Name "EasyTestPlugIn - Win32 Debug"
+# Name "simple_plugin - Win32 Release"
+# Name "simple_plugin - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\EasyTestPlugIn.cpp
+SOURCE=.\ExampleTestCase.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\HostApp\ExampleTestCase.cpp
+SOURCE=.\ExampleTestCase.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\HostApp\ExampleTestCase.h
+SOURCE=.\SimplePlugIn.cpp
 # End Source File
 # End Target
 # End Project
diff --git a/include/cppunit/BriefTestProgressListener.h b/include/cppunit/BriefTestProgressListener.h
index c3b4b9d..5d87e05 100644
--- a/include/cppunit/BriefTestProgressListener.h
+++ b/include/cppunit/BriefTestProgressListener.h
@@ -26,10 +26,6 @@ public:
 
   void endTest( Test *test );
 
-  /*! Call this method after running the tests.
-   */
-  void done();
-
 private:
   /// Prevents the use of the copy constructor.
   BriefTestProgressListener( const BriefTestProgressListener &copy );
diff --git a/include/cppunit/TextTestProgressListener.h b/include/cppunit/TextTestProgressListener.h
index 180633e..2aa230b 100644
--- a/include/cppunit/TextTestProgressListener.h
+++ b/include/cppunit/TextTestProgressListener.h
@@ -22,11 +22,11 @@ public:
   virtual ~TextTestProgressListener();
 
   void startTest( Test *test );
+
   void addFailure( const TestFailure &failure );
 
-  /*! Call this method after running the tests.
-   */
-  void done();
+  void endTestRun( Test *test, 
+                   TestResult *eventManager );
 
 private:
   /// Prevents the use of the copy constructor.
diff --git a/include/cppunit/extensions/TestSuiteBuilder.h b/include/cppunit/extensions/TestSuiteBuilder.h
index 1f3e028..709053b 100644
--- a/include/cppunit/extensions/TestSuiteBuilder.h
+++ b/include/cppunit/extensions/TestSuiteBuilder.h
@@ -5,10 +5,8 @@
 #include <memory>
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestCaller.h>
+#include <cppunit/extensions/TypeInfoHelper.h>
 
-#if CPPUNIT_USE_TYPEINFO_NAME
-#  include <cppunit/extensions/TypeInfoHelper.h>
-#endif
 
 namespace CppUnit {
 
diff --git a/include/cppunit/extensions/TypeInfoHelper.h b/include/cppunit/extensions/TypeInfoHelper.h
index 5199a70..e12d4c0 100644
--- a/include/cppunit/extensions/TypeInfoHelper.h
+++ b/include/cppunit/extensions/TypeInfoHelper.h
@@ -3,7 +3,7 @@
 
 #include <cppunit/Portability.h>
 
-#if CPPUNIT_USE_TYPEINFO_NAME
+#if CPPUNIT_HAVE_RTTI
 
 #include <typeinfo>
 
@@ -26,6 +26,6 @@ namespace CppUnit {
 
 }  // namespace CppUnit
 
-#endif
+#endif  // CPPUNIT_HAVE_RTTI
 
 #endif  // CPPUNIT_TYPEINFOHELPER_H
diff --git a/src/cppunit/BriefTestProgressListener.cpp b/src/cppunit/BriefTestProgressListener.cpp
index 8864ad5..76bc2a3 100644
--- a/src/cppunit/BriefTestProgressListener.cpp
+++ b/src/cppunit/BriefTestProgressListener.cpp
@@ -46,11 +46,5 @@ BriefTestProgressListener::endTest( Test *test )
 }
 
 
-void 
-BriefTestProgressListener::done()
-{
-}
-
-
 } //  namespace CppUnit
 
diff --git a/src/cppunit/PlugInManager.cpp b/src/cppunit/PlugInManager.cpp
index ad17a65..f339c63 100644
--- a/src/cppunit/PlugInManager.cpp
+++ b/src/cppunit/PlugInManager.cpp
@@ -76,6 +76,7 @@ PlugInManager::unload( PlugInInfo &plugIn )
   try
   {
     plugIn.m_interface->uninitialize( &TestFactoryRegistry::getRegistry() );
+    delete plugIn.m_manager;
   }
   catch (...)
   {
diff --git a/src/cppunit/TestFactoryRegistry.cpp b/src/cppunit/TestFactoryRegistry.cpp
index ec10c5f..f42df2d 100644
--- a/src/cppunit/TestFactoryRegistry.cpp
+++ b/src/cppunit/TestFactoryRegistry.cpp
@@ -3,10 +3,6 @@
 #include <map>
 #include <assert.h>
 
-#if CPPUNIT_USE_TYPEINFO_NAME
-#  include "cppunit/extensions/TypeInfoHelper.h"
-#endif
-
 
 namespace CppUnit {
 
diff --git a/src/cppunit/TextTestProgressListener.cpp b/src/cppunit/TextTestProgressListener.cpp
index 0eb783d..409099e 100644
--- a/src/cppunit/TextTestProgressListener.cpp
+++ b/src/cppunit/TextTestProgressListener.cpp
@@ -32,11 +32,13 @@ TextTestProgressListener::addFailure( const TestFailure &failure )
 
 
 void 
-TextTestProgressListener::done()
+TextTestProgressListener::endTestRun( Test *test, 
+                                      TestResult *eventManager )
 {
   std::cerr  <<  std::endl;
   std::cerr.flush();
 }
 
+
 } //  namespace CppUnit
 
diff --git a/src/cppunit/TypeInfoHelper.cpp b/src/cppunit/TypeInfoHelper.cpp
index a3fff08..c521e84 100644
--- a/src/cppunit/TypeInfoHelper.cpp
+++ b/src/cppunit/TypeInfoHelper.cpp
@@ -1,9 +1,9 @@
 #include <cppunit/Portability.h>
+#include <cppunit/extensions/TypeInfoHelper.h>
 
-#if CPPUNIT_USE_TYPEINFO_NAME
+#if CPPUNIT_HAVE_RTTI
 
 #include <string>
-#include <cppunit/extensions/TypeInfoHelper.h>
 
 
 namespace CppUnit {
@@ -22,4 +22,4 @@ TypeInfoHelper::getClassName( const std::type_info &info )
 
 } //  namespace CppUnit
 
-#endif 
+#endif // CPPUNIT_HAVE_RTTI
diff --git a/src/cppunit/cppunit.dsp b/src/cppunit/cppunit.dsp
index bd6e7af..4674718 100644
--- a/src/cppunit/cppunit.dsp
+++ b/src/cppunit/cppunit.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=cppunit - Win32 Debug Crossplatform Setting
+CFG=CPPUNIT - WIN32 DEBUG
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,13 +13,12 @@ CFG=cppunit - Win32 Debug Crossplatform Setting
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "cppunit.mak" CFG="cppunit - Win32 Debug Crossplatform Setting"
+!MESSAGE NMAKE /f "cppunit.mak" CFG="CPPUNIT - WIN32 DEBUG"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "cppunit - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "cppunit - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "cppunit - Win32 Debug Crossplatform Setting" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -75,36 +74,12 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\lib\cppunitd.lib"
 
-!ELSEIF  "$(CFG)" == "cppunit - Win32 Debug Crossplatform Setting"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "cppunit___Win32_Debug_Without_CPPUNIT_USE_TYPEINFO"
-# PROP BASE Intermediate_Dir "cppunit___Win32_Debug_Without_CPPUNIT_USE_TYPEINFO"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugCrossplatform"
-# PROP Intermediate_Dir "DebugCrossplatform"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "CPPUNIT_USE_TYPEINFO" /D "WIN32" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32" /D "CPPUNIT_DONT_USE_TYPEINFO" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\cppunitd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\cppunitcd.lib"
-
 !ENDIF 
 
 # Begin Target
 
 # Name "cppunit - Win32 Release"
 # Name "cppunit - Win32 Debug"
-# Name "cppunit - Win32 Debug Crossplatform Setting"
 # Begin Group "documentation"
 
 # PROP Default_Filter ""
@@ -122,6 +97,10 @@ SOURCE=..\..\doc\FAQ
 # End Source File
 # Begin Source File
 
+SOURCE="..\..\INSTALL-WIN32.txt"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\NEWS
 # End Source File
 # Begin Source File
@@ -511,10 +490,6 @@ SOURCE=..\..\configure.in
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\INSTALL-WIN32.txt"
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\cppunit\Makefile.am
 # End Source File
 # Begin Source File