added DEBUG_NEW for memory leaks tracking

6 files changed, 42 insertions, 7 deletions

diff --git a/src/msvc6/testpluginrunner/TestPlugInException.cpp b/src/msvc6/testpluginrunner/TestPlugInException.cpp
index f006c0f..c4fcddd 100644
--- a/src/msvc6/testpluginrunner/TestPlugInException.cpp
+++ b/src/msvc6/testpluginrunner/TestPlugInException.cpp
@@ -7,6 +7,13 @@
 #include "StdAfx.h"
 #include "TestPlugInException.h"
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+
 
 TestPlugInException::TestPlugInException( std::string message, 
                                           Cause cause ) : 
diff --git a/src/msvc6/testrunner/ActiveTest.cpp b/src/msvc6/testrunner/ActiveTest.cpp
index 5a27cf9..67da35d 100644
--- a/src/msvc6/testrunner/ActiveTest.cpp
+++ b/src/msvc6/testrunner/ActiveTest.cpp
@@ -1,6 +1,12 @@
 #include "stdafx.h"
 #include "ActiveTest.h"
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
 
 
 // Construct the active test
@@ -18,13 +24,6 @@ ActiveTest::~ActiveTest()
 { 
   CSingleLock( &m_runCompleted, TRUE );
   m_test = NULL;
-
-   CSingleLock (&m_runCompleted, TRUE); 
-   if ( m_threadHandle != INVALID_HANDLE_VALUE ) 
-   {
-     CloseHandle( m_threadHandle );
-     m_threadHandle = INVALID_HANDLE_VALUE;
-   }
 }
 
 
diff --git a/src/msvc6/testrunner/ListCtrlSetter.cpp b/src/msvc6/testrunner/ListCtrlSetter.cpp
index ea25f94..d06af54 100644
--- a/src/msvc6/testrunner/ListCtrlSetter.cpp
+++ b/src/msvc6/testrunner/ListCtrlSetter.cpp
@@ -1,6 +1,13 @@
 #include "StdAfx.h"
 #include "ListCtrlSetter.h"
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+
 
 ListCtrlSetter::ListCtrlSetter( CListCtrl &list ) :
     m_List( list ),
diff --git a/src/msvc6/testrunner/MostRecentTests.cpp b/src/msvc6/testrunner/MostRecentTests.cpp
index 9d437a7..e854bf3 100644
--- a/src/msvc6/testrunner/MostRecentTests.cpp
+++ b/src/msvc6/testrunner/MostRecentTests.cpp
@@ -8,6 +8,13 @@
 #include "MostRecentTests.h"
 #include <algorithm>
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+
 
 MostRecentTests::MostRecentTests()
 {
diff --git a/src/msvc6/testrunner/ResourceLoaders.cpp b/src/msvc6/testrunner/ResourceLoaders.cpp
index 88699da..17f4895 100644
--- a/src/msvc6/testrunner/ResourceLoaders.cpp
+++ b/src/msvc6/testrunner/ResourceLoaders.cpp
@@ -2,6 +2,14 @@
 
 #include "ResourceLoaders.h"
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+
+
 extern HINSTANCE g_testRunnerResource;
 
 CString loadCString(UINT stringId)
diff --git a/src/msvc6/testrunner/TestRunnerModel.cpp b/src/msvc6/testrunner/TestRunnerModel.cpp
index a0a44ca..9b175b6 100644
--- a/src/msvc6/testrunner/TestRunnerModel.cpp
+++ b/src/msvc6/testrunner/TestRunnerModel.cpp
@@ -11,6 +11,13 @@
 #include <stdexcept>
 #include <cppunit/testsuite.h>
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+
 
 const CString TestRunnerModel::settingKey( _T("CppUnit") );
 const CString TestRunnerModel::settingMainDialogKey( _T( "MainDialog" ) );