diff -r e26895079d7c -r 7fdc9a71d314 analyzetool/commandlineengine/src/CATDatParser.cpp --- a/analyzetool/commandlineengine/src/CATDatParser.cpp Wed Sep 15 00:19:18 2010 +0300 +++ b/analyzetool/commandlineengine/src/CATDatParser.cpp Wed Sep 15 13:53:27 2010 +0300 @@ -364,7 +364,7 @@ string sPid = GetStringUntilNextSpace( sLine ); m_iCurrentProcessId = _httoi( sPid.c_str() ); - // Header for process tart + // Header for process start m_DataSaver.AddString( "\n--------------------------------\n" ); m_DataSaver.AddString( "Test Run start (" ); m_DataSaver.AddString( m_sCurrentProcessName.c_str() ); @@ -515,10 +515,13 @@ for( size_t i = 0 ; i < m_vHandleLeaks.size() ; i++ ) { string sTempHandleLeak( m_vHandleLeaks[i] ); - // Name. - string sHandleLeakModule( GetStringUntilNextSpace( sTempHandleLeak ) ); // Count. string sNrOfLeaks( GetStringUntilNextSpace(sTempHandleLeak) ); + + // Name. + //string sHandleLeakModule( GetStringUntilNextSpace( sTempHandleLeak ) ); + string sHandleLeakModule( "Unknown" ); + unsigned long iNrOfLeaks = _httoi( sNrOfLeaks.c_str() ); iTotalNrOfLeaks += iNrOfLeaks; if( iNrOfLeaks ) @@ -598,15 +601,6 @@ if ( _stricmp( "winscw", m_sProjectPlatform.c_str() ) == 0 ) CreateWinscwModule( structDllInfo.sModuleName ); - if ( m_iDataVersion >= AT_DLL_TIMESTAMP_DATA_VERSION ) - { - // Pickup module loading time. - string sLoadTime = GetStringUntilNextSpace( sLine ); - unsigned long long ull; - if ( hexToDec( sLoadTime, ull ) ) - structDllInfo.iLoadTime = ull; - } - // Get dll start memory string address from line // Convert string address to real memory address structDllInfo.iStartAddress = @@ -618,6 +612,15 @@ _httoi( GetStringUntilNextSpace( sLine ).c_str() ); + if ( m_iDataVersion >= AT_DLL_TIMESTAMP_DATA_VERSION ) + { + // Pickup module loading time. + string sLoadTime = GetStringUntilNextSpace( sLine ); + unsigned long long ull; + if ( hexToDec( sLoadTime, ull ) ) + structDllInfo.iLoadTime = ull; + } + // Is module already loaded, if not add it to list. bool bFound = false; for( vector::iterator it = m_vDllLoadModList.begin(); @@ -669,6 +672,10 @@ string sModuleName = GetStringUntilNextSpace( sLine ); ChangeToLower( sModuleName ); + // skip adresses - not currently used + GetStringUntilNextSpace( sLine ); + GetStringUntilNextSpace( sLine ); + // Unload time unsigned long long ull; string sUnload = GetStringUntilNextSpace( sLine );