--- a/tracesrv/tracecompiler/test/TracesInHeadersApps/singlemmp_diffnames/dll/src/HelloTraceTypes.cpp	Fri Oct 08 14:56:39 2010 +0300
+++ b/tracesrv/tracecompiler/test/TracesInHeadersApps/singlemmp_diffnames/dll/src/HelloTraceTypes.cpp	Tue Oct 26 16:20:32 2010 +0300
@@ -20,50 +20,72 @@
 #include <e32std.h>
 
 #include "HelloTraceTypes.h"
-#include "HelloTraceTypesDup.h"
-#include "HelloTraceTypesDup2.inl"
 
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "HelloTraceTypesTraces.h"
 #endif
 
+void HelloTraceTypes::TestBoolean()
+    {
+    
+    _LIT(KTextConsoleTitle, "Test bool .... : ");
+    bool joo = true;
+    OstTraceExt1( TRACE_INTERNALS, _TEST_BOOL_HHU_EXT1, "My bool = %hhu", (TUint8)joo);
+    OstTraceExt2( TRACE_INTERNALS, _TEST_BOOL_HHU_EXT2, "Text: %S. My bool = %hhu", KTextConsoleTitle, (TUint8)joo);
+    OstTraceExt2( TRACE_INTERNALS, _TEST_BOOL_U_EXT2, "Text: %S. My bool = %u", KTextConsoleTitle, (TUint32)joo);
+    }
+
 void HelloTraceTypes::SignedIntegers()
     {
     TInt8  eightBit     = - (TInt8)  1 << 6;
-    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_SIGNEDINTEGERS_8, 
-                  "8 bit signed: %hhd", eightBit );
+    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_SIGNEDINTEGERS_8, "8 bit signed: %hhd", eightBit );
     
+    _LIT(KText1, "Test %hhd .... : ");
+    OstTraceExt2( TRACE_INTERNALS, _TEST_HHD_EXT2, "Text: %S. My data = %hhd", KText1, (TInt8)eightBit);
+       
     TInt16 sixteenBit   = - (TInt16) 1 << 14; 
-    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_SIGNEDINTEGERS_16, 
-                  "16 bit signed: %hd", sixteenBit );
+    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_SIGNEDINTEGERS_16, "16 bit signed: %hd", sixteenBit );
+    
+    _LIT(KText2, "Test %hd .... : ");
+     OstTraceExt2( TRACE_INTERNALS, _TEST_HD_EXT2, "Text: %S. My data = %hd", KText2, (TInt16)sixteenBit);
+  
 
     TInt32 thirtyTwoBit = - (TInt32) 1 << 30; 
-    OstTrace1( TRACE_INTERNALS, HELLOTRACETYPES_SIGNEDINTEGERS_32, 
-               "32 bit signed: %d", thirtyTwoBit );
+    OstTrace1( TRACE_INTERNALS, HELLOTRACETYPES_SIGNEDINTEGERS_32, "32 bit signed: %d", thirtyTwoBit );
+    
+    _LIT(KText3, "Test %d .... : ");
+     OstTraceExt2( TRACE_INTERNALS, _TEST_D_EXT2, "Text: %S. My data = %d", KText3, thirtyTwoBit);
+  
 
     TInt64 sixtyFourBit = - (TInt64) 1 << 62; 
-    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_SIGNEDINTEGERS_64, 
-                  "64 bit signed: %Ld", sixtyFourBit );
+    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_SIGNEDINTEGERS_64, "64 bit signed: %Ld", sixtyFourBit );
     }
 
 void HelloTraceTypes::UnsignedIntegers()
     {
     TUint8  eightBit     = (TUint8)  1 << 6;
-    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_UNSIGNEDINTEGERS_8, 
-                  "8 bit unsigned: %hhu", eightBit );
+    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_UNSIGNEDINTEGERS_8, "8 bit unsigned: %hhu", eightBit );
+    
+    _LIT(KText1, "Test %hhu .... : ");
+    OstTraceExt2( TRACE_INTERNALS, _TEST_HHU_EXT2, "Text: %S. My data = %hhu", KText1, (TUint8)eightBit);
+
     
     TUint16 sixteenBit   = (TUint16) 1 << 14; 
-    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_UNSIGNEDINTEGERS_16, 
-                  "16 bit unsigned: %hu", sixteenBit );
+    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_UNSIGNEDINTEGERS_16, "16 bit unsigned: %hu", sixteenBit );
 
+    _LIT(KText2, "Test %hu .... : ");
+     OstTraceExt2( TRACE_INTERNALS, _TEST_HU_EXT2, "Text: %S. My data = %hu", KText2, (TUint16)sixteenBit);
+
+    
     TUint32 thirtyTwoBit = (TUint32) 1 << 30; 
-    OstTrace1( TRACE_INTERNALS, HELLOTRACETYPES_UNSIGNEDINTEGERS_32, 
-               "32 bit unsigned: %u", thirtyTwoBit );
+    OstTrace1( TRACE_INTERNALS, HELLOTRACETYPES_UNSIGNEDINTEGERS_32, "32 bit unsigned: %u", thirtyTwoBit );
 
+    _LIT(KText3, "Test %u .... : ");
+        OstTraceExt2( TRACE_INTERNALS, _TEST_U_EXT2, "Text: %S. My data = %u", KText3, thirtyTwoBit);
+        
     TUint64 sixtyFourBit = (TUint64) 1 << 62; 
-    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_UNSIGNEDINTEGERS_64, 
-                  "64 bit unsigned: %Lu", sixtyFourBit );
+    OstTraceExt1( TRACE_INTERNALS, HELLOTRACETYPES_UNSIGNEDINTEGERS_64, "64 bit unsigned: %Lu", sixtyFourBit );
     }
 
 void HelloTraceTypes::Descriptors()