Src/cppunit/TypeInfoHelper.

src/cppunit/TypeInfoHelper.cpp: added work around for bug #565481.
gcc 3.0 RTTI name() returns the type prefixed with a number (the
length of the type). The work around strip the number.

* src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp: registry key is now
set. Allow to save settings.

* src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h:
* src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp: added layout
initialization for resizing.

* src/msvc6/testpluginrunner/TestPlugRunner.rc:
* src/msvc6/testpluginrunner/TestPlugInRunner.dsp: added TestRunner
project files. Somehow I can't get cdxCDynamicDialog to compile
as a MFC extension. Included all sources files and resources
as a very dirt work around.

* src/msvc6/testrunner/TestRunnerDlg.h:
* src/msvc6/testrunner/TestRunnerDlg.cpp:
* src/msvc6/testrunner/TestRunnerModel.h: those classes are no longer
exported in the MFC extension. See TestPlugInRunner issue with
cdxCDynamicDialog.

* include/cppunit/Message.h:
* include/cppunit/TestPath.h:
* include/cppunit/TestResult.h:
* include/cppunit/TestResultCollector.h:
* include/cppunit/TestSuite.h:
* include/cppunit/TestFactoryRegistry.h:
* include/cppunit/XmlElement.h:
* include/cppunit/TypeInfoHelper.h: commented out STL template export
in DLL. This caused conflicts when instantiting the same template in
a user project.

15 files changed, 340 insertions, 58 deletions

diff --git a/src/cppunit/TypeInfoHelper.cpp b/src/cppunit/TypeInfoHelper.cpp
index c521e84..43709c3 100644
--- a/src/cppunit/TypeInfoHelper.cpp
+++ b/src/cppunit/TypeInfoHelper.cpp
@@ -14,6 +14,14 @@ TypeInfoHelper::getClassName( const std::type_info &info )
   static std::string classPrefix( "class " );
   std::string name( info.name() );
 
+  // Work around gcc 3.0 bug: strip number before type name.
+  int firstNotDigitIndex = 0;
+  while ( firstNotDigitIndex < name.length()  &&
+          name[firstNotDigitIndex] >= '0'  &&
+          name[firstNotDigitIndex] <= '9' )
+    ++firstNotDigitIndex;
+  name = name.substr( firstNotDigitIndex );
+
   if ( name.substr( 0, classPrefix.length() ) == classPrefix )
     return name.substr( classPrefix.length() );
   return name;
diff --git a/src/msvc6/testpluginrunner/Resource.h b/src/msvc6/testpluginrunner/Resource.h
index 6a6c527..a9d6492 100644
--- a/src/msvc6/testpluginrunner/Resource.h
+++ b/src/msvc6/testpluginrunner/Resource.h
@@ -2,23 +2,46 @@
 // Microsoft Developer Studio generated include file.
 // Used by TestPlugInRunner.rc
 //
+#define IDS_ERROR_SELECT_TEST           1
+#define IDS_ERRORLIST_TYPE              2
+#define IDS_ERRORLIST_NAME              3
+#define IDS_ERRORLIST_FAILED_CONDITION  4
+#define IDS_ERRORLIST_LINE_NUMBER       5
+#define IDS_ERRORLIST_FILE_NAME         6
 #define IDD_TESTPLUGINRUNNER_DIALOG     102
 #define IDR_MAINFRAME                   128
 #define IDR_TEST_PLUGIN_RUNNER          128
 #define IDD_TEST_PLUG_IN_RUNNER         129
+#define IDD_DIALOG_TEST_HIERARCHY       130
+#define IDR_ACCELERATOR_TEST_RUNNER     131
+#define IDB_TEST_TYPE                   131
+#define IDB_ERROR_TYPE                  134
 #define IDC_LIST                        1000
 #define ID_RUN                          1001
 #define ID_STOP                         1002
-#define IDC_CHOOSE_DLL                  1003
-#define IDC_RELOAD_DLL                  1004
+#define IDC_PROGRESS                    1003
+#define IDC_INDICATOR                   1004
 #define IDC_COMBO_TEST                  1005
 #define IDC_STATIC_RUNS                 1007
 #define IDC_STATIC_ERRORS               1008
 #define IDC_STATIC_FAILURES             1009
 #define IDC_EDIT_TIME                   1010
+#define IDC_BUTTON1                     1011
 #define IDC_BROWSE_TEST                 1011
+#define IDC_TREE_TEST                   1012
+#define IDC_DETAILS                     1012
 #define IDC_CHECK_AUTORUN               1013
 #define IDC_RUNNING_TEST_CASE_LABEL     1016
+#define IDC_STATIC_TEST_NAME            1017
+#define IDC_STATIC_PROGRESS             1018
+#define IDC_STATIC_LABEL_RUNS           1019
+#define IDC_STATIC_LABEL_ERRORS         1020
+#define IDC_STATIC_LABEL_FAILURES       1021
+#define IDC_STATIC_PROGRESS_BAR         1022
+#define IDC_STATIC_DETAILS              1023
+#define IDC_CHOOSE_DLL                  1040
+#define IDC_RELOAD_DLL                  1041
+#define ID_QUIT_APPLICATION             32771
 
 // Next default values for new objects
 // 
@@ -26,7 +49,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        130
 #define _APS_NEXT_COMMAND_VALUE         32772
-#define _APS_NEXT_CONTROL_VALUE         1018
+#define _APS_NEXT_CONTROL_VALUE         1042
 #define _APS_NEXT_SYMED_VALUE           103
 #endif
 #endif
diff --git a/src/msvc6/testpluginrunner/StdAfx.h b/src/msvc6/testpluginrunner/StdAfx.h
index f03235c..7d2a6ea 100644
--- a/src/msvc6/testpluginrunner/StdAfx.h
+++ b/src/msvc6/testpluginrunner/StdAfx.h
@@ -12,6 +12,8 @@
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
+#pragma warning( disable : 4786 )  // warning of hell: debug symbol too long...
+
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
 #include <afxdisp.h>        // MFC Automation classes
diff --git a/src/msvc6/testpluginrunner/TestPlugInRunner.dsp b/src/msvc6/testpluginrunner/TestPlugInRunner.dsp
index 2b57ef9..2b34d35 100644
--- a/src/msvc6/testpluginrunner/TestPlugInRunner.dsp
+++ b/src/msvc6/testpluginrunner/TestPlugInRunner.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 cppunit_dll.lib testrunner.lib /nologo /subsystem:windows /machine:I386 /libpath:"../../../lib/"
+# ADD LINK32 cppunit_dll.lib winmm.lib /nologo /subsystem:windows /machine:I386 /libpath:"../../../lib/"
 
 !ELSEIF  "$(CFG)" == "TestPlugInRunner - Win32 Debug"
 
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 cppunitd_dll.lib testrunnerd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib/"
+# ADD LINK32 cppunitd_dll.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib/"
 
 !ENDIF 
 
@@ -92,6 +92,10 @@ LINK32=link.exe
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # Begin Source File
 
+SOURCE=.\res\errortype.bmp
+# End Source File
+# Begin Source File
+
 SOURCE=.\res\ico00001.ico
 # End Source File
 # Begin Source File
@@ -108,6 +112,10 @@ SOURCE=..\testrunner\res\idr_test.ico
 # End Source File
 # Begin Source File
 
+SOURCE=.\res\test_type.bmp
+# End Source File
+# Begin Source File
+
 SOURCE=..\testrunner\res\test_type.bmp
 # End Source File
 # Begin Source File
@@ -251,15 +259,22 @@ SOURCE=..\..\..\lib\testrunner.dll
 
 !IF  "$(CFG)" == "TestPlugInRunner - Win32 Release"
 
-# Begin Custom Build - Updating $(InputPath)
-IntDir=.\Release
-InputPath=..\..\..\lib\testrunner.dll
-InputName=testrunner
+# PROP Exclude_From_Build 1
 
-"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) $(IntDir)\$(InputName).dll
+!ELSEIF  "$(CFG)" == "TestPlugInRunner - Win32 Debug"
 
-# End Custom Build
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\lib\testrunnerd.dll
+
+!IF  "$(CFG)" == "TestPlugInRunner - Win32 Release"
+
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "TestPlugInRunner - Win32 Debug"
 
@@ -268,33 +283,184 @@ InputName=testrunner
 !ENDIF 
 
 # End Source File
+# End Group
+# Begin Group "TestRunner-Was-In-Dll"
+
+# PROP Default_Filter ""
+# Begin Group "UserInterface"
+
+# PROP Default_Filter ""
+# Begin Group "DynamicWindow"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\lib\testrunnercd.dll
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicBar.cpp
 # PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\lib\testrunnerd.dll
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicBar.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "TestPlugInRunner - Win32 Release"
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicControlsManager.cpp
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicControlsManager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicDialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicDialog.h
+# End Source File
+# Begin Source File
 
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicFormView.cpp
 # PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "TestPlugInRunner - Win32 Debug"
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicFormView.h
+# End Source File
+# Begin Source File
 
-# Begin Custom Build - Updating DLL: $(InputPath)
-IntDir=.\Debug
-InputPath=..\..\..\lib\testrunnerd.dll
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicPropSheet.cpp
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
 
-"$(IntDir)\testrunnerd.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(InputPath) $(IntDir)\testrunnerd.dll
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicPropSheet.h
+# End Source File
+# Begin Source File
 
-# End Custom Build
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicWnd.cpp
+# End Source File
+# Begin Source File
 
-!ENDIF 
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicWnd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicWndEx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\DynamicWindow\cdxCDynamicWndEx.h
+# End Source File
+# Begin Source File
 
+SOURCE=..\testrunner\DynamicWindow\cdxCSizeIconCtrl.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\DynamicWindow\cdxCSizeIconCtrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\DynamicWindow\SizeCBar.cpp
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\DynamicWindow\SizeCBar.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\testrunner\ListCtrlFormatter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\ListCtrlFormatter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\ListCtrlSetter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\ListCtrlSetter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\MsDevCallerListCtrl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\MsDevCallerListCtrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\ProgressBar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\ProgressBar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\TestRunnerDlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\TestRunnerDlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\TreeHierarchyDlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\TreeHierarchyDlg.h
+# End Source File
+# End Group
+# Begin Group "Components"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\testrunner\ActiveTest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\ActiveTest.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\MfcSynchronizationObject.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\TestRunnerModel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\TestRunnerModel.h
+# End Source File
+# End Group
+# Begin Group "NewFiles"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\testrunner\MostRecentTests.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\testrunner\MostRecentTests.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\include\msvc6\DSPlugin\TestRunnerDSPluginVC6_i.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# End Group
 # End Group
 # Begin Source File
 
diff --git a/src/msvc6/testpluginrunner/TestPlugInRunner.rc b/src/msvc6/testpluginrunner/TestPlugInRunner.rc
index f75fc9d..a99a2b3 100644
--- a/src/msvc6/testpluginrunner/TestPlugInRunner.rc
+++ b/src/msvc6/testpluginrunner/TestPlugInRunner.rc
@@ -26,34 +26,52 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog
 //
 
-IDD_TEST_PLUG_IN_RUNNER DIALOG DISCARDABLE  0, 0, 403, 215
+IDD_TEST_PLUG_IN_RUNNER DIALOG DISCARDABLE  0, 0, 330, 226
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TestRunner"
+CAPTION "Test plug-in runner"
 FONT 8, "MS Sans Serif"
 BEGIN
-    PUSHBUTTON      "&Browse",IDC_BROWSE_TEST,346,16,50,14
-    DEFPUSHBUTTON   "&Run",ID_RUN,346,39,50,14
-    LTEXT           "Test name:",IDC_STATIC,7,7,179,9
-    COMBOBOX        IDC_COMBO_TEST,7,17,332,157,CBS_DROPDOWNLIST | 
+    PUSHBUTTON      "&Choose DLL",IDC_CHOOSE_DLL,273,72,50,14
+    PUSHBUTTON      "Re&load DLL",IDC_RELOAD_DLL,273,88,50,14
+    LTEXT           "&Test:",IDC_STATIC_TEST_NAME,7,7,17,8
+    COMBOBOX        IDC_COMBO_TEST,28,7,235,157,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Browse",IDC_BROWSE_TEST,273,7,50,14
+    DEFPUSHBUTTON   "&Run",ID_RUN,273,23,50,14
+    LTEXT           "Progress:",IDC_STATIC_PROGRESS,7,23,33,9
+    LTEXT           "none",IDC_RUNNING_TEST_CASE_LABEL,43,23,220,9
+    LTEXT           "Progress Bar",IDC_STATIC_PROGRESS_BAR,7,34,256,15,NOT 
+                    WS_VISIBLE
+    LTEXT           "Runs:",IDC_STATIC_LABEL_RUNS,7,55,29,10
+    LTEXT           "0",IDC_STATIC_RUNS,48,55,30,8
+    LTEXT           "Errors:",IDC_STATIC_LABEL_ERRORS,89,55,29,10
+    LTEXT           "0",IDC_STATIC_ERRORS,127,55,19,8
+    LTEXT           "Failures:",IDC_STATIC_LABEL_FAILURES,174,55,29,10
+    LTEXT           "0",IDC_STATIC_FAILURES,212,55,19,8
+    LTEXT           "&Errors and Failures:",IDC_STATIC,7,70,67,9
+    CONTROL         "List1",IDC_LIST,"SysListView32",LVS_REPORT | 
+                    LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | 
+                    WS_TABSTOP,7,81,257,60
+    LTEXT           "&Details:",IDC_STATIC_DETAILS,7,145,24,8
+    EDITTEXT        IDC_DETAILS,7,156,316,48,ES_MULTILINE | ES_AUTOVSCROLL | 
+                    ES_AUTOHSCROLL | ES_READONLY
     CONTROL         "&Autorun at startup",IDC_CHECK_AUTORUN,"Button",
-                    BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,347,67,49,25
-    PUSHBUTTON      "&Stop",ID_STOP,346,175,50,14
-    PUSHBUTTON      "&Close",IDOK,346,194,50,14
-    LTEXT           "Progress:",IDC_STATIC,7,38,31,9
-    LTEXT           "Runs:",IDC_STATIC,103,76,29,10
-    LTEXT           "0",IDC_STATIC_RUNS,141,76,19,8
-    LTEXT           "Errors:",IDC_STATIC,169,76,29,10
-    LTEXT           "0",IDC_STATIC_ERRORS,207,76,19,8
-    LTEXT           "Failures:",IDC_STATIC,235,76,29,10
-    LTEXT           "0",IDC_STATIC_FAILURES,273,76,19,8
-    LTEXT           "Errors and Failures:",IDC_STATIC,7,94,67,9
-    CONTROL         "List1",IDC_LIST,"SysListView32",LVS_REPORT | WS_BORDER | 
-                    WS_TABSTOP,7,105,331,86
-    EDITTEXT        IDC_EDIT_TIME,7,195,332,13,ES_AUTOHSCROLL | ES_READONLY
-    PUSHBUTTON      "&Choose DLL",IDC_CHOOSE_DLL,346,97,50,14
-    PUSHBUTTON      "Re&load DLL",IDC_RELOAD_DLL,346,122,50,14
-    LTEXT           "none",IDC_RUNNING_TEST_CASE_LABEL,40,38,299,8
+                    BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,273,46,49,19
+    PUSHBUTTON      "&Stop",ID_STOP,273,112,50,14
+    PUSHBUTTON      "&Close",IDOK,273,128,50,14
+    EDITTEXT        IDC_EDIT_TIME,7,206,316,13,ES_AUTOHSCROLL | ES_READONLY
+END
+
+IDD_DIALOG_TEST_HIERARCHY DIALOG DISCARDABLE  0, 0, 259, 250
+STYLE DS_MODALFRAME | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
+CAPTION "Test hierarchy"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "Select",IDOK,202,7,50,14
+    CONTROL         "Tree1",IDC_TREE_TEST,"SysTreeView32",TVS_HASBUTTONS | 
+                    TVS_HASLINES | TVS_LINESATROOT | TVS_FULLROWSELECT | 
+                    WS_BORDER | WS_TABSTOP,7,7,189,236
+    PUSHBUTTON      "&Close",IDCANCEL,202,34,50,14
 END
 
 
@@ -111,13 +129,41 @@ BEGIN
     IDD_TEST_PLUG_IN_RUNNER, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 396
+        RIGHTMARGIN, 323
         TOPMARGIN, 7
-        BOTTOMMARGIN, 208
+        BOTTOMMARGIN, 219
+    END
+
+    IDD_DIALOG_TEST_HIERARCHY, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 252
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 243
     END
 END
 #endif    // APSTUDIO_INVOKED
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDR_ACCELERATOR_TEST_RUNNER ACCELERATORS DISCARDABLE 
+BEGIN
+    "Q",            ID_QUIT_APPLICATION,    VIRTKEY, NOINVERT
+    VK_SPACE,       ID_RUN,                 VIRTKEY, NOINVERT
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_ERROR_TYPE          BITMAP  DISCARDABLE     "res\\errortype.bmp"
+IDB_TEST_TYPE           BITMAP  DISCARDABLE     "res\\test_type.bmp"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
@@ -177,6 +223,22 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDR_TEST_PLUGIN_RUNNER  ICON    DISCARDABLE     "res\\TestPlugInRunner.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_ERROR_SELECT_TEST   "You must select a test!"
+    IDS_ERRORLIST_TYPE      "Type"
+    IDS_ERRORLIST_NAME      "Name"
+    IDS_ERRORLIST_FAILED_CONDITION "Failed Condition"
+    IDS_ERRORLIST_LINE_NUMBER "Line Number"
+    IDS_ERRORLIST_FILE_NAME "File Name"
+END
+
 #endif    // French (France) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp b/src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp
index e81fa49..b869ad2 100644
--- a/src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp
+++ b/src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp
@@ -55,6 +55,8 @@ BOOL TestPlugInRunnerApp::InitInstance()
 	Enable3dControlsStatic();	// Call this when linking to MFC statically
 #endif
 
+  SetRegistryKey(_T("CppUnit Test Plug-In Runner"));
+
   TestPlugInRunnerModel model;
 	TestPlugInRunnerDlg dlg( &model );
 	m_pMainWnd = &dlg;
diff --git a/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp b/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp
index cf8d566..87f0b4d 100644
--- a/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp
+++ b/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp
@@ -184,3 +184,14 @@ TestPlugInRunnerDlg::loadDll( std::string path )
   m_model->selectHistoryTest( plugInModel().rootTest() );
   updateHistoryCombo();
 }
+
+
+void 
+TestPlugInRunnerDlg::initializeLayout()
+{
+  TestRunnerDlg::initializeLayout();
+
+  AddSzXControl( IDC_CHOOSE_DLL, mdRepos );
+  AddSzXControl( IDC_RELOAD_DLL, mdRepos );
+
+}
diff --git a/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h b/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h
index f2b979a..35e2aae 100644
--- a/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h
+++ b/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h
@@ -49,6 +49,11 @@ protected:
   afx_msg void OnReloadDll();
   //}}AFX_MSG
   DECLARE_MESSAGE_MAP();
+
+protected:
+  virtual void initializeLayout();
+
+
 private:
   TestPlugInRunnerModel &plugInModel();
 
diff --git a/src/msvc6/testpluginrunner/res/errortype.bmp b/src/msvc6/testpluginrunner/res/errortype.bmp
new file mode 100644
index 0000000..aa645ba
--- /dev/null
+++ b/src/msvc6/testpluginrunner/res/errortype.bmp
diff --git a/src/msvc6/testpluginrunner/res/test_type.bmp b/src/msvc6/testpluginrunner/res/test_type.bmp
new file mode 100644
index 0000000..63e7fa0
--- /dev/null
+++ b/src/msvc6/testpluginrunner/res/test_type.bmp
diff --git a/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp b/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp
index 14de35d..2d37053 100644
--- a/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp
+++ b/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp
@@ -498,10 +498,10 @@ void cdxCDynamicWnd::DoInitWindow(CWnd & rWnd, const CSize & szInitial)
 #ifdef _DEBUG
 	if(!(rWnd.GetStyle() & WS_CLIPCHILDREN) && !(m_nFlags & flSWPCopyBits))
 	{
-		TRACE(_T("***\n"
-					"*** cdxCDynamicWnd class note: If your window flickers too much, add the WS_CLIPCHILDREN style to it\n"
-					"***                            or try to set the flSWPCopyBits flags !!!\n"
-					"***\n"));
+		TRACE(_T("***\n")
+					_T("*** cdxCDynamicWnd class note: If your window flickers too much, add the WS_CLIPCHILDREN style to it\n")
+					_T("***                            or try to set the flSWPCopyBits flags !!!\n")
+					_T("***\n"));
 	}
 #endif
 
diff --git a/src/msvc6/testrunner/TestRunner.rc b/src/msvc6/testrunner/TestRunner.rc
index cdd6c92..b8bbca2 100644
--- a/src/msvc6/testrunner/TestRunner.rc
+++ b/src/msvc6/testrunner/TestRunner.rc
@@ -147,7 +147,7 @@ BEGIN
     EDITTEXT        IDC_DETAILS,7,154,316,48,ES_MULTILINE | ES_AUTOVSCROLL | 
                     ES_AUTOHSCROLL | ES_READONLY
     CONTROL         "&Autorun at startup",IDC_CHECK_AUTORUN,"Button",
-                    BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,274,52,49,19
+                    BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,273,52,49,19
     PUSHBUTTON      "&Stop",ID_STOP,273,82,50,14
     PUSHBUTTON      "&Close",IDOK,273,98,50,14
     EDITTEXT        IDC_EDIT_TIME,7,206,316,13,ES_AUTOHSCROLL | ES_READONLY
diff --git a/src/msvc6/testrunner/TestRunnerDlg.cpp b/src/msvc6/testrunner/TestRunnerDlg.cpp
index 2c99a45..e7a6fa5 100644
--- a/src/msvc6/testrunner/TestRunnerDlg.cpp
+++ b/src/msvc6/testrunner/TestRunnerDlg.cpp
@@ -91,8 +91,11 @@ TestRunnerDlg::OnInitDialog()
 {
   cdxCDynamicDialog::OnInitDialog();
 
-//    m_hAccelerator = ::LoadAccelerators( AfxGetResourceHandle(),
+#ifdef CPPUNIT_SUBCLASSING_TESTRUNNERDLG_BUILD
+  m_hAccelerator = ::LoadAccelerators( AfxGetResourceHandle(),
+#else
   m_hAccelerator = ::LoadAccelerators( g_testRunnerResource,
+#endif
                                        MAKEINTRESOURCE( IDR_ACCELERATOR_TEST_RUNNER ) );
 // It always fails!!! I don't understand why. Complain about not finding the resource name!
   ASSERT( m_hAccelerator !=NULL );
@@ -628,7 +631,7 @@ TestRunnerDlg::displayFailureDetailsFor( int failureIndex )
   if ( failureIndex >= 0  &&  failureIndex < m_result->failures().size() )
     details = m_result->failures()[ failureIndex ]->thrownException()->what();
 
-  details.Replace( "\n", "\r\n" );
+  details.Replace( _T("\n"), _T("\r\n") );
 
   m_details.SetWindowText( details );
 }
diff --git a/src/msvc6/testrunner/TestRunnerDlg.h b/src/msvc6/testrunner/TestRunnerDlg.h
index 87d8425..a2b59a8 100644
--- a/src/msvc6/testrunner/TestRunnerDlg.h
+++ b/src/msvc6/testrunner/TestRunnerDlg.h
@@ -46,8 +46,8 @@ class TestRunnerModel;
 /////////////////////////////////////////////////////////////////////////////
 // TestRunnerDlg dialog
 
-class AFX_EXT_CLASS TestRunnerDlg : public cdxCDynamicDialog,
-                                    public CppUnit::TestListener
+class TestRunnerDlg : public cdxCDynamicDialog,
+                      public CppUnit::TestListener
 {
 public:
   TestRunnerDlg( TestRunnerModel *model,
diff --git a/src/msvc6/testrunner/TestRunnerModel.h b/src/msvc6/testrunner/TestRunnerModel.h
index 152a2b8..68445d9 100644
--- a/src/msvc6/testrunner/TestRunnerModel.h
+++ b/src/msvc6/testrunner/TestRunnerModel.h
@@ -13,7 +13,7 @@
 /*! \class TestRunnerModel
  * \brief This class represents a model for the test runner.
  */
-class AFX_CLASS_EXPORT TestRunnerModel
+class TestRunnerModel
 {
 public:
   static const CString settingKey;