201023
authorhgs
Mon, 14 Jun 2010 11:37:33 +0300
changeset 26 4fde310f06fe
parent 21 f5d4820de50d
child 30 86a2e675b80a
201023
hti/HtiCommPlugins/HtiBtCommPlugin/group/HtiBtSerialComHelper.mmp
hti/HtiFramework/inc/HtiDispatcher.h
hti/HtiFramework/inc/HtiMessage.h
hti/HtiFramework/inc/HtiMessageQueue.h
hti/HtiServicePlugins/HtiFtpServicePlugin/src/HtiFtpServicePlugin.cpp
hti/hti_plat/hti_api/inc/HtiVersion.h
memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanHeapBase.cpp
memspy/Engine/Source/Helpers/MemSpyEngineHelperHeap.cpp
memspy/Engine/Source/ThreadAndProcess/MemSpyEngineObjectThread.cpp
memspy/MemSpyClient/inc/memspyapiheap.h
memspy/MemSpyClient/inc/memspyapikernelobject.h
memspy/MemSpyClient/inc/memspyapikernelobjectitem.h
memspy/MemSpyClient/inc/memspyapithread.h
memspy/MemSpyClient/inc/memspyheapdata.h
memspy/MemSpyClient/inc/memspythreaddata.h
memspy/MemSpyClient/src/memspyapiheap.cpp
memspy/MemSpyClient/src/memspyapikernelobject.cpp
memspy/MemSpyClient/src/memspyapikernelobjectitem.cpp
memspy/MemSpyClient/src/memspyapithread.cpp
memspy/MemSpyServer/Include/MemSpyServer.h
memspy/MemSpyServer/Source/MemSpyServer.cpp
memspy/MemSpyServer/group/bld.inf
memspy/group/bld.inf
memspy/memspy_plat/memspy_api/include/memspy/driver/shared/MemSpyDriverObjectsSharedRHeap.h
memspy/memspy_plat/memspy_api/include/memspy/engine/Helpers/MemSpyEngineHelperHeap.h
memspy/memspy_plat/memspy_api/include/memspy/engine/Helpers/MemSpyEngineHelperKernelContainers.h
memspy/memspy_plat/memspy_api/include/memspy/engine/ThreadAndProcess/MemSpyEngineObjectThread.h
memspy/rom/memspy.iby
osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp
package_definition.xml
stif/ATSInterface/src/ATSInterface.cpp
stif/DemoModule/BMARM/DEMOMODULEU.DEF
stif/DemoModule/BMARM/Demomoduleu.def
stif/DemoModule/BWINS/DEMOMODULEU.DEF
stif/DemoModule/BWINS/Demomoduleu.def
stif/SUEvent/Bmarm/SUEventU.DEF
stif/SUEvent/Bmarm/SUEventu.def
stif/SUEvent/Bwins/SUEventU.DEF
stif/SUEvent/Bwins/SUEventu.def
stif/StifKernelTestClassBase/Bwins/STIFKERNELTESTCLASSBASEU.DEF
stif/StifKernelTestClassBase/Bwins/STIFKERNELTESTCLASSBASE_EKA1U.DEF
stif/StifKernelTestClassBase/Bwins/StifKernelTestClassBase_eka1u.def
stif/StifKernelTestClassBase/Bwins/StifKernelTestClassBaseu.def
stif/StifTFwIf/Bmarm/STIFTFWIFU.DEF
stif/StifTFwIf/Bmarm/StifTFwIfu.def
stif/StifTFwIf/Bwins/STIFTFWIFU.DEF
stif/StifTFwIf/Bwins/StifTFwIfu.def
stif/StifTFwIf/src/UIEngineContainer.cpp
stif/TestCombiner/Bmarm/TESTCOMBINERU.DEF
stif/TestCombiner/Bmarm/testcombineru.def
stif/TestCombiner/Bwins/TESTCOMBINERU.DEF
stif/TestCombiner/Bwins/testcombineru.def
stif/TestCombiner/inc/TestCase.h
stif/TestCombiner/inc/TestCombiner.h
stif/TestCombiner/inc/TestCombinerUtils.h
stif/TestCombiner/inc/TestKeywords.h
stif/TestCombiner/src/TestCase.cpp
stif/TestCombiner/src/TestCombiner.cpp
stif/TestCombiner/src/TestCombinerUtils.cpp
stif/TestCombiner/src/TestKeywords.cpp
stif/TestEngine/BMARM/STIFTESTENGINEU.DEF
stif/TestEngine/BMARM/StifTestEngineu.def
stif/TestEngine/BWINS/STIFTESTENGINEU.DEF
stif/TestEngine/BWINS/StifTestEngineu.def
stif/TestEngine/eabi/StifTestEngineu.def
stif/TestEngine/inc/TestCaseController.h
stif/TestEngine/inc/TestEngine.h
stif/TestEngine/inc/TestReport.h
stif/TestEngine/src/TestCaseController.cpp
stif/TestEngine/src/TestEngine.cpp
stif/TestEngine/src/TestEngineClient.cpp
stif/TestEngine/src/TestModuleController.cpp
stif/TestEngine/src/TestReport.cpp
stif/TestInterface/BMARM/STIFTESTINTERFACEU.DEF
stif/TestInterface/BMARM/StifTestInterfaceu.def
stif/TestInterface/BWINS/STIFTESTINTERFACEU.DEF
stif/TestInterface/BWINS/StifTestInterfaceu.def
stif/TestInterface/eabi/StifTestInterfaceu.def
stif/TestInterface/src/TestInterface.cpp
stif/TestInterface/src/TestModuleIf.cpp
stif/TestModuleTemplates/HardCodedTestModuleXXX/Bwins/HARDCODEDTESTMODULEXXXU.DEF
stif/TestModuleTemplates/HardCodedTestModuleXXX/Bwins/HardCodedTestModuleXXXu.def
stif/TestModuleTemplates/STIFUnitXXX/Bwins/STIFUNITXXXU.DEF
stif/TestModuleTemplates/STIFUnitXXX/Bwins/STIFUnitXXXu.def
stif/TestModuleTemplates/TemplateScriptXXX/Bwins/TEMPLATESCRIPTXXXU.DEF
stif/TestModuleTemplates/TemplateScriptXXX/Bwins/TemplateScriptXXXu.def
stif/TestModuleTemplates/TestModuleTemplates.zip
stif/TestModuleTemplates/TestModuleXXX/Bwins/TESTMODULEXXXU.DEF
stif/TestModuleTemplates/TestModuleXXX/Bwins/TestModuleXXXu.def
stif/TestScripter/Bmarm/TESTSCRIPTERU.DEF
stif/TestScripter/Bmarm/testscripteru.def
stif/TestScripter/Bwins/TESTSCRIPTERU.DEF
stif/TestScripter/Bwins/testscripteru.def
stif/TestServer/BMARM/STIFTESTSERVERU.DEF
stif/TestServer/BMARM/StifTestServeru.def
stif/TestServer/BWINS/STIFTESTSERVERU.DEF
stif/TestServer/BWINS/StifTestServeru.def
stif/TestServer/eabi/StifTestServeru.def
stif/TestServer/inc/TestServer.h
stif/TestServer/src/TestExecutionThread.cpp
stif/TestServer/src/TestModuleContainer.cpp
stif/TestServer/src/TestServerClient.cpp
stif/TestServer/src/Testexecution.cpp
stif/TestServer/src/Testserversession.cpp
stif/TestServerStarter/src/TestServerStarter.cpp
stif/examples/STIFTestMeasurementStub/Bwins/STIFTESTMEASUREMENTSTUBU.DEF
stif/examples/STIFTestMeasurementStub/Bwins/STIFTestMeasurementStubu.def
stif/examples/StifHWResetStub/BWINS/STIFHWRESETSTUBU.DEF
stif/examples/StifHWResetStub/BWINS/StifHWResetStubu.def
stif/group/ReleaseNote.txt
stif/inc/TestServerModuleIf.h
stif/inc/TestThreadContainer.h
stif/inc/version.h
stif/sis/Stif_31.sis
stif/stif_plat/inc/StifTestModule.h
stif/stif_plat/inc/TestEngineClient.h
stif/stif_plat/inc/TestServerClient.h
--- a/hti/HtiCommPlugins/HtiBtCommPlugin/group/HtiBtSerialComHelper.mmp	Tue May 25 18:01:01 2010 +0300
+++ b/hti/HtiCommPlugins/HtiBtCommPlugin/group/HtiBtSerialComHelper.mmp	Mon Jun 14 11:37:33 2010 +0300
@@ -39,7 +39,6 @@
 USERINCLUDE     ../BtEngine/inc
 OS_LAYER_SYSTEMINCLUDE
 
-LIBRARY         apparc.lib
 LIBRARY         bafl.lib
 LIBRARY         bluetooth.lib
 LIBRARY         btdevice.lib
@@ -47,7 +46,6 @@
 LIBRARY         btmanclient.lib
 LIBRARY         btpowercontrol.lib
 LIBRARY         c32.lib
-LIBRARY         cone.lib
 LIBRARY         efsrv.lib
 LIBRARY         esock.lib
 LIBRARY         euser.lib
--- a/hti/HtiFramework/inc/HtiDispatcher.h	Tue May 25 18:01:01 2010 +0300
+++ b/hti/HtiFramework/inc/HtiDispatcher.h	Mon Jun 14 11:37:33 2010 +0300
@@ -480,6 +480,12 @@
      * If the period is 0, reconnect would not happen.
      */
     TInt iReconnectDelay;
+    
+    /**
+     * Indicates reboot reason.
+     * Reason type is defined in enum RStarterSession::TResetReason value in starterclient.h
+     */
+    TInt iRebootReason;
     };
 
 
--- a/hti/HtiFramework/inc/HtiMessage.h	Tue May 25 18:01:01 2010 +0300
+++ b/hti/HtiFramework/inc/HtiMessage.h	Mon Jun 14 11:37:33 2010 +0300
@@ -28,7 +28,7 @@
 const TInt KHtiMsgServiceUidLen = 4;
 
 
-class CHtiMessage  : public CBase
+NONSHARABLE_CLASS(CHtiMessage)  : public CBase
     {
 public:
     /**
--- a/hti/HtiFramework/inc/HtiMessageQueue.h	Tue May 25 18:01:01 2010 +0300
+++ b/hti/HtiFramework/inc/HtiMessageQueue.h	Mon Jun 14 11:37:33 2010 +0300
@@ -23,7 +23,7 @@
 
 #include "HtiMessage.h"
 
-class CHtiMessageQueue  : public CBase
+NONSHARABLE_CLASS(CHtiMessageQueue)  : public CBase
     {
 public:
     /**
--- a/hti/HtiServicePlugins/HtiFtpServicePlugin/src/HtiFtpServicePlugin.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/hti/HtiServicePlugins/HtiFtpServicePlugin/src/HtiFtpServicePlugin.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -682,15 +682,33 @@
     TInt newNameLength = aMessage[newNamePos];
     GetFileNameL( aMessage.Mid( newNamePos, newNameLength + 1 ), aUnicode );
 
+    TInt msglen = aMessage.Length();
+    TInt recurse = 1;
+    if(msglen>originalLenngth+newNameLength+3)        
+        {
+        recurse = aMessage[newNamePos+1+newNameLength];
+        }
+    
+    TInt err=0;
     if ( IsFileTcb( origName ) || IsFileTcb( iFileName ) )
         {
         HandleTcbCopyL( origName, iFileName );
         }
     else{
         iHandlerAO = new ( ELeave ) CFtpHandlerAO( this );
-        TInt err = iFileMan->Copy( origName, iFileName,
+        
+        if (recurse)
+            {
+            err = iFileMan->Copy( origName, iFileName,
                 ( CFileMan::EOverWrite | CFileMan::ERecurse ),
                 iHandlerAO->iStatus );
+            }
+        else
+            {
+            err = iFileMan->Copy( origName, iFileName,
+                ( CFileMan::EOverWrite ),
+                iHandlerAO->iStatus );
+            }
 
         if ( err == KErrNone)
             {
--- a/hti/hti_plat/hti_api/inc/HtiVersion.h	Tue May 25 18:01:01 2010 +0300
+++ b/hti/hti_plat/hti_api/inc/HtiVersion.h	Mon Jun 14 11:37:33 2010 +0300
@@ -25,13 +25,13 @@
 // CONSTANTS
 
 const TUint8 KHtiVersionMajor = 2;
-const TUint8 KHtiVersionMinor = 23;
+const TUint8 KHtiVersionMinor = 24;
 const TUint8 KHtiVersionBuild = 0;
 
 const TUint16 KHtiVersionYear  = 2010;
 const TUint8  KHtiVersionMonth = 5;
-const TUint8  KHtiVersionWeek  = 19;
-const TUint8  KHtiVersionDay   = 14;
+const TUint8  KHtiVersionWeek  = 21;
+const TUint8  KHtiVersionDay   = 28;
 
 //  MACROS
 
--- a/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanHeapBase.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanHeapBase.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -905,7 +905,7 @@
         // Finalise construction of heap 
         if  ( kernelHeap != NULL )
             {
-            TRACE_KH( Kern::Printf( "DMemSpyDriverLogChanHeapBase::OpenKernelHeap - kernelHeap->Base(): 0x%08x, kernelHeapChunk->Base(): 0x%08x", kernelHeap->Base(), kernelHeapChunk->Base() ) );
+            //TRACE_KH( Kern::Printf( "DMemSpyDriverLogChanHeapBase::OpenKernelHeap - kernelHeap->Base(): 0x%08x, kernelHeapChunk->Base(): 0x%08x", kernelHeap->Base(), kernelHeapChunk->Base() ) );
             aHeap = kernelHeap;
             aChunk = kernelHeapChunk;
 
@@ -1017,7 +1017,7 @@
                 NKern::LockSystem();
                 const TUint32 copyLength = heapSize; // TODO Min( heap->Size(), heapSize );
 
-                TRACE_KH( Kern::Printf("DMemSpyDriverLogChanHeapBase::OpenKernelHeap(CP) - trying to copy %d (vs orig estimate of %d) bytes from kernel allocator address: 0x%08x", copyLength, heapSize, heap->Base() ));
+                //TRACE_KH( Kern::Printf("DMemSpyDriverLogChanHeapBase::OpenKernelHeap(CP) - trying to copy %d (vs orig estimate of %d) bytes from kernel allocator address: 0x%08x", copyLength, heapSize, heap->Base() ));
                 memcpy( (TUint8*) heapCopyChunkAddress, heap, copyLength );
 
                 NKern::UnlockSystem();
--- a/memspy/Engine/Source/Helpers/MemSpyEngineHelperHeap.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/memspy/Engine/Source/Helpers/MemSpyEngineHelperHeap.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -899,6 +899,55 @@
     }
 
 
+//cigasto: not formatted - raw heap info 
+EXPORT_C TMemSpyHeapData CMemSpyEngineHelperHeap::NewHeapRawInfo( const TMemSpyHeapInfo& aInfo )
+	{
+	TMemSpyHeapData list;
+
+	// Heap type	
+	if ( aInfo.Type() == TMemSpyHeapInfo::ETypeUnknown )
+		{
+		_LIT( KItem0_Type_Unknown, "Unknown" );
+		list.iType.Append( KItem0_Type_Unknown );
+		}
+	else if ( aInfo.Type() == TMemSpyHeapInfo::ETypeRHeap )
+		{
+		const TMemSpyHeapInfoRHeap& rHeap = aInfo.AsRHeap();
+		const TMemSpyHeapMetaDataRHeap& metaData = rHeap.MetaData();
+		const TMemSpyHeapObjectDataRHeap& objectData = rHeap.ObjectData();
+		const TMemSpyHeapStatisticsRHeap& statistics = rHeap.Statistics();
+
+		_LIT( KItem0_Type_RHeap, "RHeap" );
+		list.iType.Append( KItem0_Type_RHeap );
+
+	    // Heap size is the size of the heap minus the size of the embedded (in-place) RHeap. 	    
+	    list.iSize = objectData.Size();
+	    list.iBaseAddress = (TUint) objectData.Base();	        
+	    list.iShared = metaData.IsSharedHeap();
+	    list.iChunkSize = metaData.ChunkSize();
+	    list.iAllocationsCount = statistics.StatsAllocated().TypeCount();
+	    list.iFreeCount = statistics.StatsFree().TypeCount();
+	    list.iBiggestAllocation = statistics.StatsAllocated().LargestCellSize();
+	    list.iBiggestFree = statistics.StatsFree().LargestCellSize();
+	    list.iTotalAllocations =  statistics.StatsAllocated().TypeSize();	        
+	    list.iTotalFree =  statistics.StatsFree().TypeSize();
+	    list.iSlackFreeSpace = statistics.StatsFree().SlackSpaceCellSize();
+	    list.iFragmentation = statistics.StatsFree().TypeSize() - statistics.StatsFree().SlackSpaceCellSize(); //to calculate percentage value use iSize as 100% value
+	    list.iHeaderSizeA = metaData.HeaderSizeAllocated();
+	    list.iHeaderSizeF = metaData.HeaderSizeFree();
+	    TInt allocOverhead = metaData.HeaderSizeAllocated() * statistics.StatsAllocated().TypeCount();
+	    list.iAllocationOverhead = allocOverhead;
+	    TInt freeOverhead = metaData.HeaderSizeFree() * statistics.StatsFree().TypeCount();
+	    list.iFreeOverhead = freeOverhead;
+	    list.iTotalOverhead = freeOverhead + allocOverhead;
+	    list.iOverhead = freeOverhead + allocOverhead; //to calculate percentage value use iSize as 100% value    
+	    list.iMinLength = objectData.iMinLength;
+	    list.iMaxLength = objectData.iMaxLength;
+	    list.iDebugAllocatorLibrary = metaData.IsDebugAllocator();
+		}
+
+	return list;
+	}
 
 
 
--- a/memspy/Engine/Source/ThreadAndProcess/MemSpyEngineObjectThread.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/memspy/Engine/Source/ThreadAndProcess/MemSpyEngineObjectThread.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -387,6 +387,11 @@
     return  isDead;
     }
 
+EXPORT_C TThreadPriority CMemSpyThread::Priority() const
+	{
+	return iPriority;
+	}
+
 
 void CMemSpyThread::RefreshL()
     {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyClient/inc/memspyapiheap.h	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,69 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Contains the declaration of  CMemSpyApiHeap class 
+*/
+
+#ifndef MEMSPYAPIHEAP_H
+#define MEMSPYAPIHEAP_H
+
+// System includes
+#include <e32base.h>
+
+class TMemSpyHeapData;
+
+NONSHARABLE_CLASS( CMemSpyApiHeap ) 
+	{
+public:
+	IMPORT_C ~CMemSpyApiHeap();
+	
+	static CMemSpyApiHeap* NewL(const TMemSpyHeapData& aData);
+
+	static CMemSpyApiHeap* NewLC(const TMemSpyHeapData& aData);
+	
+public: //API
+	IMPORT_C TDesC& Type();
+	IMPORT_C TInt Size();
+	IMPORT_C TInt BaseAddress();
+	IMPORT_C TBool Shared();
+	IMPORT_C TInt ChunkSize();
+	IMPORT_C TInt AllocationsCount();
+	IMPORT_C TInt FreeCount();
+	IMPORT_C TInt BiggestAllocation();
+	IMPORT_C TInt BiggestFree();
+	IMPORT_C TInt TotalAllocations();
+	IMPORT_C TInt TotalFree();
+	IMPORT_C TInt SlackFreeSpace();
+	IMPORT_C TInt Fragmentation(); // Percentage value, iSize is 100% - value for calculation
+	IMPORT_C TInt HeaderSizeA();
+	IMPORT_C TInt HeaderSizeF();
+	IMPORT_C TInt AllocationOverhead();
+	IMPORT_C TInt FreeOverhead();
+	IMPORT_C TInt TotalOverhead();
+	IMPORT_C TInt Overhead(); //Percentage value, iSize is 100% - value for calculation
+	IMPORT_C TInt MinLength();
+	IMPORT_C TInt MaxLength();
+	IMPORT_C TBool DebugAllocatorLibrary();
+	
+private:
+	CMemSpyApiHeap();
+	
+	void ConstructL(const TMemSpyHeapData& aData);
+		
+private:
+	TMemSpyHeapData *iHeapData;
+};
+
+	
+#endif // MEMSPYAPIHEAP_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyClient/inc/memspyapikernelobject.h	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,56 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*  
+*/
+
+#ifndef MEMSPYAPIPKERNELOBJECT_H
+#define MEMSPYAPIPKERNELOBJECT_H
+
+// System includes
+#include <e32base.h>
+
+#include <memspy/driver/memspydriverenumerationsshared.h>
+
+class TMemSpyKernelObjectData;
+
+NONSHARABLE_CLASS( CMemSpyApiKernelObject ) 
+	{
+public:
+	IMPORT_C ~CMemSpyApiKernelObject();
+	
+	static CMemSpyApiKernelObject* NewL(const TMemSpyKernelObjectData& aData);
+
+	static CMemSpyApiKernelObject* NewLC(const TMemSpyKernelObjectData& aData);
+	
+public:
+	IMPORT_C TMemSpyDriverContainerType Type() const;
+	
+	IMPORT_C const TDesC& Name() const;	
+						
+	IMPORT_C TInt Count() const;
+		
+	IMPORT_C TInt64 Size() const;
+	
+private:
+	CMemSpyApiKernelObject();
+	
+	void ConstructL(const TMemSpyKernelObjectData& aData);
+		
+private:
+	TMemSpyKernelObjectData *iKernelObjectData;
+};
+
+	
+#endif // MEMSPYAPIPKERNELOBJECT_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyClient/inc/memspyapikernelobjectitem.h	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,128 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Contains the declaration of  CMemSpyProcess class 
+*/
+
+#ifndef MEMSPYAPIKERNELOBJECTITEM_H
+#define MEMSPYAPIKERNELOBJECTITEM_H
+
+// System includes
+#include <e32base.h>
+#include <memspy/driver/memspydriverenumerationsshared.h>
+
+class TMemSpyDriverHandleInfoGeneric;
+//class TMemSpyDriverContainerType;	
+//class TMemSpyDriverTimerType;
+//class TMemSpyDriverTimerState;
+
+NONSHARABLE_CLASS( CMemSpyApiKernelObjectItem ) 
+	{
+public:
+	IMPORT_C ~CMemSpyApiKernelObjectItem();
+	
+	static CMemSpyApiKernelObjectItem* NewL(const TMemSpyDriverHandleInfoGeneric& aData);
+
+	static CMemSpyApiKernelObjectItem* NewLC(const TMemSpyDriverHandleInfoGeneric& aData);
+	
+public:	
+	
+	IMPORT_C const TDesC8& Name() const;	
+	
+	IMPORT_C TAny* Handle() const;
+	
+	IMPORT_C TMemSpyDriverContainerType Type() const;
+	
+    // For Process, thread, chunk (owning process id), server (owning thread id)
+    IMPORT_C TInt Id() const;
+
+    // For Chunk, Library
+    IMPORT_C TUint32 Size() const;
+   
+    // For Semaphore, Mutex, Server
+    IMPORT_C TInt Count() const;
+
+    // For Mutex
+    IMPORT_C TInt WaitCount() const;
+
+    // For Server, Session
+    IMPORT_C TIpcSessionType SessionType() const;
+
+    // For Timer
+    IMPORT_C TMemSpyDriverTimerType TimerType() const;
+    IMPORT_C TMemSpyDriverTimerState TimerState() const;
+
+    // For Logical channel
+    IMPORT_C TInt OpenChannels();
+    
+    // For most of the object types
+    IMPORT_C const TDesC8& NameDetail() const; // Name
+    IMPORT_C TInt AccessCount() const;
+    IMPORT_C TInt UniqueID() const;
+    IMPORT_C TUint Protection() const;
+    IMPORT_C TUint8* AddressOfKernelOwner();
+    IMPORT_C TInt Priority() const;
+    IMPORT_C TUint8* AddressOfOwningProcess();
+    IMPORT_C TUint CreatorId() const;
+    IMPORT_C TUint SecurityZone() const;
+    IMPORT_C TInt Attributes() const;
+    IMPORT_C TUint8* AddressOfDataBssStackChunk();
+
+    // For Server, Session
+    IMPORT_C TUint8* AddressOfOwningThread();
+    IMPORT_C TUint8* AddressOfServer();
+    IMPORT_C TUint16 TotalAccessCount() const;
+    IMPORT_C TUint8 SvrSessionType() const;
+    IMPORT_C TInt MsgCount() const;
+    IMPORT_C TInt MsgLimit() const;
+    
+    // For chunk
+    IMPORT_C TInt MaxSize() const;
+    IMPORT_C TInt Bottom() const;
+    IMPORT_C TInt Top() const;
+    IMPORT_C TInt StartPos() const;
+    IMPORT_C TUint ControllingOwner() const;
+    IMPORT_C TUint Restrictions() const;
+    IMPORT_C TUint MapAttr() const;
+    IMPORT_C TUint ChunkType() const;
+    IMPORT_C const TDesC8& NameOfOwner() const; // chunk, server
+    
+    // For library
+    IMPORT_C TInt MapCount() const;
+    IMPORT_C TUint8 State() const;
+    IMPORT_C TUint8* AddressOfCodeSeg();
+    
+    // Semaphore, mutex, condvar
+    IMPORT_C TUint8 Resetting() const;
+    IMPORT_C TUint8 Order() const;
+    
+    // For Logical/Physical device
+    IMPORT_C TVersion Version() const;
+    IMPORT_C TUint ParseMask() const;
+    IMPORT_C TUint UnitsMask() const;
+    
+    // For change notifier
+    IMPORT_C TUint Changes() const;
+	
+private:
+	CMemSpyApiKernelObjectItem();
+	
+	void ConstructL(const TMemSpyDriverHandleInfoGeneric& aData);
+		
+private:
+	TMemSpyDriverHandleInfoGeneric *iItem;
+};
+
+	
+#endif // MEMSPYAPIKERNELOBJECTITEM_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyClient/inc/memspyapithread.h	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,73 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Contains the declaration of  CMemSpyProcessWrapper class and TMemSpyProcess data class
+*/
+
+#ifndef MEMSPYAPITHREAD_H
+#define MEMSPYAPITHREAD_H
+
+// System includes
+#include <e32base.h>
+
+class TMemSpyThreadData;
+
+NONSHARABLE_CLASS( CMemSpyApiThread ) {
+
+public:
+	IMPORT_C ~CMemSpyApiThread();
+	
+	static CMemSpyApiThread* NewL(const TMemSpyThreadData& aData);
+
+	static CMemSpyApiThread* NewLC(const TMemSpyThreadData& aData);
+
+public:
+	IMPORT_C TThreadId Id() const;
+	IMPORT_C TProcessId ProcessId() const;
+	
+	IMPORT_C const TDesC& Name() const;
+		
+	IMPORT_C TInt SID() const;
+	
+	IMPORT_C TInt VID() const;
+	
+	IMPORT_C TThreadPriority ThreadPriority() const;
+	
+	IMPORT_C TProcessPriority ProcessPriority() const;
+	
+	IMPORT_C TInt RequestCount() const;
+	
+	IMPORT_C TInt ThreadHandles() const;
+	
+	IMPORT_C TInt ProcessHandles() const;
+	
+	IMPORT_C TInt ThreadNumberUsing() const;
+	
+	IMPORT_C TInt ProcessNumberUsing() const;
+	
+	IMPORT_C TInt Attributes() const;
+	
+	IMPORT_C TInt CpuUse() const;
+	
+	IMPORT_C TExitType ExitType() const;
+	
+private:
+	CMemSpyApiThread();	
+	
+	void ConstructL(const TMemSpyThreadData& aData);
+private:
+	TMemSpyThreadData* iThreadData;
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyClient/inc/memspyheapdata.h	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,64 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Contains the declaration of  TMemSpyProcessData class
+*/
+
+#ifndef MEMSPYHEAPDATA_H
+#define MEMSPYHEAPDATA_H
+
+#include <memspy/driver/memspydriverobjectsshared.h>
+
+// Constants
+const TInt KBuf = 16;
+
+// TMemSpyProcess data class holds data to be sent to the UI
+class TMemSpyHeapData 
+	{	
+public:
+	//constructor & destructor
+	inline TMemSpyHeapData()		
+	: iSize(0), iBaseAddress(0), iShared(EFalse), iChunkSize(0),
+	iAllocationsCount(0), iFreeCount(0), iBiggestAllocation(0), iBiggestFree(0), iTotalAllocations(0),
+    iTotalFree(0), iSlackFreeSpace(0), iFragmentation(0), iHeaderSizeA(0), iHeaderSizeF(0), iAllocationOverhead(0),
+    iFreeOverhead(0), iTotalOverhead(0), iOverhead(0), iMinLength(0), iMaxLength(0), iDebugAllocatorLibrary(EFalse)
+		{
+		}
+	
+public:
+	TBuf<KBuf> iType;
+	TUint iSize;
+	TUint8 iBaseAddress;
+	TBool iShared;
+	TUint iChunkSize;
+	TUint iAllocationsCount;
+	TUint iFreeCount;
+	TUint iBiggestAllocation;
+	TUint iBiggestFree;
+    TUint iTotalAllocations;
+    TUint iTotalFree;
+    TUint iSlackFreeSpace;
+    TReal iFragmentation;
+    TUint iHeaderSizeA;
+    TUint iHeaderSizeF;
+    TUint iAllocationOverhead;
+    TUint iFreeOverhead;
+    TUint iTotalOverhead;
+    TReal iOverhead;
+    TInt iMinLength;
+    TInt iMaxLength;
+    TBool iDebugAllocatorLibrary;
+	};
+
+#endif // MEMSPYHEAPDATA_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyClient/inc/memspythreaddata.h	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,50 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef MEMSPYTHREADDATA_H
+#define MEMSPYTHREADDATA_H
+
+//#include <kernel/arm/arm_types.h>
+
+class TMemSpyThreadData {
+public:
+	TMemSpyThreadData()
+	: iId(0), iPid(0), iSID(0), iVID(0), iRequestCount(0), iThreadHandles(0), iProcessHandles(0), iThreadNumberUsing(0), 
+	  iProcessNumberUsing(0), iAttributes(0), iCpuUse(0)
+		{
+		}
+	
+public:
+    TThreadId iId;
+    TProcessId iPid;    
+    TFullName iName;    //name without formatting. Formatting to be moved to the Avkon UI part
+    TInt iSID;
+    TInt iVID;
+    TThreadPriority iThreadPriority;
+    TProcessPriority iProcessPriority;
+    TInt iRequestCount;
+    TInt iThreadHandles;
+    TInt iProcessHandles;
+    TInt iThreadNumberUsing;
+    TInt iProcessNumberUsing;
+    TInt iAttributes;
+    TInt iCpuUse;        
+    TExitType iExitType;
+    RArray<TUint> iRegisters; //containts register contents of the thread (R00-R12, SP, LR, PC, Flags & DACR) - TUint for formating to HEX    
+};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyClient/src/memspyapiheap.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,162 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <memspy/api/memspyapiheap.h>
+#include <memspy/engine/memspyengine.h>
+#include <memspy/engine/memspyheapdata.h>
+
+
+CMemSpyApiHeap::CMemSpyApiHeap() 
+	: iHeapData(0)
+	{
+	}
+
+EXPORT_C CMemSpyApiHeap::~CMemSpyApiHeap()
+	{
+	delete iHeapData;
+	}
+
+void CMemSpyApiHeap::ConstructL(const TMemSpyHeapData& aData)
+	{
+	iHeapData = new (ELeave) TMemSpyHeapData(aData);
+	}
+
+CMemSpyApiHeap* CMemSpyApiHeap::NewL(const TMemSpyHeapData& aData)
+	{
+	CMemSpyApiHeap* self = CMemSpyApiHeap::NewLC(aData);
+	CleanupStack::Pop(self);
+	return (self);
+	}
+
+CMemSpyApiHeap* CMemSpyApiHeap::NewLC(const TMemSpyHeapData& aData)
+	{
+	CMemSpyApiHeap* self = new (ELeave) CMemSpyApiHeap;
+	CleanupStack::PushL(self);
+	self->ConstructL(aData);
+	return (self);
+	}
+
+//api methods
+EXPORT_C TDesC& CMemSpyApiHeap::Type()
+	{
+	return iHeapData->iType;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::Size()
+	{
+	return iHeapData->iSize;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::BaseAddress()
+	{
+	return iHeapData->iBaseAddress;
+	}
+
+EXPORT_C TBool CMemSpyApiHeap::Shared()
+	{
+	return iHeapData->iShared;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::ChunkSize()
+	{
+	return iHeapData->iChunkSize;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::AllocationsCount()
+	{
+	return iHeapData->iAllocationsCount;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::FreeCount()
+	{
+	return iHeapData->iFreeCount;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::BiggestAllocation()
+	{
+	return iHeapData->iBiggestAllocation;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::BiggestFree()
+	{
+	return iHeapData->iBiggestFree;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::TotalAllocations()
+	{
+	return iHeapData->iTotalAllocations;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::TotalFree()
+	{
+	return iHeapData->iTotalFree;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::SlackFreeSpace()
+	{
+	return iHeapData->iSlackFreeSpace;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::Fragmentation()
+	{
+	return iHeapData->iFragmentation;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::HeaderSizeA()
+	{
+	return iHeapData->iHeaderSizeA;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::HeaderSizeF()
+	{
+	return iHeapData->iHeaderSizeF;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::AllocationOverhead()
+	{
+	return iHeapData->iAllocationOverhead;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::FreeOverhead()
+	{
+	return iHeapData->iFreeOverhead;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::TotalOverhead()
+	{
+	return iHeapData->iTotalOverhead;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::Overhead()
+	{
+	return iHeapData->iOverhead;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::MinLength()
+	{
+	return iHeapData->iMinLength;
+	}
+
+EXPORT_C TInt CMemSpyApiHeap::MaxLength()
+	{
+	return iHeapData->iMaxLength;
+	}
+
+EXPORT_C TBool CMemSpyApiHeap::DebugAllocatorLibrary()
+	{
+	return iHeapData->iDebugAllocatorLibrary;
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyClient/src/memspyapikernelobject.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,72 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <memspy/api/memspyapikernelobject.h>
+#include <memspy/engine/memspykernelobjectdata.h>
+//#include <memspy/engine/memspyengineobjectprocess.h>
+//#include <memspy/engine/memspyengineobjectcontainer.h>
+
+
+EXPORT_C CMemSpyApiKernelObject::~CMemSpyApiKernelObject()
+	{
+	delete iKernelObjectData;
+	}
+
+
+CMemSpyApiKernelObject::CMemSpyApiKernelObject() : iKernelObjectData(0)
+	{
+	}
+
+CMemSpyApiKernelObject* CMemSpyApiKernelObject::NewL(const TMemSpyKernelObjectData& aData)
+	{
+	CMemSpyApiKernelObject* self = CMemSpyApiKernelObject::NewLC(aData);
+	CleanupStack::Pop(self);
+	return (self);
+	}
+
+CMemSpyApiKernelObject* CMemSpyApiKernelObject::NewLC(const TMemSpyKernelObjectData& aData)
+	{
+	CMemSpyApiKernelObject* self = new (ELeave) CMemSpyApiKernelObject;
+	CleanupStack::PushL(self);
+	self->ConstructL(aData);
+	return (self);
+	}
+
+void CMemSpyApiKernelObject::ConstructL(const TMemSpyKernelObjectData& aData)
+	{
+	iKernelObjectData = new (ELeave) TMemSpyKernelObjectData(aData);
+	}
+
+EXPORT_C TMemSpyDriverContainerType CMemSpyApiKernelObject::Type() const
+	{
+	return iKernelObjectData->iType;
+	}
+
+EXPORT_C const TDesC& CMemSpyApiKernelObject::Name() const
+	{
+	return iKernelObjectData->iName;
+	}
+					
+EXPORT_C TInt CMemSpyApiKernelObject::Count() const
+	{
+	return iKernelObjectData->iCount;
+	}
+	
+EXPORT_C TInt64 CMemSpyApiKernelObject::Size() const
+	{
+	return iKernelObjectData->iSize;
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyClient/src/memspyapikernelobjectitem.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,309 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <memspy/api/memspyapikernelobjectitem.h>
+#include <memspy/driver/memspydriverobjectsshared.h>
+
+EXPORT_C CMemSpyApiKernelObjectItem::~CMemSpyApiKernelObjectItem()
+	{
+	delete iItem;
+	}
+
+
+CMemSpyApiKernelObjectItem::CMemSpyApiKernelObjectItem() : iItem(0)
+	{
+	}
+
+CMemSpyApiKernelObjectItem* CMemSpyApiKernelObjectItem::NewL(const TMemSpyDriverHandleInfoGeneric& aData)
+	{
+	CMemSpyApiKernelObjectItem* self = CMemSpyApiKernelObjectItem::NewLC(aData);
+	CleanupStack::Pop(self);
+	return (self);
+	}
+
+CMemSpyApiKernelObjectItem* CMemSpyApiKernelObjectItem::NewLC(const TMemSpyDriverHandleInfoGeneric& aData)
+	{
+	CMemSpyApiKernelObjectItem* self = new (ELeave) CMemSpyApiKernelObjectItem;
+	CleanupStack::PushL(self);
+	self->ConstructL(aData);
+	return (self);
+	}
+
+void CMemSpyApiKernelObjectItem::ConstructL(const TMemSpyDriverHandleInfoGeneric& aData)
+	{
+	iItem = new (ELeave) TMemSpyDriverHandleInfoGeneric(aData);
+	}
+
+EXPORT_C const TDesC8& CMemSpyApiKernelObjectItem::Name() const
+	{
+	/*
+	TBuf<KMaxName> ret;	
+	ret.Copy( iItem->iName );
+	return ret;
+	*/
+	return iItem->iName;
+	}
+
+EXPORT_C TAny* CMemSpyApiKernelObjectItem::Handle() const
+	{	
+	return iItem->iHandle;
+	}
+
+EXPORT_C TMemSpyDriverContainerType CMemSpyApiKernelObjectItem::Type() const
+	{
+	return iItem->iType;
+	}
+
+// For Process, thread, chunk (owning process id), server (owning thread id)
+EXPORT_C TInt CMemSpyApiKernelObjectItem::Id() const
+	{
+	return iItem->iId;
+	}
+
+// For Chunk, Library
+EXPORT_C TUint32 CMemSpyApiKernelObjectItem::Size() const
+	{
+	return iItem->iSize;
+	}
+
+// For Semaphore, Mutex, Server
+EXPORT_C TInt CMemSpyApiKernelObjectItem::Count() const
+	{
+	return iItem->iCount;
+	}
+
+// For Mutex
+EXPORT_C TInt CMemSpyApiKernelObjectItem::WaitCount() const
+	{
+	return iItem->iWaitCount;
+	}
+
+// For Server, Session
+EXPORT_C TIpcSessionType CMemSpyApiKernelObjectItem::SessionType() const
+	{
+	return iItem->iSessionType;
+	}
+
+// For Timer
+EXPORT_C TMemSpyDriverTimerType CMemSpyApiKernelObjectItem::TimerType() const
+	{
+	return iItem->iTimerType;
+	}
+
+EXPORT_C TMemSpyDriverTimerState CMemSpyApiKernelObjectItem::TimerState() const
+	{
+	return iItem->iTimerState;
+	}
+
+// For Logical channel
+EXPORT_C TInt CMemSpyApiKernelObjectItem::OpenChannels()
+	{
+	return iItem->iOpenChannels;
+	}
+
+// For most of the object types
+EXPORT_C const TDesC8& CMemSpyApiKernelObjectItem::NameDetail() const
+	{
+	/*
+	TBuf<KMaxName> ret;
+	ret.Copy( iItem->iNameDetail );
+	return ret;
+	*/
+	return iItem->iNameDetail;
+	}
+
+EXPORT_C TInt CMemSpyApiKernelObjectItem::AccessCount() const
+	{
+	return iItem->iAccessCount;
+	}
+
+EXPORT_C TInt CMemSpyApiKernelObjectItem::UniqueID() const
+	{
+	return iItem->iUniqueID;
+	}
+
+EXPORT_C TUint CMemSpyApiKernelObjectItem::Protection() const
+	{
+	return iItem->iProtection;
+	}
+		
+EXPORT_C TUint8* CMemSpyApiKernelObjectItem::AddressOfKernelOwner()
+	{
+	return iItem->iAddressOfKernelOwner;
+	}
+
+EXPORT_C TInt CMemSpyApiKernelObjectItem::Priority() const
+	{
+	return iItem->iPriority;
+	}
+
+EXPORT_C TUint8* CMemSpyApiKernelObjectItem::AddressOfOwningProcess()
+	{
+	return iItem->iAddressOfOwningProcess;
+	}
+
+EXPORT_C TUint CMemSpyApiKernelObjectItem::CreatorId() const
+	{
+	return iItem->iCreatorId;
+	}
+
+EXPORT_C TUint CMemSpyApiKernelObjectItem::SecurityZone() const
+	{
+	return iItem->iSecurityZone;
+	}
+
+EXPORT_C TInt CMemSpyApiKernelObjectItem::Attributes() const
+	{
+	return iItem->iAttributes;
+	}
+
+EXPORT_C TUint8* CMemSpyApiKernelObjectItem::AddressOfDataBssStackChunk()
+	{
+	return iItem->iAddressOfDataBssStackChunk;
+	}
+
+// For Server, Session
+EXPORT_C TUint8* CMemSpyApiKernelObjectItem::AddressOfOwningThread()
+	{
+	return iItem->iAddressOfOwningThread;
+	}
+
+EXPORT_C TUint8* CMemSpyApiKernelObjectItem::AddressOfServer()
+	{
+	return iItem->iAddressOfServer;
+	}
+
+EXPORT_C TUint16 CMemSpyApiKernelObjectItem::TotalAccessCount() const
+	{
+	return iItem->iTotalAccessCount;
+	}
+
+EXPORT_C TUint8 CMemSpyApiKernelObjectItem::SvrSessionType() const
+	{
+	return iItem->iSvrSessionType;
+	}
+
+EXPORT_C TInt CMemSpyApiKernelObjectItem::MsgCount() const
+	{
+	return iItem->iMsgCount;
+	}
+
+EXPORT_C TInt CMemSpyApiKernelObjectItem::MsgLimit() const
+	{
+	return iItem->iMsgLimit;
+	}
+
+// For chunk
+EXPORT_C TInt CMemSpyApiKernelObjectItem::MaxSize() const
+	{
+	return iItem->iMaxSize;
+	}
+
+EXPORT_C TInt CMemSpyApiKernelObjectItem::Bottom() const
+	{
+	return iItem->iBottom;
+	}
+
+EXPORT_C TInt CMemSpyApiKernelObjectItem::Top() const
+	{
+	return iItem->iTop;
+	}
+
+EXPORT_C TInt CMemSpyApiKernelObjectItem::StartPos() const
+	{
+	return iItem->iStartPos;
+	}
+
+EXPORT_C TUint CMemSpyApiKernelObjectItem::ControllingOwner() const
+	{
+	return iItem->iControllingOwner;
+	}
+
+EXPORT_C TUint CMemSpyApiKernelObjectItem::Restrictions() const
+	{
+	return iItem->iRestrictions;
+	}
+
+EXPORT_C TUint CMemSpyApiKernelObjectItem::MapAttr() const
+	{
+	return iItem->iMapAttr;
+	}
+
+EXPORT_C TUint CMemSpyApiKernelObjectItem::ChunkType() const
+	{
+	return iItem->iChunkType;
+	}
+
+EXPORT_C const TDesC8& CMemSpyApiKernelObjectItem::NameOfOwner() const
+	{
+	/*
+	TBuf<KMaxName> ret;
+	ret.Copy( iItem->iNameOfOwner );
+	return ret;
+	*/
+	return iItem->iNameOfOwner;
+	}
+
+// For library
+EXPORT_C TInt CMemSpyApiKernelObjectItem::MapCount() const
+	{
+	return iItem->iMapCount;
+	}
+
+EXPORT_C TUint8 CMemSpyApiKernelObjectItem::State() const
+	{
+	return iItem->iState;
+	}
+
+EXPORT_C TUint8* CMemSpyApiKernelObjectItem::AddressOfCodeSeg()
+	{
+	return iItem->iAddressOfCodeSeg;
+	}
+
+// Semaphore, mutex, condvar
+EXPORT_C TUint8 CMemSpyApiKernelObjectItem::Resetting() const
+	{
+	return iItem->iResetting;
+	}
+
+EXPORT_C TUint8 CMemSpyApiKernelObjectItem::Order() const
+	{
+	return iItem->iOrder;
+	}
+
+// For Logical/Physical device
+EXPORT_C TVersion CMemSpyApiKernelObjectItem::Version() const
+	{
+	return iItem->iVersion;
+	}
+
+EXPORT_C TUint CMemSpyApiKernelObjectItem::ParseMask() const
+	{
+	return iItem->iParseMask;	
+	}
+
+EXPORT_C TUint CMemSpyApiKernelObjectItem::UnitsMask() const
+	{
+	return iItem->iUnitsMask;
+	}
+
+// For change notifier
+EXPORT_C TUint CMemSpyApiKernelObjectItem::Changes() const
+	{
+	return iItem->iChanges;
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyClient/src/memspyapithread.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,125 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <memspy/api/memspyapithread.h>
+#include <memspy/engine/memspythreaddata.h>
+
+
+EXPORT_C CMemSpyApiThread::~CMemSpyApiThread()
+	{
+	delete iThreadData;
+	}
+
+EXPORT_C TThreadId CMemSpyApiThread::Id() const
+	{
+	return iThreadData->iId;
+	}
+
+EXPORT_C TProcessId CMemSpyApiThread::ProcessId() const
+	{
+	return iThreadData->iPid;
+	}
+
+EXPORT_C const TDesC& CMemSpyApiThread::Name() const
+	{
+	return iThreadData->iName;
+	}
+
+EXPORT_C TInt CMemSpyApiThread::SID() const
+	{
+	return iThreadData->iSID;
+	}
+
+
+EXPORT_C TInt CMemSpyApiThread::VID() const
+	{
+	return iThreadData->iVID;
+	}
+
+EXPORT_C TThreadPriority CMemSpyApiThread::ThreadPriority() const
+	{
+	return iThreadData->iThreadPriority;
+	}
+
+EXPORT_C TProcessPriority CMemSpyApiThread::ProcessPriority() const
+	{
+	return iThreadData->iProcessPriority;
+	}
+
+EXPORT_C TInt CMemSpyApiThread::RequestCount() const
+	{
+	return iThreadData->iRequestCount;
+	}
+
+EXPORT_C TInt CMemSpyApiThread::ThreadHandles() const
+	{
+	return iThreadData->iThreadHandles;
+	}
+
+EXPORT_C TInt CMemSpyApiThread::ProcessHandles() const
+	{
+	return iThreadData->iProcessHandles;
+	}
+
+EXPORT_C TInt CMemSpyApiThread::ThreadNumberUsing() const
+	{
+	return iThreadData->iThreadNumberUsing;
+	}
+
+EXPORT_C TInt CMemSpyApiThread::ProcessNumberUsing() const
+	{
+	return iThreadData->iProcessNumberUsing;
+	}
+
+EXPORT_C TInt CMemSpyApiThread::Attributes() const
+	{
+	return iThreadData->iAttributes;
+	}
+
+EXPORT_C TInt CMemSpyApiThread::CpuUse() const
+	{
+	return iThreadData->iCpuUse;
+	}
+
+EXPORT_C TExitType CMemSpyApiThread::ExitType() const
+	{
+	return iThreadData->iExitType;
+	}
+
+CMemSpyApiThread::CMemSpyApiThread() : iThreadData(0)
+	{
+	}
+
+void CMemSpyApiThread::ConstructL(const TMemSpyThreadData& aData)
+	{
+	iThreadData = new (ELeave) TMemSpyThreadData(aData);
+	}
+
+CMemSpyApiThread* CMemSpyApiThread::NewL(const TMemSpyThreadData& aData)
+	{
+	CMemSpyApiThread* self = CMemSpyApiThread::NewLC(aData);
+	CleanupStack::Pop(self);
+	return (self);
+	}
+
+CMemSpyApiThread* CMemSpyApiThread::NewLC(const TMemSpyThreadData& aData)
+	{
+	CMemSpyApiThread* self = new (ELeave) CMemSpyApiThread;
+	CleanupStack::PushL(self);
+	self->ConstructL(aData);
+	return (self);
+	}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyServer/Include/MemSpyServer.h	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,57 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* MemSpyServer headder file to declare MemSpyServer class
+*
+*/
+
+#ifndef MEMSPYSERVER_H
+#define MEMSPYSERVER_H
+
+// System includes
+#include <e32base.h>
+
+#include <flogger.h>
+
+// User includes
+#include <memspyengineclientinterface.h>
+
+// Classes referenced
+class CMemSpyEngine;
+
+// Literal constants 
+//_LIT( KMemSpyServer2, "MemSpyServer.exe" );
+
+// MemSpyServer class declaration
+NONSHARABLE_CLASS( CMemSpyServer ) : public CServer2
+    {
+    public:
+        static CMemSpyServer* NewL( CMemSpyEngine& aEngine );
+        static CMemSpyServer* NewLC( CMemSpyEngine& aEngine );
+        ~CMemSpyServer();
+
+    private:
+        CMemSpyServer( CMemSpyEngine& aEngine );
+    	void ConstructL();
+
+    protected: // From CServer2
+    	CSession2* NewSessionL(const TVersion& aVersion, const RMessage2& aMessage) const;
+
+    private:
+        CMemSpyEngine& iEngine;
+        
+        RFileLogger iLog;
+    };
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyServer/Source/MemSpyServer.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,124 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Implementation of the new MemSpyServer
+*/
+
+//user includes
+#include "MemSpyServer.h"
+#include "MemSpyServerSession.h"
+
+// System includes
+#include <e32svr.h>
+
+// User includes
+#include <memspy/engine/memspyengine.h>
+#include <memspy/engine/memspyenginelogger.h>
+//#include <memspyengineclientinterface.h>
+#include <memspy/engine/memspyengineobjectthread.h>
+#include <memspy/engine/memspyengineobjectprocess.h>
+#include <memspy/engine/memspyengineobjectcontainer.h>
+#include <memspy/engine/memspyenginehelperchunk.h>
+#include <memspy/engine/memspyenginehelpercodesegment.h>
+#include <memspy/engine/memspyenginehelperheap.h>
+#include <memspy/engine/memspyenginehelperstack.h>
+#include <memspy/engine/memspyenginehelperthread.h>
+#include <memspy/engine/memspyenginehelperprocess.h>
+#include <memspy/engine/memspyenginehelperfilesystem.h>
+#include <memspy/engine/memspyenginehelperram.h>
+#include <memspy/engine/memspyenginehelpersysmemtracker.h>
+#include <memspy/engine/memspyenginehelpersysmemtrackerconfig.h>
+#include <memspy/engine/memspyenginehelperkernelcontainers.h>
+
+#include <memspysession.h>
+
+// ---------------------------------------------------------
+// CMemSpyServer( CMemSpyEngine& aEngine )
+// ---------------------------------------------------------
+//
+CMemSpyServer::CMemSpyServer( CMemSpyEngine& aEngine )
+:   CServer2( EPriorityNormal ), iEngine( aEngine )
+    {
+    }
+
+// ---------------------------------------------------------
+// ~CMemSpyServer()
+// ---------------------------------------------------------
+//
+CMemSpyServer::~CMemSpyServer()
+    {
+	iLog.CloseLog();
+	iLog.Close();
+    }
+
+// ---------------------------------------------------------
+// ConstructL()
+// ---------------------------------------------------------
+//
+void CMemSpyServer::ConstructL()
+    {
+    StartL( KMemSpyServer2 );
+	//TInt error = Start( KMemSpyServerName );
+    RDebug::Printf( "[MemSpy] CMemSpyServer::ConstructL() - server started" );
+    
+    iLog.Connect();
+    iLog.CreateLog(_L("memspy"), _L("server.txt"), EFileLoggingModeAppend);
+    iLog.Write(_L("[MemSpy] CMemSpyServer::ConstructL() - server started"));
+    iLog.Write(_L("[MemSpy] CMemSpyServer::ConstructL() - server name: "));
+    iLog.Write(KMemSpyServer2);
+    }
+
+// ---------------------------------------------------------
+// NewL( CMemSpyEngine& aEngine )
+// Two phased constructor
+// ---------------------------------------------------------
+//
+CMemSpyServer* CMemSpyServer::NewL( CMemSpyEngine& aEngine )
+    {
+	CMemSpyServer* self = CMemSpyServer::NewLC(aEngine);
+	CleanupStack::Pop(self);
+	return (self);
+    }
+
+// ---------------------------------------------------------
+// NewLC( CMemSpyEngine& aEngine )
+// Two phased constructor
+// ---------------------------------------------------------
+//
+CMemSpyServer* CMemSpyServer::NewLC( CMemSpyEngine& aEngine )
+    {
+    CMemSpyServer* self = new(ELeave) CMemSpyServer( aEngine );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    return self;
+    }
+
+// ---------------------------------------------------------
+// NewSessionL( const TVersion& aVersion, const RMessage2& aMessage )
+// Creates new client server session
+// ---------------------------------------------------------
+//
+CSession2* CMemSpyServer::NewSessionL( const TVersion& aVersion, const RMessage2& aMessage ) const
+    {
+	if  ( aVersion.iMajor != KMemSpyClientServerVersion )
+        {
+        RDebug::Printf( "[MemSpy] CMemSpyServerSession::NewSessionL() - BAD VERSION" );
+        User::Leave( KErrNotSupported );
+        }
+    //
+    CMemSpyServerSession* session = CMemSpyServerSession::NewL( iEngine, aMessage );
+	return session;
+    }
+
+// END OF FILE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memspy/MemSpyServer/group/bld.inf	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_MMPFILES
+MemSpyServer.mmp
--- a/memspy/group/bld.inf	Tue May 25 18:01:01 2010 +0300
+++ b/memspy/group/bld.inf	Mon Jun 14 11:37:33 2010 +0300
@@ -32,7 +32,12 @@
 // Console UI
 #include "../Console/group/bld.inf"
 
+// MemSpyServer
+#include "../MemSpyServer/group/bld.inf"
+
+// MemSpyClient
+#include "../MemSpyClient/group/bld.inf"
 
 PRJ_EXPORTS
 ../rom/memspy.iby      CORE_IBY_EXPORT_PATH(tools,memspy.iby)
-../rom/memspy_rom.iby  CORE_IBY_EXPORT_PATH(tools/rom,memspy_rom.iby)
+../rom/memspy_rom.iby  CORE_IBY_EXPORT_PATH(tools/rom,memspy_rom.iby)
\ No newline at end of file
--- a/memspy/memspy_plat/memspy_api/include/memspy/driver/shared/MemSpyDriverObjectsSharedRHeap.h	Tue May 25 18:01:01 2010 +0300
+++ b/memspy/memspy_plat/memspy_api/include/memspy/driver/shared/MemSpyDriverObjectsSharedRHeap.h	Mon Jun 14 11:37:33 2010 +0300
@@ -92,7 +92,7 @@
 	TInt iMinCell;
 	TInt iPageSize;
 #ifdef __SYMBIAN_KERNEL_HYBRID_HEAP__
-	struct SCell { TInt len; SCell* next };
+	struct SCell { TInt len; SCell* next; };
     SCell iFree;
 #else
     RHeap::SCell iFree;
--- a/memspy/memspy_plat/memspy_api/include/memspy/engine/Helpers/MemSpyEngineHelperHeap.h	Tue May 25 18:01:01 2010 +0300
+++ b/memspy/memspy_plat/memspy_api/include/memspy/engine/Helpers/MemSpyEngineHelperHeap.h	Mon Jun 14 11:37:33 2010 +0300
@@ -26,6 +26,9 @@
 // Driver includes
 #include <memspy/driver/memspydriverobjectsshared.h>
 
+// MemSpyClient includes
+#include <memspy/engine/memspyheapdata.h>
+
 // Classes referenced
 class CMemSpyThread;
 class CMemSpyEngine;
@@ -61,6 +64,8 @@
     IMPORT_C void OutputHeapInfoForDeviceL( TBool aIncludeKernel = ETrue );
     IMPORT_C CMemSpyEngineOutputList* NewHeapSummaryShortLC( const TMemSpyHeapInfo& aInfo );
     IMPORT_C CMemSpyEngineOutputList* NewHeapSummaryExtendedLC( const TMemSpyHeapInfo& aInfo, const RArray<TMemSpyDriverFreeCell>* aFreeCells = NULL );
+    //cigasto    
+    IMPORT_C TMemSpyHeapData NewHeapRawInfo( const TMemSpyHeapInfo& aInfo ); //not formatted heap info
 
 public: // But not exported
     void OutputHeapDataKernelL( TBool aCreateDataStream );
--- a/memspy/memspy_plat/memspy_api/include/memspy/engine/Helpers/MemSpyEngineHelperKernelContainers.h	Tue May 25 18:01:01 2010 +0300
+++ b/memspy/memspy_plat/memspy_api/include/memspy/engine/Helpers/MemSpyEngineHelperKernelContainers.h	Mon Jun 14 11:37:33 2010 +0300
@@ -87,6 +87,8 @@
     IMPORT_C static TPtrC TypeAsString( TMemSpyDriverContainerType aType );
     IMPORT_C TPtrC Name() const;
     IMPORT_C void OutputL( CMemSpyEngineOutputSink& aSink ) const;
+    IMPORT_C TInt Size() const;
+    IMPORT_C TInt ItemsCount() const;
 
 public: // But not exported
     TAny* HandleAt( TInt aIndex ) const;
@@ -137,4 +139,5 @@
 
 
 
-#endif
\ No newline at end of file
+#endif
+
--- a/memspy/memspy_plat/memspy_api/include/memspy/engine/ThreadAndProcess/MemSpyEngineObjectThread.h	Tue May 25 18:01:01 2010 +0300
+++ b/memspy/memspy_plat/memspy_api/include/memspy/engine/ThreadAndProcess/MemSpyEngineObjectThread.h	Mon Jun 14 11:37:33 2010 +0300
@@ -56,6 +56,7 @@
     IMPORT_C TBool IsSystemPermanent() const;
     IMPORT_C TBool IsSystemCritical() const;
     IMPORT_C TBool IsDead() const;
+    IMPORT_C TThreadPriority Priority() const;
 
 public: // API - misc
     IMPORT_C void KillL();
@@ -105,4 +106,4 @@
 
 
 
-#endif
\ No newline at end of file
+#endif
--- a/memspy/rom/memspy.iby	Tue May 25 18:01:01 2010 +0300
+++ b/memspy/rom/memspy.iby	Mon Jun 14 11:37:33 2010 +0300
@@ -22,6 +22,10 @@
 file=ABI_DIR\BUILD_DIR\MemSpyDriverClient.dll									SHARED_LIB_DIR\MemSpyDriverClient.dll
 file=ABI_DIR\BUILD_DIR\MemSpyEngine.dll											SHARED_LIB_DIR\MemSpyEngine.dll
 
+// Client - server
+file=ABI_DIR\BUILD_DIR\MemSpyServer.exe											SHARED_LIB_DIR\MemSpyServer.exe
+file=ABI_DIR\BUILD_DIR\MemSpyClient.dll											SHARED_LIB_DIR\MemSpyClient.dll
+
 // Commandline
 file=ABI_DIR\BUILD_DIR\MemSpy.exe									            SHARED_LIB_DIR\MemSpy.exe
 
--- a/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
-component           osrndtools_metadata
-source   \sf\os\osrndtools\osrndtools_info\osrndtools_metadata 
-source   \sf\os\osrndtools\package_definition.xml
-source   \sf\os\osrndtools\distribution.policy.s60
-notes_source      \component_defs\release.src
-ipr T 
--- a/package_definition.xml	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="osrndtools" name="OS R&amp;D tools" levels="fw trace">
-  <collection id="stif" name="STIF" level="fw">
-   <component id="testinterface" filter="s60" name="Test Interface" purpose="development">
-    <unit bldFile="stif/testinterface/group"/>
-   </component>
-   <component id="testserver" filter="s60" name="Test Server" purpose="development">
-    <unit bldFile="stif/testserver/group"/>
-   </component>
-   <component id="testengine" filter="s60" name="Test Engine" purpose="development">
-    <unit bldFile="stif/testengine/group"/>
-   </component>
-   <component id="testserverstarter" filter="s60" name="Test Server Starter" purpose="development">
-    <unit bldFile="stif/testserverstarter/group"/>
-   </component>
-   <component id="stiftfwif" filter="s60" name="STIF Test Framework Interface" purpose="development">
-    <unit bldFile="stif/stiftfwif/group"/>
-   </component>
-   <component id="consoleui" filter="s60" name="Console UI" purpose="development">
-    <unit bldFile="stif/consoleui/group"/>
-   </component>
-   <component id="testcombiner" filter="s60" name="Test Combiner" purpose="development">
-    <unit bldFile="stif/testcombiner/group"/>
-   </component>
-   <component id="demomodule" filter="s60" name="Demo Module" purpose="development">
-    <unit bldFile="stif/demomodule/group"/>
-   </component>
-   <component id="atslogger" filter="s60" name="ATS Logger" purpose="development">
-    <unit bldFile="stif/atslogger/group"/>
-   </component>
-   <component id="atsinterface" filter="s60" name="ATS Interface" purpose="development">
-    <unit bldFile="stif/atsinterface/group"/>
-   </component>
-   <component id="testscripter" filter="s60" name="Test Scripter" purpose="development">
-    <unit bldFile="stif/testscripter/group"/>
-   </component>
-   <component id="suevent" filter="s60" name="SU Event" purpose="development">
-    <unit bldFile="stif/suevent/group"/>
-   </component>
-   <component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
-    <unit bldFile="stif/stifkerneltestclassbase/group"/>
-   </component>
-   <component id="examples" filter="s60" name="STIF Examples" purpose="development">
-    <!-- <unit bldFile="stif/examples/stiftestmeasurementstub/group"/> -->
-    <!-- <unit bldFile="stif/examples/stifhwresetstub/group"/> -->
-   </component>
-   <component id="testmoduletemplates" filter="s60" name="Test Module Templates" purpose="development">
-    <!-- <unit bldFile="stif/testmoduletemplates/templatescriptxxx/group"/> -->
-    <!-- <unit bldFile="stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
-    <!-- <unit bldFile="stif/testmoduletemplates/capsmodifierxxx/group"/> -->
-    <!-- <unit bldFile="stif/testmoduletemplates/testmodulexxx/group"/> -->
-    <!-- <unit bldFile="stif/testmoduletemplates/stifunitxxx/group"/> -->
-    <!-- <unit bldFile="stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
-   </component>
-   <component id="stif_build" filter="s60" name="STIF Build" purpose="development">
-    <unit bldFile="stif/group"/>
-   </component>
-  </collection>
-  <collection id="memspy" name="Memspy" level="trace">
-   <component id="driver" filter="s60" name="Memspy Driver" purpose="development">
-    <unit bldFile="memspy/driver/group"/>
-   </component>
-   <component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
-    <unit bldFile="memspy/engine/group"/>
-   </component>
-   <component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
-    <unit bldFile="memspy/commandline/group"/>
-   </component>
-   <component id="console" filter="s60" name="Memspy Console" purpose="development">
-    <unit bldFile="memspy/console/group"/>
-   </component>
-   <component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
-    <unit bldFile="memspy/group"/>
-   </component>
-  </collection>
-  <collection id="hti" name="Harmonized Test Interface" level="trace">
-   <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
-    <unit bldFile="hti/htiframework/group"/>
-   </component>
-   <component id="hticfg" filter="s60" name="HTI Config" purpose="development">
-    <unit bldFile="hti/hticfg/group"/>
-   </component>
-   <component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
-    <unit bldFile="hti/htiautostart/group"/>
-   </component>
-   <component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
-    <unit bldFile="hti/htifilehlp/group"/>
-   </component>
-   <component id="htiwatchdog" filter="s60" name="HTI Watchdog" purpose="development">
-    <unit bldFile="hti/htiwatchdog/group"/>
-   </component>
-   <component id="hti_build" filter="s60" name="HTI Build" purpose="development">
-    <unit bldFile="hti/group"/>
-   </component>
-  </collection>
-    <collection id="testexecfw1" name="Test Execution Framework v1" level="fw">
-      <component id="cinidata" name="CINI Data" purpose="development">
-        <unit bldFile="testexecfw1/cinidata" mrp="testexecfw1/cinidata/tools_cinidata.mrp"/>
-      </component>
-      <component id="testexecute" name="Test Execute" deprecated="^2" purpose="development">
-        <unit bldFile="testexecfw1/testexecute/Group" mrp="testexecfw1/testexecute/Group/tools_testexecute.mrp"/>
-      </component>
-    </collection>
-    <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
-      <component id="osrndtools_plat" filter="s60" name="OS R&amp;D tools Platform Interfaces" class="api" purpose="development">
-        <unit bldFile="osrndtools_plat/group"/>
-          <!-- need to #include the next bld.inf  in the above one -->
-        <unit bldFile="osrndtools_plat/hti_api/group"/>
-      </component>
-      <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>
--- a/stif/ATSInterface/src/ATSInterface.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/ATSInterface/src/ATSInterface.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -561,12 +561,12 @@
     _LIT( KEngineIniFile, "-engineini" );
     _LIT( KModuleIniFile, "-moduleini" );
 
-	const TInt length = User().CommandLineLength();
+	const TInt length = User::CommandLineLength();
 
     HBufC* cmdLine = HBufC::NewLC( length );
     TPtr ptr = cmdLine->Des();
 
-	User().CommandLine( ptr );
+	User::CommandLine( ptr );
 
     TBool moduleFound( EFalse );
     TLex lex( ptr );
--- a/stif/DemoModule/BMARM/DEMOMODULEU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
-	SetRequirements__FRP16CTestModuleParamRUl @ 2 NONAME R3UNUSED ; SetRequirements(CTestModuleParam *&, unsigned long &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/DemoModule/BMARM/Demomoduleu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+	LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
+	SetRequirements__FRP16CTestModuleParamRUl @ 2 NONAME R3UNUSED ; SetRequirements(CTestModuleParam *&, unsigned long &)
+
--- a/stif/DemoModule/BWINS/DEMOMODULEU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
-	?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/DemoModule/BWINS/Demomoduleu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+	?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
+	?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
+
--- a/stif/SUEvent/Bmarm/SUEventU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
-	SetRequirements__FRP16CTestModuleParamRUl @ 2 NONAME R3UNUSED ; SetRequirements(CTestModuleParam *&, unsigned long &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/SUEvent/Bmarm/SUEventu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+	LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
+	SetRequirements__FRP16CTestModuleParamRUl @ 2 NONAME R3UNUSED ; SetRequirements(CTestModuleParam *&, unsigned long &)
+
--- a/stif/SUEvent/Bwins/SUEventU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
-	?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/SUEvent/Bwins/SUEventu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+	?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
+	?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
+
--- a/stif/StifKernelTestClassBase/Bwins/STIFKERNELTESTCLASSBASEU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
-	??0DStifKernelTestClassBase@@QAE@PAVDLogicalDevice@@@Z @ 1 NONAME ; DStifKernelTestClassBase::DStifKernelTestClassBase(class DLogicalDevice *)
-	??0DStifKernelTestClassBaseDriver@@QAE@ABVTDesC8@@@Z @ 2 NONAME ; DStifKernelTestClassBaseDriver::DStifKernelTestClassBaseDriver(class TDesC8 const &)
-	??1DStifKernelTestClassBase@@UAE@XZ @ 3 NONAME ; DStifKernelTestClassBase::~DStifKernelTestClassBase(void)
-	??1DStifKernelTestClassBaseDriver@@UAE@XZ @ 4 NONAME ; DStifKernelTestClassBaseDriver::~DStifKernelTestClassBaseDriver(void)
-	?GetCaps@DStifKernelTestClassBaseDriver@@UBEXAAVTDes8@@@Z @ 5 NONAME ; void DStifKernelTestClassBaseDriver::GetCaps(class TDes8 &) const
-	?HandleMsg@DStifKernelTestClassBase@@UAEXPAVTMessageBase@@@Z @ 6 NONAME ; void DStifKernelTestClassBase::HandleMsg(class TMessageBase *)
-	?Install@DStifKernelTestClassBaseDriver@@UAEHXZ @ 7 NONAME ; int DStifKernelTestClassBaseDriver::Install(void)
-	?RunInternalL@DStifKernelTestClassBase@@MAEHPBVTStifFunctionInfo@@HABVTDesC8@@1@Z @ 8 NONAME ; int DStifKernelTestClassBase::RunInternalL(class TStifFunctionInfo const *, int, class TDesC8 const &, class TDesC8 const &)
-
--- a/stif/StifKernelTestClassBase/Bwins/STIFKERNELTESTCLASSBASE_EKA1U.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
-	??0DStifKernelTestClassBase@@QAE@PAVDLogicalDevice@@@Z @ 1 NONAME ; DStifKernelTestClassBase::DStifKernelTestClassBase(class DLogicalDevice *)
-	??0DStifKernelTestClassBaseDriver@@QAE@ABVTDesC16@@@Z @ 2 NONAME ; DStifKernelTestClassBaseDriver::DStifKernelTestClassBaseDriver(class TDesC16 const &)
-	??1DStifKernelTestClassBase@@UAE@XZ @ 3 NONAME ; DStifKernelTestClassBase::~DStifKernelTestClassBase(void)
-	??1DStifKernelTestClassBaseDriver@@UAE@XZ @ 4 NONAME ; DStifKernelTestClassBaseDriver::~DStifKernelTestClassBaseDriver(void)
-	?DoControl@DStifKernelTestClassBase@@EAEHHPAX0@Z @ 5 NONAME ; int DStifKernelTestClassBase::DoControl(int, void *, void *)
-	?GetCaps@DStifKernelTestClassBaseDriver@@UBEXAAVTDes8@@@Z @ 6 NONAME ; void DStifKernelTestClassBaseDriver::GetCaps(class TDes8 &) const
-	?Install@DStifKernelTestClassBaseDriver@@UAEHXZ @ 7 NONAME ; int DStifKernelTestClassBaseDriver::Install(void)
-	?RunInternalL@DStifKernelTestClassBase@@MAEHPBVTStifFunctionInfo@@HABVTDesC16@@1@Z @ 8 NONAME ; int DStifKernelTestClassBase::RunInternalL(class TStifFunctionInfo const *, int, class TDesC16 const &, class TDesC16 const &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/StifKernelTestClassBase/Bwins/StifKernelTestClassBase_eka1u.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,10 @@
+EXPORTS
+	??0DStifKernelTestClassBase@@QAE@PAVDLogicalDevice@@@Z @ 1 NONAME ; DStifKernelTestClassBase::DStifKernelTestClassBase(class DLogicalDevice *)
+	??0DStifKernelTestClassBaseDriver@@QAE@ABVTDesC16@@@Z @ 2 NONAME ; DStifKernelTestClassBaseDriver::DStifKernelTestClassBaseDriver(class TDesC16 const &)
+	??1DStifKernelTestClassBase@@UAE@XZ @ 3 NONAME ; DStifKernelTestClassBase::~DStifKernelTestClassBase(void)
+	??1DStifKernelTestClassBaseDriver@@UAE@XZ @ 4 NONAME ; DStifKernelTestClassBaseDriver::~DStifKernelTestClassBaseDriver(void)
+	?DoControl@DStifKernelTestClassBase@@EAEHHPAX0@Z @ 5 NONAME ; int DStifKernelTestClassBase::DoControl(int, void *, void *)
+	?GetCaps@DStifKernelTestClassBaseDriver@@UBEXAAVTDes8@@@Z @ 6 NONAME ; void DStifKernelTestClassBaseDriver::GetCaps(class TDes8 &) const
+	?Install@DStifKernelTestClassBaseDriver@@UAEHXZ @ 7 NONAME ; int DStifKernelTestClassBaseDriver::Install(void)
+	?RunInternalL@DStifKernelTestClassBase@@MAEHPBVTStifFunctionInfo@@HABVTDesC16@@1@Z @ 8 NONAME ; int DStifKernelTestClassBase::RunInternalL(class TStifFunctionInfo const *, int, class TDesC16 const &, class TDesC16 const &)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/StifKernelTestClassBase/Bwins/StifKernelTestClassBaseu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,10 @@
+EXPORTS
+	??0DStifKernelTestClassBase@@QAE@PAVDLogicalDevice@@@Z @ 1 NONAME ; DStifKernelTestClassBase::DStifKernelTestClassBase(class DLogicalDevice *)
+	??0DStifKernelTestClassBaseDriver@@QAE@ABVTDesC8@@@Z @ 2 NONAME ; DStifKernelTestClassBaseDriver::DStifKernelTestClassBaseDriver(class TDesC8 const &)
+	??1DStifKernelTestClassBase@@UAE@XZ @ 3 NONAME ; DStifKernelTestClassBase::~DStifKernelTestClassBase(void)
+	??1DStifKernelTestClassBaseDriver@@UAE@XZ @ 4 NONAME ; DStifKernelTestClassBaseDriver::~DStifKernelTestClassBaseDriver(void)
+	?GetCaps@DStifKernelTestClassBaseDriver@@UBEXAAVTDes8@@@Z @ 5 NONAME ; void DStifKernelTestClassBaseDriver::GetCaps(class TDes8 &) const
+	?HandleMsg@DStifKernelTestClassBase@@UAEXPAVTMessageBase@@@Z @ 6 NONAME ; void DStifKernelTestClassBase::HandleMsg(class TMessageBase *)
+	?Install@DStifKernelTestClassBaseDriver@@UAEHXZ @ 7 NONAME ; int DStifKernelTestClassBaseDriver::Install(void)
+	?RunInternalL@DStifKernelTestClassBase@@MAEHPBVTStifFunctionInfo@@HABVTDesC8@@1@Z @ 8 NONAME ; int DStifKernelTestClassBase::RunInternalL(class TStifFunctionInfo const *, int, class TDesC8 const &, class TDesC8 const &)
+
--- a/stif/StifTFwIf/Bmarm/STIFTFWIFU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-EXPORTS
-	__10CUIStoreIf @ 1 NONAME R3UNUSED ; CUIStoreIf::CUIStoreIf(void)
-	AddTestCaseFile__10CStifTFwIfR7TDesC16T1 @ 2 NONAME R3UNUSED ; CStifTFwIf::AddTestCaseFile(TDesC16 &, TDesC16 &)
-	AddTestCaseFile__8CUIStoreRC7TDesC16T1 @ 3 NONAME R3UNUSED ; CUIStore::AddTestCaseFile(TDesC16 const &, TDesC16 const &)
-	AddTestModule__10CStifTFwIfR7TDesC16T1 @ 4 NONAME R3UNUSED ; CStifTFwIf::AddTestModule(TDesC16 &, TDesC16 &)
-	AddTestModule__8CUIStoreRC7TDesC16T1 @ 5 NONAME R3UNUSED ; CUIStore::AddTestModule(TDesC16 const &, TDesC16 const &)
-	AddToTestSet__8CUIStoreRC7TDesC16RC9CTestInfo @ 6 NONAME R3UNUSED ; CUIStore::AddToTestSet(TDesC16 const &, CTestInfo const &)
-	AtsReceive__10CStifTFwIfRC7TDesC16 @ 7 NONAME R3UNUSED ; CStifTFwIf::AtsReceive(TDesC16 const &)
-	CancelTestCase__10CStifTFwIfi @ 8 NONAME R3UNUSED ; CStifTFwIf::CancelTestCase(int)
-	CancelTest__18CUIEngineContainer @ 9 NONAME R3UNUSED ; CUIEngineContainer::CancelTest(void)
-	Close__10CStifTFwIf @ 10 NONAME R3UNUSED ; CStifTFwIf::Close(void)
-	Close__8CUIStore @ 11 NONAME R3UNUSED ; CUIStore::Close(void)
-	ConstructL__10CUIStoreIf @ 12 NONAME R3UNUSED ; CUIStoreIf::ConstructL(void)
-	CreateTestSet__8CUIStoreRC7TDesC16 @ 13 NONAME R3UNUSED ; CUIStore::CreateTestSet(TDesC16 const &)
-	GetTestCases__10CStifTFwIfRt13RPointerArray1Z9CTestInfoR7TDesC16T2 @ 14 NONAME ; CStifTFwIf::GetTestCases(RPointerArray<CTestInfo> &, TDesC16 &, TDesC16 &)
-	GoingToReboot__8CStifTFwP18CUIEngineContainerR14TRequestStatus @ 15 NONAME R3UNUSED ; CStifTFw::GoingToReboot(CUIEngineContainer *, TRequestStatus &)
-	InsertToTestSet__8CUIStoreRC7TDesC16RC9CTestInfoi @ 16 NONAME ; CUIStore::InsertToTestSet(TDesC16 const &, CTestInfo const &, int)
-	ListAllModules__8CUIStoreRt13RPointerArray1Z7TDesC16 @ 17 NONAME R3UNUSED ; CUIStore::ListAllModules(RPointerArray<TDesC16> &)
-	LoadAllModules__8CUIStore @ 18 NONAME R3UNUSED ; CUIStore::LoadAllModules(void)
-	LoadSavedTestCases__8CUIStore @ 19 NONAME R3UNUSED ; CUIStore::LoadSavedTestCases(void)
-	LoadTestSet__8CUIStoreRC7TDesC16 @ 20 NONAME R3UNUSED ; CUIStore::LoadTestSet(TDesC16 const &)
-	Modules__8CUIStoreRt9RRefArray1Z7TDesC16 @ 21 NONAME R3UNUSED ; CUIStore::Modules(RRefArray<TDesC16> &)
-	NewL__9CTestInfo @ 22 NONAME R3UNUSED ; CTestInfo::NewL(void)
-	Open__10CStifTFwIfR7TDesC16 @ 23 NONAME R3UNUSED ; CStifTFwIf::Open(TDesC16 &)
-	Open__8CUIStoreRC7TDesC16 @ 24 NONAME R3UNUSED ; CUIStore::Open(TDesC16 const &)
-	PauseTestCase__10CStifTFwIfi @ 25 NONAME R3UNUSED ; CStifTFwIf::PauseTestCase(int)
-	PauseTest__18CUIEngineContainer @ 26 NONAME R3UNUSED ; CUIEngineContainer::PauseTest(void)
-	PrintProg__8CStifTFwP18CUIEngineContainerR13TTestProgress @ 27 NONAME R3UNUSED ; CStifTFw::PrintProg(CUIEngineContainer *, TTestProgress &)
-	RemoteMsg__8CStifTFwP18CUIEngineContainerRC7TDesC16 @ 28 NONAME R3UNUSED ; CStifTFw::RemoteMsg(CUIEngineContainer *, TDesC16 const &)
-	RemoveFromTestSet__8CUIStoreRC7TDesC16RC9CTestInfo @ 29 NONAME R3UNUSED ; CUIStore::RemoveFromTestSet(TDesC16 const &, CTestInfo const &)
-	RemoveTestCaseFile__10CStifTFwIfR7TDesC16T1 @ 30 NONAME R3UNUSED ; CStifTFwIf::RemoveTestCaseFile(TDesC16 &, TDesC16 &)
-	RemoveTestCaseFile__8CUIStoreRC7TDesC16T1 @ 31 NONAME R3UNUSED ; CUIStore::RemoveTestCaseFile(TDesC16 const &, TDesC16 const &)
-	RemoveTestModule__10CStifTFwIfR7TDesC16 @ 32 NONAME R3UNUSED ; CStifTFwIf::RemoveTestModule(TDesC16 &)
-	RemoveTestModule__8CUIStoreRC7TDesC16 @ 33 NONAME R3UNUSED ; CUIStore::RemoveTestModule(TDesC16 const &)
-	RemoveTestSet__8CUIStoreRC7TDesC16 @ 34 NONAME R3UNUSED ; CUIStore::RemoveTestSet(TDesC16 const &)
-	ResumeTestCase__10CStifTFwIfi @ 35 NONAME R3UNUSED ; CStifTFwIf::ResumeTestCase(int)
-	ResumeTest__18CUIEngineContainer @ 36 NONAME R3UNUSED ; CUIEngineContainer::ResumeTest(void)
-	SaveTestSet__8CUIStoreRC7TDesC16 @ 37 NONAME R3UNUSED ; CUIStore::SaveTestSet(TDesC16 const &)
-	SetAttribute__10CStifTFwIf10TAttributeRC7TDesC16 @ 38 NONAME R3UNUSED ; CStifTFwIf::SetAttribute(TAttribute, TDesC16 const &)
-	StartTestCase__10CStifTFwIfRiRC9CTestInfo @ 39 NONAME R3UNUSED ; CStifTFwIf::StartTestCase(int &, CTestInfo const &)
-	StartTestCase__8CUIStoreRC9CTestInfoRi @ 40 NONAME R3UNUSED ; CUIStore::StartTestCase(CTestInfo const &, int &)
-	StartTestSet__8CUIStoreRC12CTestSetInfoRiQ215CStartedTestSet8TSetType @ 41 NONAME ; CUIStore::StartTestSet(CTestSetInfo const &, int &, CStartedTestSet::TSetType)
-	StartedTestCaseL__8CUIStorei @ 42 NONAME R3UNUSED ; CUIStore::StartedTestCaseL(int)
-	StartedTestCases__8CUIStoreRt9RRefArray1Z16CStartedTestCaseiRC7TDesC16T3 @ 43 NONAME ; CUIStore::StartedTestCases(RRefArray<CStartedTestCase> &, int, TDesC16 const &, TDesC16 const &)
-	StartedTestSetL__8CUIStorei @ 44 NONAME R3UNUSED ; CUIStore::StartedTestSetL(int)
-	StartedTestSets__8CUIStoreRt9RRefArray1Z15CStartedTestSeti @ 45 NONAME R3UNUSED ; CUIStore::StartedTestSets(RRefArray<CStartedTestSet> &, int)
-	TestCaseFiles__8CUIStoreRt9RRefArray1Z7TDesC16RC7TDesC16 @ 46 NONAME R3UNUSED ; CUIStore::TestCaseFiles(RRefArray<TDesC16> &, TDesC16 const &)
-	TestCases__8CUIStoreRt9RRefArray1Z9CTestInfoRC7TDesC16T2 @ 47 NONAME ; CUIStore::TestCases(RRefArray<CTestInfo> &, TDesC16 const &, TDesC16 const &)
-	TestExecuted__8CStifTFwP18CUIEngineContainerR15TFullTestResult @ 48 NONAME R3UNUSED ; CStifTFw::TestExecuted(CUIEngineContainer *, TFullTestResult &)
-	TestSetL__8CUIStoreRC7TDesC16 @ 49 NONAME R3UNUSED ; CUIStore::TestSetL(TDesC16 const &)
-	TestSets__8CUIStoreRt9RRefArray1Z12CTestSetInfo @ 50 NONAME R3UNUSED ; CUIStore::TestSets(RRefArray<CTestSetInfo> &)
-	UIEngineContainer__C16CStartedTestCase @ 51 NONAME R3UNUSED ; CStartedTestCase::UIEngineContainer(void) const
-	UIStore__10CUIStoreIf @ 52 NONAME R3UNUSED ; CUIStoreIf::UIStore(void)
-	"_._10CStifTFwIf" @ 53 NONAME R3UNUSED ; CStifTFwIf::~CStifTFwIf(void)
-	"_._10CUIStoreIf" @ 54 NONAME R3UNUSED ; CUIStoreIf::~CUIStoreIf(void)
-	__10CStifTFwIf @ 55 NONAME R3UNUSED ; CStifTFwIf::CStifTFwIf(void)
-	AbortTestSet__8CUIStoreR15CStartedTestSet @ 56 NONAME R3UNUSED ; CUIStore::AbortTestSet(CStartedTestSet &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/StifTFwIf/Bmarm/StifTFwIfu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,58 @@
+EXPORTS
+	__10CUIStoreIf @ 1 NONAME R3UNUSED ; CUIStoreIf::CUIStoreIf(void)
+	AddTestCaseFile__10CStifTFwIfR7TDesC16T1 @ 2 NONAME R3UNUSED ; CStifTFwIf::AddTestCaseFile(TDesC16 &, TDesC16 &)
+	AddTestCaseFile__8CUIStoreRC7TDesC16T1 @ 3 NONAME R3UNUSED ; CUIStore::AddTestCaseFile(TDesC16 const &, TDesC16 const &)
+	AddTestModule__10CStifTFwIfR7TDesC16T1 @ 4 NONAME R3UNUSED ; CStifTFwIf::AddTestModule(TDesC16 &, TDesC16 &)
+	AddTestModule__8CUIStoreRC7TDesC16T1 @ 5 NONAME R3UNUSED ; CUIStore::AddTestModule(TDesC16 const &, TDesC16 const &)
+	AddToTestSet__8CUIStoreRC7TDesC16RC9CTestInfo @ 6 NONAME R3UNUSED ; CUIStore::AddToTestSet(TDesC16 const &, CTestInfo const &)
+	AtsReceive__10CStifTFwIfRC7TDesC16 @ 7 NONAME R3UNUSED ; CStifTFwIf::AtsReceive(TDesC16 const &)
+	CancelTestCase__10CStifTFwIfi @ 8 NONAME R3UNUSED ; CStifTFwIf::CancelTestCase(int)
+	CancelTest__18CUIEngineContainer @ 9 NONAME R3UNUSED ; CUIEngineContainer::CancelTest(void)
+	Close__10CStifTFwIf @ 10 NONAME R3UNUSED ; CStifTFwIf::Close(void)
+	Close__8CUIStore @ 11 NONAME R3UNUSED ; CUIStore::Close(void)
+	ConstructL__10CUIStoreIf @ 12 NONAME R3UNUSED ; CUIStoreIf::ConstructL(void)
+	CreateTestSet__8CUIStoreRC7TDesC16 @ 13 NONAME R3UNUSED ; CUIStore::CreateTestSet(TDesC16 const &)
+	GetTestCases__10CStifTFwIfRt13RPointerArray1Z9CTestInfoR7TDesC16T2 @ 14 NONAME ; CStifTFwIf::GetTestCases(RPointerArray<CTestInfo> &, TDesC16 &, TDesC16 &)
+	GoingToReboot__8CStifTFwP18CUIEngineContainerR14TRequestStatus @ 15 NONAME R3UNUSED ; CStifTFw::GoingToReboot(CUIEngineContainer *, TRequestStatus &)
+	InsertToTestSet__8CUIStoreRC7TDesC16RC9CTestInfoi @ 16 NONAME ; CUIStore::InsertToTestSet(TDesC16 const &, CTestInfo const &, int)
+	ListAllModules__8CUIStoreRt13RPointerArray1Z7TDesC16 @ 17 NONAME R3UNUSED ; CUIStore::ListAllModules(RPointerArray<TDesC16> &)
+	LoadAllModules__8CUIStore @ 18 NONAME R3UNUSED ; CUIStore::LoadAllModules(void)
+	LoadSavedTestCases__8CUIStore @ 19 NONAME R3UNUSED ; CUIStore::LoadSavedTestCases(void)
+	LoadTestSet__8CUIStoreRC7TDesC16 @ 20 NONAME R3UNUSED ; CUIStore::LoadTestSet(TDesC16 const &)
+	Modules__8CUIStoreRt9RRefArray1Z7TDesC16 @ 21 NONAME R3UNUSED ; CUIStore::Modules(RRefArray<TDesC16> &)
+	NewL__9CTestInfo @ 22 NONAME R3UNUSED ; CTestInfo::NewL(void)
+	Open__10CStifTFwIfR7TDesC16 @ 23 NONAME R3UNUSED ; CStifTFwIf::Open(TDesC16 &)
+	Open__8CUIStoreRC7TDesC16 @ 24 NONAME R3UNUSED ; CUIStore::Open(TDesC16 const &)
+	PauseTestCase__10CStifTFwIfi @ 25 NONAME R3UNUSED ; CStifTFwIf::PauseTestCase(int)
+	PauseTest__18CUIEngineContainer @ 26 NONAME R3UNUSED ; CUIEngineContainer::PauseTest(void)
+	PrintProg__8CStifTFwP18CUIEngineContainerR13TTestProgress @ 27 NONAME R3UNUSED ; CStifTFw::PrintProg(CUIEngineContainer *, TTestProgress &)
+	RemoteMsg__8CStifTFwP18CUIEngineContainerRC7TDesC16 @ 28 NONAME R3UNUSED ; CStifTFw::RemoteMsg(CUIEngineContainer *, TDesC16 const &)
+	RemoveFromTestSet__8CUIStoreRC7TDesC16RC9CTestInfo @ 29 NONAME R3UNUSED ; CUIStore::RemoveFromTestSet(TDesC16 const &, CTestInfo const &)
+	RemoveTestCaseFile__10CStifTFwIfR7TDesC16T1 @ 30 NONAME R3UNUSED ; CStifTFwIf::RemoveTestCaseFile(TDesC16 &, TDesC16 &)
+	RemoveTestCaseFile__8CUIStoreRC7TDesC16T1 @ 31 NONAME R3UNUSED ; CUIStore::RemoveTestCaseFile(TDesC16 const &, TDesC16 const &)
+	RemoveTestModule__10CStifTFwIfR7TDesC16 @ 32 NONAME R3UNUSED ; CStifTFwIf::RemoveTestModule(TDesC16 &)
+	RemoveTestModule__8CUIStoreRC7TDesC16 @ 33 NONAME R3UNUSED ; CUIStore::RemoveTestModule(TDesC16 const &)
+	RemoveTestSet__8CUIStoreRC7TDesC16 @ 34 NONAME R3UNUSED ; CUIStore::RemoveTestSet(TDesC16 const &)
+	ResumeTestCase__10CStifTFwIfi @ 35 NONAME R3UNUSED ; CStifTFwIf::ResumeTestCase(int)
+	ResumeTest__18CUIEngineContainer @ 36 NONAME R3UNUSED ; CUIEngineContainer::ResumeTest(void)
+	SaveTestSet__8CUIStoreRC7TDesC16 @ 37 NONAME R3UNUSED ; CUIStore::SaveTestSet(TDesC16 const &)
+	SetAttribute__10CStifTFwIf10TAttributeRC7TDesC16 @ 38 NONAME R3UNUSED ; CStifTFwIf::SetAttribute(TAttribute, TDesC16 const &)
+	StartTestCase__10CStifTFwIfRiRC9CTestInfo @ 39 NONAME R3UNUSED ; CStifTFwIf::StartTestCase(int &, CTestInfo const &)
+	StartTestCase__8CUIStoreRC9CTestInfoRi @ 40 NONAME R3UNUSED ; CUIStore::StartTestCase(CTestInfo const &, int &)
+	StartTestSet__8CUIStoreRC12CTestSetInfoRiQ215CStartedTestSet8TSetType @ 41 NONAME ; CUIStore::StartTestSet(CTestSetInfo const &, int &, CStartedTestSet::TSetType)
+	StartedTestCaseL__8CUIStorei @ 42 NONAME R3UNUSED ; CUIStore::StartedTestCaseL(int)
+	StartedTestCases__8CUIStoreRt9RRefArray1Z16CStartedTestCaseiRC7TDesC16T3 @ 43 NONAME ; CUIStore::StartedTestCases(RRefArray<CStartedTestCase> &, int, TDesC16 const &, TDesC16 const &)
+	StartedTestSetL__8CUIStorei @ 44 NONAME R3UNUSED ; CUIStore::StartedTestSetL(int)
+	StartedTestSets__8CUIStoreRt9RRefArray1Z15CStartedTestSeti @ 45 NONAME R3UNUSED ; CUIStore::StartedTestSets(RRefArray<CStartedTestSet> &, int)
+	TestCaseFiles__8CUIStoreRt9RRefArray1Z7TDesC16RC7TDesC16 @ 46 NONAME R3UNUSED ; CUIStore::TestCaseFiles(RRefArray<TDesC16> &, TDesC16 const &)
+	TestCases__8CUIStoreRt9RRefArray1Z9CTestInfoRC7TDesC16T2 @ 47 NONAME ; CUIStore::TestCases(RRefArray<CTestInfo> &, TDesC16 const &, TDesC16 const &)
+	TestExecuted__8CStifTFwP18CUIEngineContainerR15TFullTestResult @ 48 NONAME R3UNUSED ; CStifTFw::TestExecuted(CUIEngineContainer *, TFullTestResult &)
+	TestSetL__8CUIStoreRC7TDesC16 @ 49 NONAME R3UNUSED ; CUIStore::TestSetL(TDesC16 const &)
+	TestSets__8CUIStoreRt9RRefArray1Z12CTestSetInfo @ 50 NONAME R3UNUSED ; CUIStore::TestSets(RRefArray<CTestSetInfo> &)
+	UIEngineContainer__C16CStartedTestCase @ 51 NONAME R3UNUSED ; CStartedTestCase::UIEngineContainer(void) const
+	UIStore__10CUIStoreIf @ 52 NONAME R3UNUSED ; CUIStoreIf::UIStore(void)
+	"_._10CStifTFwIf" @ 53 NONAME R3UNUSED ; CStifTFwIf::~CStifTFwIf(void)
+	"_._10CUIStoreIf" @ 54 NONAME R3UNUSED ; CUIStoreIf::~CUIStoreIf(void)
+	__10CStifTFwIf @ 55 NONAME R3UNUSED ; CStifTFwIf::CStifTFwIf(void)
+	AbortTestSet__8CUIStoreR15CStartedTestSet @ 56 NONAME R3UNUSED ; CUIStore::AbortTestSet(CStartedTestSet &)
+
--- a/stif/StifTFwIf/Bwins/STIFTFWIFU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-EXPORTS
-	??0CStifTFwIf@@IAE@XZ @ 1 NONAME ; CStifTFwIf::CStifTFwIf(void)
-	??0CUIStoreIf@@IAE@XZ @ 2 NONAME ; CUIStoreIf::CUIStoreIf(void)
-	??1CStifTFwIf@@UAE@XZ @ 3 NONAME ; CStifTFwIf::~CStifTFwIf(void)
-	??1CUIStoreIf@@UAE@XZ @ 4 NONAME ; CUIStoreIf::~CUIStoreIf(void)
-	?AbortTestSet@CUIStore@@QAEHAAVCStartedTestSet@@@Z @ 5 NONAME ; int CUIStore::AbortTestSet(class CStartedTestSet &)
-	?AddTestCaseFile@CStifTFwIf@@IAEHAAVTDesC16@@0@Z @ 6 NONAME ; int CStifTFwIf::AddTestCaseFile(class TDesC16 &, class TDesC16 &)
-	?AddTestCaseFile@CUIStore@@QAEHABVTDesC16@@0@Z @ 7 NONAME ; int CUIStore::AddTestCaseFile(class TDesC16 const &, class TDesC16 const &)
-	?AddTestModule@CStifTFwIf@@IAEHAAVTDesC16@@0@Z @ 8 NONAME ; int CStifTFwIf::AddTestModule(class TDesC16 &, class TDesC16 &)
-	?AddTestModule@CUIStore@@QAEHABVTDesC16@@0@Z @ 9 NONAME ; int CUIStore::AddTestModule(class TDesC16 const &, class TDesC16 const &)
-	?AddToTestSet@CUIStore@@QAEHABVTDesC16@@ABVCTestInfo@@@Z @ 10 NONAME ; int CUIStore::AddToTestSet(class TDesC16 const &, class CTestInfo const &)
-	?AtsReceive@CStifTFwIf@@IAEHABVTDesC16@@@Z @ 11 NONAME ; int CStifTFwIf::AtsReceive(class TDesC16 const &)
-	?CancelTest@CUIEngineContainer@@QAEHXZ @ 12 NONAME ; int CUIEngineContainer::CancelTest(void)
-	?CancelTestCase@CStifTFwIf@@IAEHH@Z @ 13 NONAME ; int CStifTFwIf::CancelTestCase(int)
-	?Close@CStifTFwIf@@IAEHXZ @ 14 NONAME ; int CStifTFwIf::Close(void)
-	?Close@CUIStore@@QAEHXZ @ 15 NONAME ; int CUIStore::Close(void)
-	?ConstructL@CUIStoreIf@@IAEXXZ @ 16 NONAME ; void CUIStoreIf::ConstructL(void)
-	?CreateTestSet@CUIStore@@QAEHABVTDesC16@@@Z @ 17 NONAME ; int CUIStore::CreateTestSet(class TDesC16 const &)
-	?GetTestCases@CStifTFwIf@@IAEHAAV?$RPointerArray@VCTestInfo@@@@AAVTDesC16@@1@Z @ 18 NONAME ; int CStifTFwIf::GetTestCases(class RPointerArray<class CTestInfo> &, class TDesC16 &, class TDesC16 &)
-	?GoingToReboot@CStifTFw@@EAEHPAVCUIEngineContainer@@AAVTRequestStatus@@@Z @ 19 NONAME ; int CStifTFw::GoingToReboot(class CUIEngineContainer *, class TRequestStatus &)
-	?InsertToTestSet@CUIStore@@QAEHABVTDesC16@@ABVCTestInfo@@H@Z @ 20 NONAME ; int CUIStore::InsertToTestSet(class TDesC16 const &, class CTestInfo const &, int)
-	?ListAllModules@CUIStore@@QAEHAAV?$RPointerArray@VTDesC16@@@@@Z @ 21 NONAME ; int CUIStore::ListAllModules(class RPointerArray<class TDesC16> &)
-	?LoadAllModules@CUIStore@@QAEHXZ @ 22 NONAME ; int CUIStore::LoadAllModules(void)
-	?LoadSavedTestCases@CUIStore@@QAEHXZ @ 23 NONAME ; int CUIStore::LoadSavedTestCases(void)
-	?LoadTestSet@CUIStore@@QAEHABVTDesC16@@@Z @ 24 NONAME ; int CUIStore::LoadTestSet(class TDesC16 const &)
-	?Modules@CUIStore@@QAEHAAV?$RRefArray@VTDesC16@@@@@Z @ 25 NONAME ; int CUIStore::Modules(class RRefArray<class TDesC16> &)
-	?NewL@CTestInfo@@SAPAV1@XZ @ 26 NONAME ; class CTestInfo * CTestInfo::NewL(void)
-	?Open@CStifTFwIf@@IAEHAAVTDesC16@@@Z @ 27 NONAME ; int CStifTFwIf::Open(class TDesC16 &)
-	?Open@CUIStore@@QAEHABVTDesC16@@@Z @ 28 NONAME ; int CUIStore::Open(class TDesC16 const &)
-	?PauseTest@CUIEngineContainer@@QAEHXZ @ 29 NONAME ; int CUIEngineContainer::PauseTest(void)
-	?PauseTestCase@CStifTFwIf@@IAEHH@Z @ 30 NONAME ; int CStifTFwIf::PauseTestCase(int)
-	?PrintProg@CStifTFw@@EAEHPAVCUIEngineContainer@@AAVTTestProgress@@@Z @ 31 NONAME ; int CStifTFw::PrintProg(class CUIEngineContainer *, class TTestProgress &)
-	?RemoteMsg@CStifTFw@@EAEHPAVCUIEngineContainer@@ABVTDesC16@@@Z @ 32 NONAME ; int CStifTFw::RemoteMsg(class CUIEngineContainer *, class TDesC16 const &)
-	?RemoveFromTestSet@CUIStore@@QAEHABVTDesC16@@ABVCTestInfo@@@Z @ 33 NONAME ; int CUIStore::RemoveFromTestSet(class TDesC16 const &, class CTestInfo const &)
-	?RemoveTestCaseFile@CStifTFwIf@@IAEHAAVTDesC16@@0@Z @ 34 NONAME ; int CStifTFwIf::RemoveTestCaseFile(class TDesC16 &, class TDesC16 &)
-	?RemoveTestCaseFile@CUIStore@@QAEHABVTDesC16@@0@Z @ 35 NONAME ; int CUIStore::RemoveTestCaseFile(class TDesC16 const &, class TDesC16 const &)
-	?RemoveTestModule@CStifTFwIf@@IAEHAAVTDesC16@@@Z @ 36 NONAME ; int CStifTFwIf::RemoveTestModule(class TDesC16 &)
-	?RemoveTestModule@CUIStore@@QAEHABVTDesC16@@@Z @ 37 NONAME ; int CUIStore::RemoveTestModule(class TDesC16 const &)
-	?RemoveTestSet@CUIStore@@QAEHABVTDesC16@@@Z @ 38 NONAME ; int CUIStore::RemoveTestSet(class TDesC16 const &)
-	?ResumeTest@CUIEngineContainer@@QAEHXZ @ 39 NONAME ; int CUIEngineContainer::ResumeTest(void)
-	?ResumeTestCase@CStifTFwIf@@IAEHH@Z @ 40 NONAME ; int CStifTFwIf::ResumeTestCase(int)
-	?SaveTestSet@CUIStore@@QAEHABVTDesC16@@@Z @ 41 NONAME ; int CUIStore::SaveTestSet(class TDesC16 const &)
-	?SetAttribute@CStifTFwIf@@IAEHW4TAttribute@@ABVTDesC16@@@Z @ 42 NONAME ; int CStifTFwIf::SetAttribute(enum TAttribute, class TDesC16 const &)
-	?StartTestCase@CStifTFwIf@@IAEHAAHABVCTestInfo@@@Z @ 43 NONAME ; int CStifTFwIf::StartTestCase(int &, class CTestInfo const &)
-	?StartTestCase@CUIStore@@QAEHABVCTestInfo@@AAH@Z @ 44 NONAME ; int CUIStore::StartTestCase(class CTestInfo const &, int &)
-	?StartTestSet@CUIStore@@QAEHABVCTestSetInfo@@AAHW4TSetType@CStartedTestSet@@@Z @ 45 NONAME ; int CUIStore::StartTestSet(class CTestSetInfo const &, int &, enum CStartedTestSet::TSetType)
-	?StartedTestCaseL@CUIStore@@QAEAAVCStartedTestCase@@H@Z @ 46 NONAME ; class CStartedTestCase & CUIStore::StartedTestCaseL(int)
-	?StartedTestCases@CUIStore@@QAEHAAV?$RRefArray@VCStartedTestCase@@@@HABVTDesC16@@1@Z @ 47 NONAME ; int CUIStore::StartedTestCases(class RRefArray<class CStartedTestCase> &, int, class TDesC16 const &, class TDesC16 const &)
-	?StartedTestSetL@CUIStore@@QAEAAVCStartedTestSet@@H@Z @ 48 NONAME ; class CStartedTestSet & CUIStore::StartedTestSetL(int)
-	?StartedTestSets@CUIStore@@QAEHAAV?$RRefArray@VCStartedTestSet@@@@H@Z @ 49 NONAME ; int CUIStore::StartedTestSets(class RRefArray<class CStartedTestSet> &, int)
-	?TestCaseFiles@CUIStore@@QAEHAAV?$RRefArray@VTDesC16@@@@ABVTDesC16@@@Z @ 50 NONAME ; int CUIStore::TestCaseFiles(class RRefArray<class TDesC16> &, class TDesC16 const &)
-	?TestCases@CUIStore@@QAEHAAV?$RRefArray@VCTestInfo@@@@ABVTDesC16@@1@Z @ 51 NONAME ; int CUIStore::TestCases(class RRefArray<class CTestInfo> &, class TDesC16 const &, class TDesC16 const &)
-	?TestExecuted@CStifTFw@@EAEXPAVCUIEngineContainer@@AAVTFullTestResult@@@Z @ 52 NONAME ; void CStifTFw::TestExecuted(class CUIEngineContainer *, class TFullTestResult &)
-	?TestSetL@CUIStore@@QAEABVCTestSetInfo@@ABVTDesC16@@@Z @ 53 NONAME ; class CTestSetInfo const & CUIStore::TestSetL(class TDesC16 const &)
-	?TestSets@CUIStore@@QAEHAAV?$RRefArray@VCTestSetInfo@@@@@Z @ 54 NONAME ; int CUIStore::TestSets(class RRefArray<class CTestSetInfo> &)
-	?UIEngineContainer@CStartedTestCase@@QBEAAVCUIEngineContainer@@XZ @ 55 NONAME ; class CUIEngineContainer & CStartedTestCase::UIEngineContainer(void) const
-	?UIStore@CUIStoreIf@@QAEAAVCUIStore@@XZ @ 56 NONAME ; class CUIStore & CUIStoreIf::UIStore(void)
-	?StartTestSet@CUIStore@@QAEHABVCTestSetInfo@@AAHW4TSetType@CStartedTestSet@@H@Z @ 57 NONAME ; int CUIStore::StartTestSet(class CTestSetInfo const &, int &, enum CStartedTestSet::TSetType, int)
-	?UpdateTestSet@CUIStore@@QAEHAAVCTestSetInfo@@@Z @ 58 NONAME ; int CUIStore::UpdateTestSet(class CTestSetInfo &)
-	?ReadFiltersL@CUIStore@@QAEXAAV?$RPointerArray@VTDesC16@@@@@Z @ 59 NONAME ; void CUIStore::ReadFiltersL(class RPointerArray<class TDesC16> &)
-	?GetTestSetsList@CUIStore@@QAEHAAV?$RRefArray@VTDesC16@@@@@Z @ 60 NONAME ; int CUIStore::GetTestSetsList(class RRefArray<class TDesC16> &)
-	?SaveTestSet2@CUIStore@@QAEHAAVTDes16@@@Z @ 61 NONAME ; int CUIStore::SaveTestSet2(class TDes16 &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/StifTFwIf/Bwins/StifTFwIfu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,63 @@
+EXPORTS
+	??0CStifTFwIf@@IAE@XZ @ 1 NONAME ; CStifTFwIf::CStifTFwIf(void)
+	??0CUIStoreIf@@IAE@XZ @ 2 NONAME ; CUIStoreIf::CUIStoreIf(void)
+	??1CStifTFwIf@@UAE@XZ @ 3 NONAME ; CStifTFwIf::~CStifTFwIf(void)
+	??1CUIStoreIf@@UAE@XZ @ 4 NONAME ; CUIStoreIf::~CUIStoreIf(void)
+	?AbortTestSet@CUIStore@@QAEHAAVCStartedTestSet@@@Z @ 5 NONAME ; int CUIStore::AbortTestSet(class CStartedTestSet &)
+	?AddTestCaseFile@CStifTFwIf@@IAEHAAVTDesC16@@0@Z @ 6 NONAME ; int CStifTFwIf::AddTestCaseFile(class TDesC16 &, class TDesC16 &)
+	?AddTestCaseFile@CUIStore@@QAEHABVTDesC16@@0@Z @ 7 NONAME ; int CUIStore::AddTestCaseFile(class TDesC16 const &, class TDesC16 const &)
+	?AddTestModule@CStifTFwIf@@IAEHAAVTDesC16@@0@Z @ 8 NONAME ; int CStifTFwIf::AddTestModule(class TDesC16 &, class TDesC16 &)
+	?AddTestModule@CUIStore@@QAEHABVTDesC16@@0@Z @ 9 NONAME ; int CUIStore::AddTestModule(class TDesC16 const &, class TDesC16 const &)
+	?AddToTestSet@CUIStore@@QAEHABVTDesC16@@ABVCTestInfo@@@Z @ 10 NONAME ; int CUIStore::AddToTestSet(class TDesC16 const &, class CTestInfo const &)
+	?AtsReceive@CStifTFwIf@@IAEHABVTDesC16@@@Z @ 11 NONAME ; int CStifTFwIf::AtsReceive(class TDesC16 const &)
+	?CancelTest@CUIEngineContainer@@QAEHXZ @ 12 NONAME ; int CUIEngineContainer::CancelTest(void)
+	?CancelTestCase@CStifTFwIf@@IAEHH@Z @ 13 NONAME ; int CStifTFwIf::CancelTestCase(int)
+	?Close@CStifTFwIf@@IAEHXZ @ 14 NONAME ; int CStifTFwIf::Close(void)
+	?Close@CUIStore@@QAEHXZ @ 15 NONAME ; int CUIStore::Close(void)
+	?ConstructL@CUIStoreIf@@IAEXXZ @ 16 NONAME ; void CUIStoreIf::ConstructL(void)
+	?CreateTestSet@CUIStore@@QAEHABVTDesC16@@@Z @ 17 NONAME ; int CUIStore::CreateTestSet(class TDesC16 const &)
+	?GetTestCases@CStifTFwIf@@IAEHAAV?$RPointerArray@VCTestInfo@@@@AAVTDesC16@@1@Z @ 18 NONAME ; int CStifTFwIf::GetTestCases(class RPointerArray<class CTestInfo> &, class TDesC16 &, class TDesC16 &)
+	?GoingToReboot@CStifTFw@@EAEHPAVCUIEngineContainer@@AAVTRequestStatus@@@Z @ 19 NONAME ; int CStifTFw::GoingToReboot(class CUIEngineContainer *, class TRequestStatus &)
+	?InsertToTestSet@CUIStore@@QAEHABVTDesC16@@ABVCTestInfo@@H@Z @ 20 NONAME ; int CUIStore::InsertToTestSet(class TDesC16 const &, class CTestInfo const &, int)
+	?ListAllModules@CUIStore@@QAEHAAV?$RPointerArray@VTDesC16@@@@@Z @ 21 NONAME ; int CUIStore::ListAllModules(class RPointerArray<class TDesC16> &)
+	?LoadAllModules@CUIStore@@QAEHXZ @ 22 NONAME ; int CUIStore::LoadAllModules(void)
+	?LoadSavedTestCases@CUIStore@@QAEHXZ @ 23 NONAME ; int CUIStore::LoadSavedTestCases(void)
+	?LoadTestSet@CUIStore@@QAEHABVTDesC16@@@Z @ 24 NONAME ; int CUIStore::LoadTestSet(class TDesC16 const &)
+	?Modules@CUIStore@@QAEHAAV?$RRefArray@VTDesC16@@@@@Z @ 25 NONAME ; int CUIStore::Modules(class RRefArray<class TDesC16> &)
+	?NewL@CTestInfo@@SAPAV1@XZ @ 26 NONAME ; class CTestInfo * CTestInfo::NewL(void)
+	?Open@CStifTFwIf@@IAEHAAVTDesC16@@@Z @ 27 NONAME ; int CStifTFwIf::Open(class TDesC16 &)
+	?Open@CUIStore@@QAEHABVTDesC16@@@Z @ 28 NONAME ; int CUIStore::Open(class TDesC16 const &)
+	?PauseTest@CUIEngineContainer@@QAEHXZ @ 29 NONAME ; int CUIEngineContainer::PauseTest(void)
+	?PauseTestCase@CStifTFwIf@@IAEHH@Z @ 30 NONAME ; int CStifTFwIf::PauseTestCase(int)
+	?PrintProg@CStifTFw@@EAEHPAVCUIEngineContainer@@AAVTTestProgress@@@Z @ 31 NONAME ; int CStifTFw::PrintProg(class CUIEngineContainer *, class TTestProgress &)
+	?RemoteMsg@CStifTFw@@EAEHPAVCUIEngineContainer@@ABVTDesC16@@@Z @ 32 NONAME ; int CStifTFw::RemoteMsg(class CUIEngineContainer *, class TDesC16 const &)
+	?RemoveFromTestSet@CUIStore@@QAEHABVTDesC16@@ABVCTestInfo@@@Z @ 33 NONAME ; int CUIStore::RemoveFromTestSet(class TDesC16 const &, class CTestInfo const &)
+	?RemoveTestCaseFile@CStifTFwIf@@IAEHAAVTDesC16@@0@Z @ 34 NONAME ; int CStifTFwIf::RemoveTestCaseFile(class TDesC16 &, class TDesC16 &)
+	?RemoveTestCaseFile@CUIStore@@QAEHABVTDesC16@@0@Z @ 35 NONAME ; int CUIStore::RemoveTestCaseFile(class TDesC16 const &, class TDesC16 const &)
+	?RemoveTestModule@CStifTFwIf@@IAEHAAVTDesC16@@@Z @ 36 NONAME ; int CStifTFwIf::RemoveTestModule(class TDesC16 &)
+	?RemoveTestModule@CUIStore@@QAEHABVTDesC16@@@Z @ 37 NONAME ; int CUIStore::RemoveTestModule(class TDesC16 const &)
+	?RemoveTestSet@CUIStore@@QAEHABVTDesC16@@@Z @ 38 NONAME ; int CUIStore::RemoveTestSet(class TDesC16 const &)
+	?ResumeTest@CUIEngineContainer@@QAEHXZ @ 39 NONAME ; int CUIEngineContainer::ResumeTest(void)
+	?ResumeTestCase@CStifTFwIf@@IAEHH@Z @ 40 NONAME ; int CStifTFwIf::ResumeTestCase(int)
+	?SaveTestSet@CUIStore@@QAEHABVTDesC16@@@Z @ 41 NONAME ; int CUIStore::SaveTestSet(class TDesC16 const &)
+	?SetAttribute@CStifTFwIf@@IAEHW4TAttribute@@ABVTDesC16@@@Z @ 42 NONAME ; int CStifTFwIf::SetAttribute(enum TAttribute, class TDesC16 const &)
+	?StartTestCase@CStifTFwIf@@IAEHAAHABVCTestInfo@@@Z @ 43 NONAME ; int CStifTFwIf::StartTestCase(int &, class CTestInfo const &)
+	?StartTestCase@CUIStore@@QAEHABVCTestInfo@@AAH@Z @ 44 NONAME ; int CUIStore::StartTestCase(class CTestInfo const &, int &)
+	?StartTestSet@CUIStore@@QAEHABVCTestSetInfo@@AAHW4TSetType@CStartedTestSet@@@Z @ 45 NONAME ; int CUIStore::StartTestSet(class CTestSetInfo const &, int &, enum CStartedTestSet::TSetType)
+	?StartedTestCaseL@CUIStore@@QAEAAVCStartedTestCase@@H@Z @ 46 NONAME ; class CStartedTestCase & CUIStore::StartedTestCaseL(int)
+	?StartedTestCases@CUIStore@@QAEHAAV?$RRefArray@VCStartedTestCase@@@@HABVTDesC16@@1@Z @ 47 NONAME ; int CUIStore::StartedTestCases(class RRefArray<class CStartedTestCase> &, int, class TDesC16 const &, class TDesC16 const &)
+	?StartedTestSetL@CUIStore@@QAEAAVCStartedTestSet@@H@Z @ 48 NONAME ; class CStartedTestSet & CUIStore::StartedTestSetL(int)
+	?StartedTestSets@CUIStore@@QAEHAAV?$RRefArray@VCStartedTestSet@@@@H@Z @ 49 NONAME ; int CUIStore::StartedTestSets(class RRefArray<class CStartedTestSet> &, int)
+	?TestCaseFiles@CUIStore@@QAEHAAV?$RRefArray@VTDesC16@@@@ABVTDesC16@@@Z @ 50 NONAME ; int CUIStore::TestCaseFiles(class RRefArray<class TDesC16> &, class TDesC16 const &)
+	?TestCases@CUIStore@@QAEHAAV?$RRefArray@VCTestInfo@@@@ABVTDesC16@@1@Z @ 51 NONAME ; int CUIStore::TestCases(class RRefArray<class CTestInfo> &, class TDesC16 const &, class TDesC16 const &)
+	?TestExecuted@CStifTFw@@EAEXPAVCUIEngineContainer@@AAVTFullTestResult@@@Z @ 52 NONAME ; void CStifTFw::TestExecuted(class CUIEngineContainer *, class TFullTestResult &)
+	?TestSetL@CUIStore@@QAEABVCTestSetInfo@@ABVTDesC16@@@Z @ 53 NONAME ; class CTestSetInfo const & CUIStore::TestSetL(class TDesC16 const &)
+	?TestSets@CUIStore@@QAEHAAV?$RRefArray@VCTestSetInfo@@@@@Z @ 54 NONAME ; int CUIStore::TestSets(class RRefArray<class CTestSetInfo> &)
+	?UIEngineContainer@CStartedTestCase@@QBEAAVCUIEngineContainer@@XZ @ 55 NONAME ; class CUIEngineContainer & CStartedTestCase::UIEngineContainer(void) const
+	?UIStore@CUIStoreIf@@QAEAAVCUIStore@@XZ @ 56 NONAME ; class CUIStore & CUIStoreIf::UIStore(void)
+	?StartTestSet@CUIStore@@QAEHABVCTestSetInfo@@AAHW4TSetType@CStartedTestSet@@H@Z @ 57 NONAME ; int CUIStore::StartTestSet(class CTestSetInfo const &, int &, enum CStartedTestSet::TSetType, int)
+	?UpdateTestSet@CUIStore@@QAEHAAVCTestSetInfo@@@Z @ 58 NONAME ; int CUIStore::UpdateTestSet(class CTestSetInfo &)
+	?ReadFiltersL@CUIStore@@QAEXAAV?$RPointerArray@VTDesC16@@@@@Z @ 59 NONAME ; void CUIStore::ReadFiltersL(class RPointerArray<class TDesC16> &)
+	?GetTestSetsList@CUIStore@@QAEHAAV?$RRefArray@VTDesC16@@@@@Z @ 60 NONAME ; int CUIStore::GetTestSetsList(class RRefArray<class TDesC16> &)
+	?SaveTestSet2@CUIStore@@QAEHAAVTDes16@@@Z @ 61 NONAME ; int CUIStore::SaveTestSet2(class TDes16 &)
+
--- a/stif/StifTFwIf/src/UIEngineContainer.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/StifTFwIf/src/UIEngineContainer.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -480,7 +480,6 @@
         {
         // Call TestExecuted of CUIEngine interface
         iUIEngine->TestExecuted(this, iRunner->FullResult() );
-        iState = EFinished;
         }
     }
     
--- a/stif/TestCombiner/Bmarm/TESTCOMBINERU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestCombiner/Bmarm/testcombineru.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
+
--- a/stif/TestCombiner/Bwins/TESTCOMBINERU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCTestCombiner@@XZ @ 1 NONAME ; class CTestCombiner * __cdecl LibEntryL(void)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestCombiner/Bwins/testcombineru.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCTestCombiner@@XZ @ 1 NONAME ; class CTestCombiner * __cdecl LibEntryL(void)
+
--- a/stif/TestCombiner/inc/TestCase.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestCombiner/inc/TestCase.h	Mon Jun 14 11:37:33 2010 +0300
@@ -207,8 +207,8 @@
                                   TDesC& aModuleName,
                                   TDesC& aTestId,
                                   TInt aExpectedResult,
-                                  TFullTestResult::TCaseExecutionResult
-                                        aCategory,
+                                  TFullTestResult::TCaseExecutionResult aCategory,
+                                  const TDesC& aTestCaseArguments,
                                   CTCTestModule* aModule ); //--PYTHON--
 
         /**
@@ -228,6 +228,11 @@
         const TDesC& ModuleName(){ return *iModuleName; }
 
         /**
+         * Get test case arguments
+         */
+        const TDesC& TestCaseArguments() const;
+        
+        /**
         * Get reference to RTestExecution.
         */
         RTestExecution& TestExecution(){ return iTestExecution; }
@@ -269,12 +274,13 @@
         CTCTestCase( CTestCombiner* testCombiner,
                      TInt aExpectedResult,
                      TFullTestResult::TCaseExecutionResult aCategory,
+                     const TDesC& aTestCaseArguments,
                      CTCTestModule* aModule ); //--PYTHON--
 
         /**
         * By default Symbian OS constructor is private.
         */
-        void ConstructL( TDesC& aModuleName, TDesC& aTestId );
+        void ConstructL( TDesC& aModuleName, TDesC& aTestId, const TDesC& aTestCaseArguments );
 
         /**
         * Start complete the testcase(Complete2 make the final complete).
@@ -298,6 +304,9 @@
         // Module name
         HBufC*                  iModuleName;
 
+        // Test case arguments
+        HBufC*                  iTestCaseArguments;
+        
         // Handle to test case execution
         RTestExecution          iTestExecution;
 
--- a/stif/TestCombiner/inc/TestCombiner.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestCombiner/inc/TestCombiner.h	Mon Jun 14 11:37:33 2010 +0300
@@ -655,6 +655,10 @@
         RTimer                      iPauseTimer;
         TName                       iPausedTestCase;
         TInt                        iPauseTime;
+        
+        // Pause combiner timer
+        RTimer                      iPauseCombTimer;
+        TInt                        iPauseCombRemainingTime;
 
         // Temporary line buffer 
         HBufC*                      iLine;
--- a/stif/TestCombiner/inc/TestCombinerUtils.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestCombiner/inc/TestCombinerUtils.h	Mon Jun 14 11:37:33 2010 +0300
@@ -91,6 +91,11 @@
         */
         void SetTitleL(TDesC& aTitle);
 
+        /**
+         * Sets test case arguments.
+         */
+        void SetTestCaseArgumentsL( const TDesC& aTestCaseArguments );
+
     private:
         /**
         * C++ default constructor.
@@ -112,6 +117,7 @@
         TFullTestResult::TCaseExecutionResult iCategory;
         TInt    iTimeout;
         TPtrC   iTitle;
+		TPtrC   iTestCaseArguments;
         
     private:
         HBufC*  iModuleBuf;
@@ -119,7 +125,7 @@
         HBufC*  iConfigBuf;
         HBufC*  iTestIdBuf;
         HBufC*  iTitleBuf;
-    
+        HBufC*  iTestCaseArgumentsBuf;
     };
     
 // CLASS DECLARATION
--- a/stif/TestCombiner/inc/TestKeywords.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestCombiner/inc/TestKeywords.h	Mon Jun 14 11:37:33 2010 +0300
@@ -82,6 +82,7 @@
             ECategory,
             ECaseTimeout,
             ECaseTitle,
+            EArgs,			
             };
 
         // pause keyword optional arguments
--- a/stif/TestCombiner/src/TestCase.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestCombiner/src/TestCase.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -336,6 +336,7 @@
 CTCTestCase::CTCTestCase( CTestCombiner* testCombiner,
                           TInt aExpectedResult,
                           TFullTestResult::TCaseExecutionResult aCategory,
+                          const TDesC& aTestCaseArguments,
                           CTCTestModule* aModule ): //--PYTHON
     CTestCase( testCombiner, aExpectedResult, aCategory, ECaseLocal, aModule ), //--PYTHON
     iResultPckg( iResult )
@@ -365,12 +366,13 @@
 */
 
 void CTCTestCase::ConstructL( TDesC& aModuleName,
-                              TDesC& aTestId )
+                              TDesC& aTestId,
+                              const TDesC& aTestCaseArguments )
     {
     __ASSERT_ALWAYS( aModuleName.Length() < KMaxFileName, User::Leave( KErrArgument ) );
     CTestCase::ConstructL( aTestId );
     iModuleName = aModuleName.AllocL();
-    
+    iTestCaseArguments = aTestCaseArguments.AllocL();
     }
 
 /*
@@ -397,17 +399,18 @@
                                 TDesC& aModuleName,
                                 TDesC& aTestId,
                                 TInt aExpectedResult,
-                                TFullTestResult::TCaseExecutionResult
-                                    aCategory,
+                                TFullTestResult::TCaseExecutionResult aCategory,
+                                const TDesC& aTestCaseArguments,
                                 CTCTestModule* aModule ) //--PYTHON
     {
     CTCTestCase* self = new (ELeave) CTCTestCase( testCombiner,
                                                    aExpectedResult,
                                                    aCategory,
+                                                   aTestCaseArguments,
                                                    aModule ); //--PYTHON
      
     CleanupStack::PushL( self );
-    self->ConstructL( aModuleName, aTestId );
+    self->ConstructL( aModuleName, aTestId, aTestCaseArguments );
     CleanupStack::Pop();
     return self;
      
@@ -475,6 +478,7 @@
     
     delete iProgress;
     delete iModuleName;
+    delete iTestCaseArguments;
     
     delete iCommand;
     }
@@ -484,6 +488,34 @@
 
      Class: CTCTestCase
 
+     Method: TestCaseArguments
+
+     Description: Get test case arguments
+
+     Parameters: None.
+
+     Return Values: Test case arguments.
+
+     Errors/Exceptions: None.
+
+     Status: Proposal
+    
+-------------------------------------------------------------------------------
+*/
+const TDesC& CTCTestCase::TestCaseArguments() const 
+    {
+    if ( iTestCaseArguments !=NULL ) 
+        {
+        return *iTestCaseArguments; 
+        }
+    return KNullDesC;
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+     Class: CTCTestCase
+
      Method: DoCancel
 
      Description: Derived from CActive, handles the Cancel.
--- a/stif/TestCombiner/src/TestCombiner.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestCombiner/src/TestCombiner.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -1652,6 +1652,7 @@
                            aStartInfo.iTestId, 
                            aStartInfo.iExpectedResult, 
                            aStartInfo.iCategory,
+                           aStartInfo.iTestCaseArguments,
                            module ); //--PYTHON--
 
     CleanupStack::PushL( tc );
@@ -1694,7 +1695,14 @@
          &aStartInfo.iTestId, &aStartInfo.iModule, &aStartInfo.iIniFile, 
          &aStartInfo.iConfig, aStartInfo.iCaseNum, aStartInfo.iExpectedResult );
 
-    tc->TestExecution().RunTestCase( tc->iResultPckg, tc->iStatus );
+    if ( tc->TestCaseArguments().Length() > 0 )
+        {
+        tc->TestExecution().RunTestCase( tc->iResultPckg, tc->TestCaseArguments(), tc->iStatus );
+        }
+    else
+        {
+        tc->TestExecution().RunTestCase( tc->iResultPckg, tc->iStatus );
+        }
 
     iRunningTests++;
 
@@ -2445,8 +2453,21 @@
 */
 void CTestRunner::ConstructL()
     {
-    
-    iPauseTimer.CreateLocal();
+    TInt ret;
+    
+    ret = iPauseTimer.CreateLocal();
+    if(ret != KErrNone)
+        {
+        __TRACE( KError, (_L("Unable to create RTimer: iPauseTimer [%d] "), ret));
+        User::Leave(ret);
+        }
+        
+    ret = iPauseCombTimer.CreateLocal();
+    if(ret != KErrNone)
+        {
+        __TRACE( KError, (_L("Unable to create RTimer: iPauseCombTimer [%d] "), ret));
+        User::Leave(ret);
+        }
     
     iRemoteTimer = CRemoteTimer::NewL( iTestCombiner );
     
@@ -2515,6 +2536,8 @@
     iLine = 0;
     
     iPauseTimer.Close();
+    
+    iPauseCombTimer.Close();
          
     }
 
@@ -2550,8 +2573,34 @@
         User::Leave( KErrGeneral );
         }
         
-    TBool continueTask = EFalse; 
+    TBool continueTask = EFalse;
+    
+    // Check if there is still some time for combiner pause and we need to 
+    // continue pausing
+    if(iPauseCombRemainingTime > 0)
+        {           
+        // Maximum time for one RTimer::After request                   
+        TInt maximumTime = KMaxTInt / 1000;                       
+        
+        __TRACE( KMessage, (_L("CTestRunner::RunL: Going to reissue PauseCombiner request ") ) );           
+        __TRACE( KMessage, (_L("CTestRunner::RunL: iRemainingTimeValue = %d"), iPauseCombRemainingTime ) );        
         
+        if( iPauseCombRemainingTime < maximumTime )
+            {                           
+            iPauseCombTimer.After(iStatus, (iPauseCombRemainingTime * 1000));
+            iPauseCombRemainingTime = 0;
+            }
+        else
+            {            
+            iPauseCombRemainingTime -= maximumTime;
+            iPauseCombTimer.After(iStatus, (maximumTime * 1000));        
+            }     
+            
+        SetActive();
+        return;
+        }     
+ 
+    // Handling runner states
     switch( iState )
         {
         case ERunnerWaitTimeout:
@@ -2695,6 +2744,8 @@
     __TRACE( KMessage, (_L("CTestRunner::DoCancel")));
     iTestCombiner->TestModuleIf().Printf( KPrintPriLow, _L("Runner"), _L("DoCancel"));
     
+    iPauseCombTimer.Cancel();
+    
     switch( iState )
         {
         case ERunnerWaitTimeout:
@@ -3243,6 +3294,12 @@
                 aStartInfo.SetTitleL(val);
                 break;
            	    }
+            case TTCKeywords::EArgs:
+                {
+                __TRACE( KMessage, (_L("case arguments=%S"), &val));
+                aStartInfo.SetTestCaseArgumentsL( val );
+                }
+                break;				
             default:
 				{
                 __TRACE( KError, (_L("Unknown or illegal keyword")));
@@ -3397,7 +3454,7 @@
 	_LIT( KErrMsgPauseTimeoutNotDefined, "PauseCombiner : No timeout value given or value has invalid format" );
 	_LIT( KErrMsgPauseTimeoutNotPositive, "PauseCombiner : Timeout value can't be <0" );
 
-    TBool continueTask = ETrue;
+    TBool continueTask = EFalse;
     TInt pauseTime;
     TInt ret = KErrNone;
     
@@ -3416,12 +3473,31 @@
         User::Leave( KErrArgument );
         }    
     
-    //Time given by End User should be given in miliseconds
-    pauseTime*=1000;
-
-    __TRACE( KMessage, (_L("time=%d"), pauseTime ) );
-
-    User::After( pauseTime );
+    
+    // Maximum time for one RTimer::After request
+    TInt maximumTime = KMaxTInt / 1000;
+
+    // Check if pause value is suitable for RTimer::After
+    if(pauseTime < maximumTime)
+        {
+        iPauseCombTimer.After(iStatus, pauseTime * 1000);
+        iPauseCombRemainingTime = 0;
+        }
+    else
+        {
+        // Given pause value after multiplication with 1000 is
+        // larger than KMaxTInt, so we need to split it and 
+        // re-request After with remaining value from RunL
+
+        iPauseCombRemainingTime = pauseTime - maximumTime;
+        iPauseCombTimer.After(iStatus, maximumTime * 1000);
+        }
+
+    SetActive();
+
+    __TRACE(KMessage, (_L("Executing pause, time=[%d]"), pauseTime));
+    
+    iState = ERunnerRunning;
     
     return continueTask;
 }
--- a/stif/TestCombiner/src/TestCombinerUtils.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestCombiner/src/TestCombinerUtils.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -86,7 +86,8 @@
     iIniFileBuf(0),
     iConfigBuf(0),
     iTestIdBuf(0),
-    iTitleBuf(0)
+    iTitleBuf(0),
+	iTestCaseArgumentsBuf(0)
     {
 
     iCategory = TFullTestResult::ECaseExecuted; 
@@ -177,6 +178,7 @@
     delete iConfigBuf;
     delete iTestIdBuf;
     delete iTitleBuf;
+	delete iTestCaseArgumentsBuf;
     }
 
 /*
@@ -355,6 +357,34 @@
 /*
 -------------------------------------------------------------------------------
 
+     Class: CStartInfo
+
+     Method: SetTestCaseArguments
+
+     Description: Sets test case arguments
+     
+     Parameters:  const TDesC& aTestCaseArguments: in: test case arguments.
+     
+     Return Values: None
+
+     Errors/Exceptions: None
+
+     Status: Proposal
+    
+-------------------------------------------------------------------------------
+*/        
+void CStartInfo::SetTestCaseArgumentsL( const TDesC& aTestCaseArguments )
+    {
+    delete iTestCaseArgumentsBuf;
+	iTestCaseArgumentsBuf = NULL;
+    iTestCaseArgumentsBuf = aTestCaseArguments.AllocL();
+	iTestCaseArguments.Set( iTestCaseArgumentsBuf->Des() );
+    }
+
+
+/*
+-------------------------------------------------------------------------------
+
     DESCRIPTION
 
     This module contains the implementation of CSlaveInfo class 
--- a/stif/TestCombiner/src/TestKeywords.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestCombiner/src/TestKeywords.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -139,6 +139,7 @@
         (TText*)L"category",
         (TText*)L"timeout",
         (TText*)L"title",
+        (TText*)L"args",
         };
 
     if( aArg >= (TInt)(sizeof( runOptArgs )/sizeof(TText*)) )
--- a/stif/TestEngine/BMARM/STIFTESTENGINEU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-EXPORTS
-	__14RSettingServer @ 1 NONAME R3UNUSED ; RSettingServer::RSettingServer(void)
-	AddTestModule__11RTestEngineRCt4TBuf1i128RCt4TBuf1i256 @ 2 NONAME R3UNUSED ; RTestEngine::AddTestModule(TBuf<128> const &, TBuf<256> const &)
-	CancelAsyncRequest__11RTestEnginei @ 3 NONAME R3UNUSED ; RTestEngine::CancelAsyncRequest(int)
-	CancelAsyncRequest__9RTestCasei @ 4 NONAME R3UNUSED ; RTestCase::CancelAsyncRequest(int)
-	Close__11RTestEngine @ 5 NONAME R3UNUSED ; RTestEngine::Close(void)
-	Close__14RSettingServer @ 6 NONAME R3UNUSED ; RSettingServer::Close(void)
-	Close__17RTestEngineServer @ 7 NONAME R3UNUSED ; RTestEngineServer::Close(void)
-	Close__9RTestCase @ 8 NONAME R3UNUSED ; RTestCase::Close(void)
-	Connect__14RSettingServer @ 9 NONAME R3UNUSED ; RSettingServer::Connect(void)
-	Connect__17RTestEngineServer @ 10 NONAME R3UNUSED ; RTestEngineServer::Connect(void)
-	EnumerateTestCases__11RTestEngineRt8TPckgBuf1ZiR14TRequestStatus @ 11 NONAME R3UNUSED ; RTestEngine::EnumerateTestCases(TPckgBuf<int> &, TRequestStatus &)
-	ErrorNotification__11RTestEngineRt5TPckg1Z18TErrorNotificationR14TRequestStatus @ 12 NONAME R3UNUSED ; RTestEngine::ErrorNotification(TPckg<TErrorNotification> &, TRequestStatus &)
-	Event__11RTestEngineRt5TPckg1Z8TEventIfR14TRequestStatus @ 13 NONAME R3UNUSED ; RTestEngine::Event(TPckg<TEventIf> &, TRequestStatus &)
-	GetBooleanSettingsL__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16Ri @ 14 NONAME ; CSTIFTestFrameworkSettings::GetBooleanSettingsL(CStifSectionParser *, TPtrC16, int &)
-	GetFileSetting__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16R7TPtrC16 @ 15 NONAME ; CSTIFTestFrameworkSettings::GetFileSetting(CStifSectionParser *, TPtrC16, TPtrC16 &)
-	GetFormatL__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16RQ211CStifLogger11TLoggerType @ 16 NONAME ; CSTIFTestFrameworkSettings::GetFormatL(CStifSectionParser *, TPtrC16, CStifLogger::TLoggerType &)
-	GetLoggerSettings__14RSettingServerR15TLoggerSettings @ 17 NONAME R3UNUSED ; RSettingServer::GetLoggerSettings(TLoggerSettings &)
-	GetOutputL__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16RQ211CStifLogger7TOutput @ 18 NONAME ; CSTIFTestFrameworkSettings::GetOutputL(CStifSectionParser *, TPtrC16, CStifLogger::TOutput &)
-	GetOverwriteL__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16Ri @ 19 NONAME ; CSTIFTestFrameworkSettings::GetOverwriteL(CStifSectionParser *, TPtrC16, int &)
-	GetReportModeL__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16RUi @ 20 NONAME ; CSTIFTestFrameworkSettings::GetReportModeL(CStifSectionParser *, TPtrC16, unsigned int &)
-	GetTestCases__11RTestEngineRt15CFixedFlatArray1Z9TTestInfo @ 21 NONAME R3UNUSED ; RTestEngine::GetTestCases(CFixedFlatArray<TTestInfo> &)
-	NewL__26CSTIFTestFrameworkSettings @ 22 NONAME R3UNUSED ; CSTIFTestFrameworkSettings::NewL(void)
-	NotifyProgress__9RTestCaseRt5TPckg1Z13TTestProgressR14TRequestStatus @ 23 NONAME R3UNUSED ; RTestCase::NotifyProgress(TPckg<TTestProgress> &, TRequestStatus &)
-	NotifyRemoteMsg__9RTestCaseR5TDes812TStifCommand @ 24 NONAME R3UNUSED ; RTestCase::NotifyRemoteMsg(TDes8 &, TStifCommand)
-	NotifyRemoteType__9RTestCaseRt5TPckg1Z12TStifCommandRt5TPckg1ZiR14TRequestStatus @ 25 NONAME ; RTestCase::NotifyRemoteType(TPckg<TStifCommand> &, TPckg<int> &, TRequestStatus &)
-	OpenLoggerSession__11RTestEngineR17RTestEngineServerR15TLoggerSettings @ 26 NONAME R3UNUSED ; RTestEngine::OpenLoggerSession(RTestEngineServer &, TLoggerSettings &)
-	Open__11RTestEngineR17RTestEngineServerRCt4TBuf1i256 @ 27 NONAME R3UNUSED ; RTestEngine::Open(RTestEngineServer &, TBuf<256> const &)
-	Open__9RTestCaseR17RTestEngineServerRCt5TPckg1Z9TTestInfo @ 28 NONAME R3UNUSED ; RTestCase::Open(RTestEngineServer &, TPckg<TTestInfo> const &)
-	Pause__9RTestCase @ 29 NONAME R3UNUSED ; RTestCase::Pause(void)
-	ReadLoggerSettingsFromIniFile__14RSettingServerR15TLoggerSettings @ 30 NONAME R3UNUSED ; RSettingServer::ReadLoggerSettingsFromIniFile(TLoggerSettings &)
-	RemoveConfigFile__11RTestEngineRCt4TBuf1i128RCt4TBuf1i256 @ 31 NONAME R3UNUSED ; RTestEngine::RemoveConfigFile(TBuf<128> const &, TBuf<256> const &)
-	RemoveTestModule__11RTestEngineRCt4TBuf1i128 @ 32 NONAME R3UNUSED ; RTestEngine::RemoveTestModule(TBuf<128> const &)
-	Resume__9RTestCase @ 33 NONAME R3UNUSED ; RTestCase::Resume(void)
-	RunTestCase__9RTestCaseRt5TPckg1Z15TFullTestResultR14TRequestStatus @ 34 NONAME R3UNUSED ; RTestCase::RunTestCase(TPckg<TFullTestResult> &, TRequestStatus &)
-	SetAttribute__11RTestEngine10TAttributeRC7TDesC16 @ 35 NONAME R3UNUSED ; RTestEngine::SetAttribute(TAttribute, TDesC16 const &)
-	SetIniFileInformation__14RSettingServerRCt4TBuf1i256 @ 36 NONAME R3UNUSED ; RSettingServer::SetIniFileInformation(TBuf<256> const &)
-	SetNewIniFileSetting__14RSettingServerRt4TBuf1i128 @ 37 NONAME R3UNUSED ; RSettingServer::SetNewIniFileSetting(TBuf<128> &)
-	StartEngine__Fv @ 38 NONAME R3UNUSED ; StartEngine(void)
-	StartNewServer__FRt4TBuf1i128 @ 39 NONAME R3UNUSED ; StartNewServer(TBuf<128> &)
-	Version__C14RSettingServer @ 40 NONAME R3UNUSED ; RSettingServer::Version(void) const
-	Version__C17RTestEngineServer @ 41 NONAME R3UNUSED ; RTestEngineServer::Version(void) const
-	"_._26CSTIFTestFrameworkSettings" @ 42 NONAME R3UNUSED ; CSTIFTestFrameworkSettings::~CSTIFTestFrameworkSettings(void)
-	AddConfigFile__11RTestEngineRCt4TBuf1i128RCt4TBuf1i256 @ 43 NONAME R3UNUSED ; RTestEngine::AddConfigFile(TBuf<128> const &, TBuf<256> const &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestEngine/BMARM/StifTestEngineu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,45 @@
+EXPORTS
+	__14RSettingServer @ 1 NONAME R3UNUSED ; RSettingServer::RSettingServer(void)
+	AddTestModule__11RTestEngineRCt4TBuf1i128RCt4TBuf1i256 @ 2 NONAME R3UNUSED ; RTestEngine::AddTestModule(TBuf<128> const &, TBuf<256> const &)
+	CancelAsyncRequest__11RTestEnginei @ 3 NONAME R3UNUSED ; RTestEngine::CancelAsyncRequest(int)
+	CancelAsyncRequest__9RTestCasei @ 4 NONAME R3UNUSED ; RTestCase::CancelAsyncRequest(int)
+	Close__11RTestEngine @ 5 NONAME R3UNUSED ; RTestEngine::Close(void)
+	Close__14RSettingServer @ 6 NONAME R3UNUSED ; RSettingServer::Close(void)
+	Close__17RTestEngineServer @ 7 NONAME R3UNUSED ; RTestEngineServer::Close(void)
+	Close__9RTestCase @ 8 NONAME R3UNUSED ; RTestCase::Close(void)
+	Connect__14RSettingServer @ 9 NONAME R3UNUSED ; RSettingServer::Connect(void)
+	Connect__17RTestEngineServer @ 10 NONAME R3UNUSED ; RTestEngineServer::Connect(void)
+	EnumerateTestCases__11RTestEngineRt8TPckgBuf1ZiR14TRequestStatus @ 11 NONAME R3UNUSED ; RTestEngine::EnumerateTestCases(TPckgBuf<int> &, TRequestStatus &)
+	ErrorNotification__11RTestEngineRt5TPckg1Z18TErrorNotificationR14TRequestStatus @ 12 NONAME R3UNUSED ; RTestEngine::ErrorNotification(TPckg<TErrorNotification> &, TRequestStatus &)
+	Event__11RTestEngineRt5TPckg1Z8TEventIfR14TRequestStatus @ 13 NONAME R3UNUSED ; RTestEngine::Event(TPckg<TEventIf> &, TRequestStatus &)
+	GetBooleanSettingsL__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16Ri @ 14 NONAME ; CSTIFTestFrameworkSettings::GetBooleanSettingsL(CStifSectionParser *, TPtrC16, int &)
+	GetFileSetting__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16R7TPtrC16 @ 15 NONAME ; CSTIFTestFrameworkSettings::GetFileSetting(CStifSectionParser *, TPtrC16, TPtrC16 &)
+	GetFormatL__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16RQ211CStifLogger11TLoggerType @ 16 NONAME ; CSTIFTestFrameworkSettings::GetFormatL(CStifSectionParser *, TPtrC16, CStifLogger::TLoggerType &)
+	GetLoggerSettings__14RSettingServerR15TLoggerSettings @ 17 NONAME R3UNUSED ; RSettingServer::GetLoggerSettings(TLoggerSettings &)
+	GetOutputL__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16RQ211CStifLogger7TOutput @ 18 NONAME ; CSTIFTestFrameworkSettings::GetOutputL(CStifSectionParser *, TPtrC16, CStifLogger::TOutput &)
+	GetOverwriteL__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16Ri @ 19 NONAME ; CSTIFTestFrameworkSettings::GetOverwriteL(CStifSectionParser *, TPtrC16, int &)
+	GetReportModeL__26CSTIFTestFrameworkSettingsP18CStifSectionParserG7TPtrC16RUi @ 20 NONAME ; CSTIFTestFrameworkSettings::GetReportModeL(CStifSectionParser *, TPtrC16, unsigned int &)
+	GetTestCases__11RTestEngineRt15CFixedFlatArray1Z9TTestInfo @ 21 NONAME R3UNUSED ; RTestEngine::GetTestCases(CFixedFlatArray<TTestInfo> &)
+	NewL__26CSTIFTestFrameworkSettings @ 22 NONAME R3UNUSED ; CSTIFTestFrameworkSettings::NewL(void)
+	NotifyProgress__9RTestCaseRt5TPckg1Z13TTestProgressR14TRequestStatus @ 23 NONAME R3UNUSED ; RTestCase::NotifyProgress(TPckg<TTestProgress> &, TRequestStatus &)
+	NotifyRemoteMsg__9RTestCaseR5TDes812TStifCommand @ 24 NONAME R3UNUSED ; RTestCase::NotifyRemoteMsg(TDes8 &, TStifCommand)
+	NotifyRemoteType__9RTestCaseRt5TPckg1Z12TStifCommandRt5TPckg1ZiR14TRequestStatus @ 25 NONAME ; RTestCase::NotifyRemoteType(TPckg<TStifCommand> &, TPckg<int> &, TRequestStatus &)
+	OpenLoggerSession__11RTestEngineR17RTestEngineServerR15TLoggerSettings @ 26 NONAME R3UNUSED ; RTestEngine::OpenLoggerSession(RTestEngineServer &, TLoggerSettings &)
+	Open__11RTestEngineR17RTestEngineServerRCt4TBuf1i256 @ 27 NONAME R3UNUSED ; RTestEngine::Open(RTestEngineServer &, TBuf<256> const &)
+	Open__9RTestCaseR17RTestEngineServerRCt5TPckg1Z9TTestInfo @ 28 NONAME R3UNUSED ; RTestCase::Open(RTestEngineServer &, TPckg<TTestInfo> const &)
+	Pause__9RTestCase @ 29 NONAME R3UNUSED ; RTestCase::Pause(void)
+	ReadLoggerSettingsFromIniFile__14RSettingServerR15TLoggerSettings @ 30 NONAME R3UNUSED ; RSettingServer::ReadLoggerSettingsFromIniFile(TLoggerSettings &)
+	RemoveConfigFile__11RTestEngineRCt4TBuf1i128RCt4TBuf1i256 @ 31 NONAME R3UNUSED ; RTestEngine::RemoveConfigFile(TBuf<128> const &, TBuf<256> const &)
+	RemoveTestModule__11RTestEngineRCt4TBuf1i128 @ 32 NONAME R3UNUSED ; RTestEngine::RemoveTestModule(TBuf<128> const &)
+	Resume__9RTestCase @ 33 NONAME R3UNUSED ; RTestCase::Resume(void)
+	RunTestCase__9RTestCaseRt5TPckg1Z15TFullTestResultR14TRequestStatus @ 34 NONAME R3UNUSED ; RTestCase::RunTestCase(TPckg<TFullTestResult> &, TRequestStatus &)
+	SetAttribute__11RTestEngine10TAttributeRC7TDesC16 @ 35 NONAME R3UNUSED ; RTestEngine::SetAttribute(TAttribute, TDesC16 const &)
+	SetIniFileInformation__14RSettingServerRCt4TBuf1i256 @ 36 NONAME R3UNUSED ; RSettingServer::SetIniFileInformation(TBuf<256> const &)
+	SetNewIniFileSetting__14RSettingServerRt4TBuf1i128 @ 37 NONAME R3UNUSED ; RSettingServer::SetNewIniFileSetting(TBuf<128> &)
+	StartEngine__Fv @ 38 NONAME R3UNUSED ; StartEngine(void)
+	StartNewServer__FRt4TBuf1i128 @ 39 NONAME R3UNUSED ; StartNewServer(TBuf<128> &)
+	Version__C14RSettingServer @ 40 NONAME R3UNUSED ; RSettingServer::Version(void) const
+	Version__C17RTestEngineServer @ 41 NONAME R3UNUSED ; RTestEngineServer::Version(void) const
+	"_._26CSTIFTestFrameworkSettings" @ 42 NONAME R3UNUSED ; CSTIFTestFrameworkSettings::~CSTIFTestFrameworkSettings(void)
+	AddConfigFile__11RTestEngineRCt4TBuf1i128RCt4TBuf1i256 @ 43 NONAME R3UNUSED ; RTestEngine::AddConfigFile(TBuf<128> const &, TBuf<256> const &)
+
--- a/stif/TestEngine/BWINS/STIFTESTENGINEU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-EXPORTS
-	??0RSettingServer@@QAE@XZ @ 1 NONAME ; public: __thiscall RSettingServer::RSettingServer(void)
-	??1CSTIFTestFrameworkSettings@@UAE@XZ @ 2 NONAME ; public: virtual __thiscall CSTIFTestFrameworkSettings::~CSTIFTestFrameworkSettings(void)
-	?AddConfigFile@RTestEngine@@QAEHABV?$TBuf@$0IA@@@ABV?$TBuf@$0BAA@@@@Z @ 3 NONAME ; public: int __thiscall RTestEngine::AddConfigFile(class TBuf<128> const &,class TBuf<256> const &)
-	?AddTestModule@RTestEngine@@QAEHABV?$TBuf@$0IA@@@ABV?$TBuf@$0BAA@@@@Z @ 4 NONAME ; public: int __thiscall RTestEngine::AddTestModule(class TBuf<128> const &,class TBuf<256> const &)
-	?CancelAsyncRequest@RTestCase@@QAEHH@Z @ 5 NONAME ; public: int __thiscall RTestCase::CancelAsyncRequest(int)
-	?CancelAsyncRequest@RTestEngine@@QAEHH@Z @ 6 NONAME ; public: int __thiscall RTestEngine::CancelAsyncRequest(int)
-	?Close@RSettingServer@@QAEXXZ @ 7 NONAME ; public: void __thiscall RSettingServer::Close(void)
-	?Close@RTestCase@@QAEXXZ @ 8 NONAME ; public: void __thiscall RTestCase::Close(void)
-	?Close@RTestEngine@@QAEXXZ @ 9 NONAME ; public: void __thiscall RTestEngine::Close(void)
-	?Close@RTestEngineServer@@QAEXXZ @ 10 NONAME ; public: void __thiscall RTestEngineServer::Close(void)
-	?Connect@RSettingServer@@QAEHXZ @ 11 NONAME ; public: int __thiscall RSettingServer::Connect(void)
-	?Connect@RTestEngineServer@@QAEHXZ @ 12 NONAME ; public: int __thiscall RTestEngineServer::Connect(void)
-	?EnumerateTestCases@RTestEngine@@QAEXAAV?$TPckgBuf@H@@AAVTRequestStatus@@@Z @ 13 NONAME ; public: void __thiscall RTestEngine::EnumerateTestCases(class TPckgBuf<int> &,class TRequestStatus &)
-	?ErrorNotification@RTestEngine@@QAEXAAV?$TPckg@VTErrorNotification@@@@AAVTRequestStatus@@@Z @ 14 NONAME ; public: void __thiscall RTestEngine::ErrorNotification(class TPckg<class TErrorNotification> &,class TRequestStatus &)
-	?Event@RTestEngine@@QAEXAAV?$TPckg@VTEventIf@@@@AAVTRequestStatus@@@Z @ 15 NONAME ; public: void __thiscall RTestEngine::Event(class TPckg<class TEventIf> &,class TRequestStatus &)
-	?GetBooleanSettingsL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAH@Z @ 16 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetBooleanSettingsL(class CStifSectionParser *,class TPtrC16,int &)
-	?GetFileSetting@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAV3@@Z @ 17 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetFileSetting(class CStifSectionParser *,class TPtrC16,class TPtrC16 &)
-	?GetFormatL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAW4TLoggerType@CStifLogger@@@Z @ 18 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetFormatL(class CStifSectionParser *,class TPtrC16,enum CStifLogger::TLoggerType &)
-	?GetLoggerSettings@RSettingServer@@QAEHAAUTLoggerSettings@@@Z @ 19 NONAME ; public: int __thiscall RSettingServer::GetLoggerSettings(struct TLoggerSettings &)
-	?GetOutputL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAW4TOutput@CStifLogger@@@Z @ 20 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetOutputL(class CStifSectionParser *,class TPtrC16,enum CStifLogger::TOutput &)
-	?GetOverwriteL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAH@Z @ 21 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetOverwriteL(class CStifSectionParser *,class TPtrC16,int &)
-	?GetReportModeL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAI@Z @ 22 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetReportModeL(class CStifSectionParser *,class TPtrC16,unsigned int &)
-	?GetTestCases@RTestEngine@@QAEHAAV?$CFixedFlatArray@VTTestInfo@@@@@Z @ 23 NONAME ; public: int __thiscall RTestEngine::GetTestCases(class CFixedFlatArray<class TTestInfo> &)
-	?NewL@CSTIFTestFrameworkSettings@@SAPAV1@XZ @ 24 NONAME ; public: static class CSTIFTestFrameworkSettings * __cdecl CSTIFTestFrameworkSettings::NewL(void)
-	?NotifyProgress@RTestCase@@QAEXAAV?$TPckg@VTTestProgress@@@@AAVTRequestStatus@@@Z @ 25 NONAME ; public: void __thiscall RTestCase::NotifyProgress(class TPckg<class TTestProgress> &,class TRequestStatus &)
-	?NotifyRemoteMsg@RTestCase@@QAEHAAVTDes8@@W4TStifCommand@@@Z @ 26 NONAME ; public: int __thiscall RTestCase::NotifyRemoteMsg(class TDes8 &,enum TStifCommand)
-	?NotifyRemoteType@RTestCase@@QAEXAAV?$TPckg@W4TStifCommand@@@@AAV?$TPckg@H@@AAVTRequestStatus@@@Z @ 27 NONAME ; public: void __thiscall RTestCase::NotifyRemoteType(class TPckg<enum TStifCommand> &,class TPckg<int> &,class TRequestStatus &)
-	?Open@RTestCase@@QAEHAAVRTestEngineServer@@ABV?$TPckg@VTTestInfo@@@@@Z @ 28 NONAME ; public: int __thiscall RTestCase::Open(class RTestEngineServer &,class TPckg<class TTestInfo> const &)
-	?Open@RTestEngine@@QAEHAAVRTestEngineServer@@ABV?$TBuf@$0BAA@@@@Z @ 29 NONAME ; public: int __thiscall RTestEngine::Open(class RTestEngineServer &,class TBuf<256> const &)
-	?OpenLoggerSession@RTestEngine@@QAEHAAVRTestEngineServer@@AAUTLoggerSettings@@@Z @ 30 NONAME ; public: int __thiscall RTestEngine::OpenLoggerSession(class RTestEngineServer &,struct TLoggerSettings &)
-	?Pause@RTestCase@@QAEHXZ @ 31 NONAME ; public: int __thiscall RTestCase::Pause(void)
-	?ReadLoggerSettingsFromIniFile@RSettingServer@@QAEHAAUTLoggerSettings@@@Z @ 32 NONAME ; public: int __thiscall RSettingServer::ReadLoggerSettingsFromIniFile(struct TLoggerSettings &)
-	?RemoveConfigFile@RTestEngine@@QAEHABV?$TBuf@$0IA@@@ABV?$TBuf@$0BAA@@@@Z @ 33 NONAME ; public: int __thiscall RTestEngine::RemoveConfigFile(class TBuf<128> const &,class TBuf<256> const &)
-	?RemoveTestModule@RTestEngine@@QAEHABV?$TBuf@$0IA@@@@Z @ 34 NONAME ; public: int __thiscall RTestEngine::RemoveTestModule(class TBuf<128> const &)
-	?Resume@RTestCase@@QAEHXZ @ 35 NONAME ; public: int __thiscall RTestCase::Resume(void)
-	?RunTestCase@RTestCase@@QAEXAAV?$TPckg@VTFullTestResult@@@@AAVTRequestStatus@@@Z @ 36 NONAME ; public: void __thiscall RTestCase::RunTestCase(class TPckg<class TFullTestResult> &,class TRequestStatus &)
-	?SetAttribute@RTestEngine@@QAEHW4TAttribute@@ABVTDesC16@@@Z @ 37 NONAME ; public: int __thiscall RTestEngine::SetAttribute(enum TAttribute,class TDesC16 const &)
-	?SetIniFileInformation@RSettingServer@@QAEHABV?$TBuf@$0BAA@@@@Z @ 38 NONAME ; public: int __thiscall RSettingServer::SetIniFileInformation(class TBuf<256> const &)
-	?SetNewIniFileSetting@RSettingServer@@QAEHAAV?$TBuf@$0IA@@@@Z @ 39 NONAME ; public: int __thiscall RSettingServer::SetNewIniFileSetting(class TBuf<128> &)
-	?StartEngine@@YAHXZ @ 40 NONAME ; int __cdecl StartEngine(void)
-	?StartNewServer@@YAHAAV?$TBuf@$0IA@@@@Z @ 41 NONAME ; int __cdecl StartNewServer(class TBuf<128> &)
-	?Version@RSettingServer@@QBE?AVTVersion@@XZ @ 42 NONAME ; public: class TVersion __thiscall RSettingServer::Version(void)const 
-	?Version@RTestEngineServer@@QBE?AVTVersion@@XZ @ 43 NONAME ; public: class TVersion __thiscall RTestEngineServer::Version(void)const 
-	??1CTestModuleList@@UAE@XZ @ 44 NONAME ; CTestModuleList::~CTestModuleList(void)
-	?AddCfgFile@CTestModuleInfo@@QAEHAAVTDesC16@@@Z @ 45 NONAME ; int CTestModuleInfo::AddCfgFile(class TDesC16 &)
-	?AddTestModule@CTestModuleList@@QAEHAAVTDesC16@@@Z @ 46 NONAME ; int CTestModuleList::AddTestModule(class TDesC16 &)
-	?Count@CTestModuleList@@QAEHXZ @ 47 NONAME ; int CTestModuleList::Count(void)
-	?CountCfgFiles@CTestModuleInfo@@QAEHXZ @ 48 NONAME ; int CTestModuleInfo::CountCfgFiles(void)
-	?GetCfgFileName@CTestModuleInfo@@QAEHHAAVTDes16@@@Z @ 49 NONAME ; int CTestModuleInfo::GetCfgFileName(int, class TDes16 &)
-	?GetIniFileName@CTestModuleInfo@@QAEHAAVTDes16@@@Z @ 50 NONAME ; int CTestModuleInfo::GetIniFileName(class TDes16 &)
-	?GetModule@CTestModuleList@@QAEPAVCTestModuleInfo@@AAVTDesC16@@@Z @ 51 NONAME ; class CTestModuleInfo * CTestModuleList::GetModule(class TDesC16 &)
-	?GetModule@CTestModuleList@@QAEPAVCTestModuleInfo@@H@Z @ 52 NONAME ; class CTestModuleInfo * CTestModuleList::GetModule(int)
-	?GetModuleName@CTestModuleInfo@@QAEHAAVTDes16@@@Z @ 53 NONAME ; int CTestModuleInfo::GetModuleName(class TDes16 &)
-	?GetUncheckedCfgFile@CTestModuleList@@QAEPAVCTestCaseFileInfo@@XZ @ 54 NONAME ; class CTestCaseFileInfo * CTestModuleList::GetUncheckedCfgFile(void)
-	?NewL@CTestModuleList@@SAPAV1@PAVCStifLogger@@@Z @ 55 NONAME ; class CTestModuleList * CTestModuleList::NewL(class CStifLogger *)
-	?SetIniFile@CTestModuleInfo@@QAEHAAVTDesC16@@@Z @ 56 NONAME ; int CTestModuleInfo::SetIniFile(class TDesC16 &)
-	?GetCfgFileName@CTestCaseFileInfo@@QAEHAAVTDes16@@@Z @ 57 NONAME ; int CTestCaseFileInfo::GetCfgFileName(class TDes16 &)
-	?SetChecked@CTestCaseFileInfo@@QAEXXZ @ 58 NONAME ; void CTestCaseFileInfo::SetChecked(void)
-	?GetEngineSettings@RSettingServer@@QAEHAAUTEngineSettings@@@Z @ 59 NONAME ; int RSettingServer::GetEngineSettings(struct TEngineSettings &)
-	?StoreEngineSettings@RSettingServer@@QAEHAAUTEngineSettings@@@Z @ 60 NONAME ; int RSettingServer::StoreEngineSettings(struct TEngineSettings &)
-	?GetFormatL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAW4TLoggerType@CStifLogger@@AAH@Z @ 61 NONAME ; int CSTIFTestFrameworkSettings::GetFormatL(class CStifSectionParser *, class TPtrC16, enum CStifLogger::TLoggerType &, int &)
-	?AddTestCaseResultToTestReport@RTestEngine@@QAEHABVTTestInfo@@ABVTFullTestResult@@H@Z @ 62 NONAME ; int RTestEngine::AddTestCaseResultToTestReport(class TTestInfo const &, class TFullTestResult const &, int)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestEngine/BWINS/StifTestEngineu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,65 @@
+EXPORTS
+	??0RSettingServer@@QAE@XZ @ 1 NONAME ; public: __thiscall RSettingServer::RSettingServer(void)
+	??1CSTIFTestFrameworkSettings@@UAE@XZ @ 2 NONAME ; public: virtual __thiscall CSTIFTestFrameworkSettings::~CSTIFTestFrameworkSettings(void)
+	?AddConfigFile@RTestEngine@@QAEHABV?$TBuf@$0IA@@@ABV?$TBuf@$0BAA@@@@Z @ 3 NONAME ; public: int __thiscall RTestEngine::AddConfigFile(class TBuf<128> const &,class TBuf<256> const &)
+	?AddTestModule@RTestEngine@@QAEHABV?$TBuf@$0IA@@@ABV?$TBuf@$0BAA@@@@Z @ 4 NONAME ; public: int __thiscall RTestEngine::AddTestModule(class TBuf<128> const &,class TBuf<256> const &)
+	?CancelAsyncRequest@RTestCase@@QAEHH@Z @ 5 NONAME ; public: int __thiscall RTestCase::CancelAsyncRequest(int)
+	?CancelAsyncRequest@RTestEngine@@QAEHH@Z @ 6 NONAME ; public: int __thiscall RTestEngine::CancelAsyncRequest(int)
+	?Close@RSettingServer@@QAEXXZ @ 7 NONAME ; public: void __thiscall RSettingServer::Close(void)
+	?Close@RTestCase@@QAEXXZ @ 8 NONAME ; public: void __thiscall RTestCase::Close(void)
+	?Close@RTestEngine@@QAEXXZ @ 9 NONAME ; public: void __thiscall RTestEngine::Close(void)
+	?Close@RTestEngineServer@@QAEXXZ @ 10 NONAME ; public: void __thiscall RTestEngineServer::Close(void)
+	?Connect@RSettingServer@@QAEHXZ @ 11 NONAME ; public: int __thiscall RSettingServer::Connect(void)
+	?Connect@RTestEngineServer@@QAEHXZ @ 12 NONAME ; public: int __thiscall RTestEngineServer::Connect(void)
+	?EnumerateTestCases@RTestEngine@@QAEXAAV?$TPckgBuf@H@@AAVTRequestStatus@@@Z @ 13 NONAME ; public: void __thiscall RTestEngine::EnumerateTestCases(class TPckgBuf<int> &,class TRequestStatus &)
+	?ErrorNotification@RTestEngine@@QAEXAAV?$TPckg@VTErrorNotification@@@@AAVTRequestStatus@@@Z @ 14 NONAME ; public: void __thiscall RTestEngine::ErrorNotification(class TPckg<class TErrorNotification> &,class TRequestStatus &)
+	?Event@RTestEngine@@QAEXAAV?$TPckg@VTEventIf@@@@AAVTRequestStatus@@@Z @ 15 NONAME ; public: void __thiscall RTestEngine::Event(class TPckg<class TEventIf> &,class TRequestStatus &)
+	?GetBooleanSettingsL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAH@Z @ 16 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetBooleanSettingsL(class CStifSectionParser *,class TPtrC16,int &)
+	?GetFileSetting@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAV3@@Z @ 17 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetFileSetting(class CStifSectionParser *,class TPtrC16,class TPtrC16 &)
+	?GetFormatL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAW4TLoggerType@CStifLogger@@@Z @ 18 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetFormatL(class CStifSectionParser *,class TPtrC16,enum CStifLogger::TLoggerType &)
+	?GetLoggerSettings@RSettingServer@@QAEHAAUTLoggerSettings@@@Z @ 19 NONAME ; public: int __thiscall RSettingServer::GetLoggerSettings(struct TLoggerSettings &)
+	?GetOutputL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAW4TOutput@CStifLogger@@@Z @ 20 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetOutputL(class CStifSectionParser *,class TPtrC16,enum CStifLogger::TOutput &)
+	?GetOverwriteL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAH@Z @ 21 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetOverwriteL(class CStifSectionParser *,class TPtrC16,int &)
+	?GetReportModeL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAI@Z @ 22 NONAME ; public: int __thiscall CSTIFTestFrameworkSettings::GetReportModeL(class CStifSectionParser *,class TPtrC16,unsigned int &)
+	?GetTestCases@RTestEngine@@QAEHAAV?$CFixedFlatArray@VTTestInfo@@@@@Z @ 23 NONAME ; public: int __thiscall RTestEngine::GetTestCases(class CFixedFlatArray<class TTestInfo> &)
+	?NewL@CSTIFTestFrameworkSettings@@SAPAV1@XZ @ 24 NONAME ; public: static class CSTIFTestFrameworkSettings * __cdecl CSTIFTestFrameworkSettings::NewL(void)
+	?NotifyProgress@RTestCase@@QAEXAAV?$TPckg@VTTestProgress@@@@AAVTRequestStatus@@@Z @ 25 NONAME ; public: void __thiscall RTestCase::NotifyProgress(class TPckg<class TTestProgress> &,class TRequestStatus &)
+	?NotifyRemoteMsg@RTestCase@@QAEHAAVTDes8@@W4TStifCommand@@@Z @ 26 NONAME ; public: int __thiscall RTestCase::NotifyRemoteMsg(class TDes8 &,enum TStifCommand)
+	?NotifyRemoteType@RTestCase@@QAEXAAV?$TPckg@W4TStifCommand@@@@AAV?$TPckg@H@@AAVTRequestStatus@@@Z @ 27 NONAME ; public: void __thiscall RTestCase::NotifyRemoteType(class TPckg<enum TStifCommand> &,class TPckg<int> &,class TRequestStatus &)
+	?Open@RTestCase@@QAEHAAVRTestEngineServer@@ABV?$TPckg@VTTestInfo@@@@@Z @ 28 NONAME ; public: int __thiscall RTestCase::Open(class RTestEngineServer &,class TPckg<class TTestInfo> const &)
+	?Open@RTestEngine@@QAEHAAVRTestEngineServer@@ABV?$TBuf@$0BAA@@@@Z @ 29 NONAME ; public: int __thiscall RTestEngine::Open(class RTestEngineServer &,class TBuf<256> const &)
+	?OpenLoggerSession@RTestEngine@@QAEHAAVRTestEngineServer@@AAUTLoggerSettings@@@Z @ 30 NONAME ; public: int __thiscall RTestEngine::OpenLoggerSession(class RTestEngineServer &,struct TLoggerSettings &)
+	?Pause@RTestCase@@QAEHXZ @ 31 NONAME ; public: int __thiscall RTestCase::Pause(void)
+	?ReadLoggerSettingsFromIniFile@RSettingServer@@QAEHAAUTLoggerSettings@@@Z @ 32 NONAME ; public: int __thiscall RSettingServer::ReadLoggerSettingsFromIniFile(struct TLoggerSettings &)
+	?RemoveConfigFile@RTestEngine@@QAEHABV?$TBuf@$0IA@@@ABV?$TBuf@$0BAA@@@@Z @ 33 NONAME ; public: int __thiscall RTestEngine::RemoveConfigFile(class TBuf<128> const &,class TBuf<256> const &)
+	?RemoveTestModule@RTestEngine@@QAEHABV?$TBuf@$0IA@@@@Z @ 34 NONAME ; public: int __thiscall RTestEngine::RemoveTestModule(class TBuf<128> const &)
+	?Resume@RTestCase@@QAEHXZ @ 35 NONAME ; public: int __thiscall RTestCase::Resume(void)
+	?RunTestCase@RTestCase@@QAEXAAV?$TPckg@VTFullTestResult@@@@AAVTRequestStatus@@@Z @ 36 NONAME ; public: void __thiscall RTestCase::RunTestCase(class TPckg<class TFullTestResult> &,class TRequestStatus &)
+	?SetAttribute@RTestEngine@@QAEHW4TAttribute@@ABVTDesC16@@@Z @ 37 NONAME ; public: int __thiscall RTestEngine::SetAttribute(enum TAttribute,class TDesC16 const &)
+	?SetIniFileInformation@RSettingServer@@QAEHABV?$TBuf@$0BAA@@@@Z @ 38 NONAME ; public: int __thiscall RSettingServer::SetIniFileInformation(class TBuf<256> const &)
+	?SetNewIniFileSetting@RSettingServer@@QAEHAAV?$TBuf@$0IA@@@@Z @ 39 NONAME ; public: int __thiscall RSettingServer::SetNewIniFileSetting(class TBuf<128> &)
+	?StartEngine@@YAHXZ @ 40 NONAME ; int __cdecl StartEngine(void)
+	?StartNewServer@@YAHAAV?$TBuf@$0IA@@@@Z @ 41 NONAME ; int __cdecl StartNewServer(class TBuf<128> &)
+	?Version@RSettingServer@@QBE?AVTVersion@@XZ @ 42 NONAME ; public: class TVersion __thiscall RSettingServer::Version(void)const 
+	?Version@RTestEngineServer@@QBE?AVTVersion@@XZ @ 43 NONAME ; public: class TVersion __thiscall RTestEngineServer::Version(void)const 
+	??1CTestModuleList@@UAE@XZ @ 44 NONAME ; CTestModuleList::~CTestModuleList(void)
+	?AddCfgFile@CTestModuleInfo@@QAEHAAVTDesC16@@@Z @ 45 NONAME ; int CTestModuleInfo::AddCfgFile(class TDesC16 &)
+	?AddTestModule@CTestModuleList@@QAEHAAVTDesC16@@@Z @ 46 NONAME ; int CTestModuleList::AddTestModule(class TDesC16 &)
+	?Count@CTestModuleList@@QAEHXZ @ 47 NONAME ; int CTestModuleList::Count(void)
+	?CountCfgFiles@CTestModuleInfo@@QAEHXZ @ 48 NONAME ; int CTestModuleInfo::CountCfgFiles(void)
+	?GetCfgFileName@CTestModuleInfo@@QAEHHAAVTDes16@@@Z @ 49 NONAME ; int CTestModuleInfo::GetCfgFileName(int, class TDes16 &)
+	?GetIniFileName@CTestModuleInfo@@QAEHAAVTDes16@@@Z @ 50 NONAME ; int CTestModuleInfo::GetIniFileName(class TDes16 &)
+	?GetModule@CTestModuleList@@QAEPAVCTestModuleInfo@@AAVTDesC16@@@Z @ 51 NONAME ; class CTestModuleInfo * CTestModuleList::GetModule(class TDesC16 &)
+	?GetModule@CTestModuleList@@QAEPAVCTestModuleInfo@@H@Z @ 52 NONAME ; class CTestModuleInfo * CTestModuleList::GetModule(int)
+	?GetModuleName@CTestModuleInfo@@QAEHAAVTDes16@@@Z @ 53 NONAME ; int CTestModuleInfo::GetModuleName(class TDes16 &)
+	?GetUncheckedCfgFile@CTestModuleList@@QAEPAVCTestCaseFileInfo@@XZ @ 54 NONAME ; class CTestCaseFileInfo * CTestModuleList::GetUncheckedCfgFile(void)
+	?NewL@CTestModuleList@@SAPAV1@PAVCStifLogger@@@Z @ 55 NONAME ; class CTestModuleList * CTestModuleList::NewL(class CStifLogger *)
+	?SetIniFile@CTestModuleInfo@@QAEHAAVTDesC16@@@Z @ 56 NONAME ; int CTestModuleInfo::SetIniFile(class TDesC16 &)
+	?GetCfgFileName@CTestCaseFileInfo@@QAEHAAVTDes16@@@Z @ 57 NONAME ; int CTestCaseFileInfo::GetCfgFileName(class TDes16 &)
+	?SetChecked@CTestCaseFileInfo@@QAEXXZ @ 58 NONAME ; void CTestCaseFileInfo::SetChecked(void)
+	?GetEngineSettings@RSettingServer@@QAEHAAUTEngineSettings@@@Z @ 59 NONAME ; int RSettingServer::GetEngineSettings(struct TEngineSettings &)
+	?StoreEngineSettings@RSettingServer@@QAEHAAUTEngineSettings@@@Z @ 60 NONAME ; int RSettingServer::StoreEngineSettings(struct TEngineSettings &)
+	?GetFormatL@CSTIFTestFrameworkSettings@@QAEHPAVCStifSectionParser@@VTPtrC16@@AAW4TLoggerType@CStifLogger@@AAH@Z @ 61 NONAME ; int CSTIFTestFrameworkSettings::GetFormatL(class CStifSectionParser *, class TPtrC16, enum CStifLogger::TLoggerType &, int &)
+	?AddTestCaseResultToTestReport@RTestEngine@@QAEHABVTTestInfo@@ABVTFullTestResult@@H@Z @ 62 NONAME ; int RTestEngine::AddTestCaseResultToTestReport(class TTestInfo const &, class TFullTestResult const &, int)
+	?RunTestCase@RTestCase@@QAEXAAV?$TPckg@VTFullTestResult@@@@ABVTDesC16@@AAVTRequestStatus@@@Z @ 63 NONAME ; void RTestCase::RunTestCase(class TPckg<class TFullTestResult> &, class TDesC16 const &, class TRequestStatus &)
+
--- a/stif/TestEngine/eabi/StifTestEngineu.def	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestEngine/eabi/StifTestEngineu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -110,4 +110,5 @@
 	_ZTV21CTestEngineSubSession @ 109 NONAME ; #<VT>#
 	_ZN26CSTIFTestFrameworkSettings10GetFormatLEP18CStifSectionParser7TPtrC16RN11CStifLogger11TLoggerTypeERi @ 110 NONAME
 	_ZN11RTestEngine29AddTestCaseResultToTestReportERK9TTestInfoRK15TFullTestResulti @ 111 NONAME
+	_ZN9RTestCase11RunTestCaseER5TPckgI15TFullTestResultERK7TDesC16R14TRequestStatus @ 112 NONAME
 
--- a/stif/TestEngine/inc/TestCaseController.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestEngine/inc/TestCaseController.h	Mon Jun 14 11:37:33 2010 +0300
@@ -176,6 +176,9 @@
         // Test Info
         TTestInfo           iTestInfo;
 
+        // Test case arguments
+		HBufC*              iTestCaseArguments;
+        
         // Internal state
         TTestCaseStatus     iState;
 
--- a/stif/TestEngine/inc/TestEngine.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestEngine/inc/TestEngine.h	Mon Jun 14 11:37:33 2010 +0300
@@ -59,20 +59,25 @@
     };
 
 // Struct to Test report settings
-class TTestReportSettings
+NONSHARABLE_CLASS(CTestReportSettings)
+	:public CBase
     {
     public:
+    
+        /**
+        * NewL is two-phased constructor.
+        */
+        static CTestReportSettings* NewL();
 
-        TTestReportSettings(){ iCreateTestReport = ETrue;
-                                iPath = NULL;
-                                iName = NULL;
-                                iFormat = CStifLogger::ETxt;
-                                iOutput = CStifLogger::EFile;
-                                iOverwrite = ETrue; 
-                                iXML = EFalse;
-                             }
 
-       ~TTestReportSettings(){ delete iPath; delete iName; }
+       ~CTestReportSettings();
+       
+    private:
+       CTestReportSettings();
+       /**
+       * By default Symbian OS constructor is private.
+       */
+       void ConstructL();
 
     public:
 
@@ -231,7 +236,7 @@
 
     public:     // Data
         // Test report settings
-        TTestReportSettings     iTestReportSettings;
+        CTestReportSettings*     iTestReportSettings;
 
         // Logger overwrite settings
         TLoggerSettings         iLoggerSettings;
--- a/stif/TestEngine/inc/TestReport.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestEngine/inc/TestReport.h	Mon Jun 14 11:37:33 2010 +0300
@@ -156,7 +156,7 @@
         /**
         * Two-phased constructor.
         */
-        static CTestReport* NewL( TTestReportSettings& aTestReportSettings,
+        static CTestReport* NewL( CTestReportSettings& aTestReportSettings,
                                   const TTestReportMode aReportMode );
         
         /**
@@ -199,7 +199,7 @@
         /**
         * By default Symbian OS constructor is private.
         */
-        void ConstructL(  TTestReportSettings& aTestReportSettings );
+        void ConstructL(  CTestReportSettings& aTestReportSettings );
 
         /**
         * Default C++ constructor.
--- a/stif/TestEngine/src/TestCaseController.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestEngine/src/TestCaseController.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -219,7 +219,7 @@
 
     delete iRDebugLogger;
     delete iTimeout;
-
+    delete iTestCaseArguments;
     }
 
 /*
@@ -253,10 +253,23 @@
 
     iState = ETestCaseRunning;
     
+    delete iTestCaseArguments;
+    iTestCaseArguments = NULL;
+    
+    TInt testCaseArgumentsLength = iMessage.GetDesLength( 1 );
+    if ( ( testCaseArgumentsLength != KErrArgument ) && ( testCaseArgumentsLength != KErrBadDescriptor ) )
+        {
+        iTestCaseArguments = HBufC::NewL( testCaseArgumentsLength );
+        TPtr testCaseArgumentsPtr( iTestCaseArguments->Des() );
+        User::LeaveIfError( iMessage.Read( 1, testCaseArgumentsPtr ) );
+        iTestExecution.RunTestCase( iResultPckg, *iTestCaseArguments, iStatus );        
+        }
+    else
+        {    
+        iTestExecution.RunTestCase( iResultPckg, iStatus );
+        }
     SetActive();
 
-    iTestExecution.RunTestCase( iResultPckg, iStatus );    
-
     // If testcase has timeout (handler), then start it
     if ( iTimeout )
         {
@@ -2567,18 +2580,7 @@
         __TRACE( KInit, (  _L("Loaded reset module[%S]"), &dllName ) );
         }
 
-    // Verify the UID
-    TUid KUidTestModule = TUid::Uid ( 0x101FB3E7 );
-    TUidType requiredUID( KDynamicLibraryUid, KSharedLibraryUid, KUidTestModule );
-
-    TUidType moduleUID = resetModule.Type();    
-    if ( moduleUID != requiredUID )
-        {
-        // New instance can't be created
-        RDebug::Print( ( _L("STIF TF: Reset module has invalid UID. Aborting loading!") ) );
-        __TRACE ( KError, ( CStifLogger::EError, _L("Reset module has invalid UID. Aborting loading!" ) ) );
-        return KErrNotSupported;
-        }
+    
 
     // Get pointer to first exported function
     CTestInterfaceFactory libEntry;
--- a/stif/TestEngine/src/TestEngine.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestEngine/src/TestEngine.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -411,6 +411,8 @@
 */
 void CTestEngineServer::ConstructL()
     {
+    // Create report setting
+    iTestReportSettings = CTestReportSettings::NewL();
     // Create container
     iContainerIndex = CObjectConIx::NewL();
 
@@ -505,6 +507,8 @@
     __TRACE(KAlways, ( _L( "---------------- Log Ended ----------------" ) ) );
     delete iLogger;
 
+    delete iTestReportSettings;
+    iTestReportSettings = NULL;
     }
 
 /*
@@ -881,6 +885,7 @@
         iTestCases = NULL;
         }
     
+    iTestCaseArray.Close();    
     delete iTestEngineSubSessions;
     iTestEngineSubSessions = NULL;
 
@@ -1234,14 +1239,18 @@
 void CTestEngine::InitTestReportAndLoggerVarL()
     {
     // Test report settings initialization
-    iTestEngineServer->iTestReportSettings.iCreateTestReport = ETrue;
+    iTestEngineServer->iTestReportSettings->iCreateTestReport = ETrue;
     _LIT( path, "C:\\LOGS\\TestFramework\\");
     _LIT( name, "TestReport");
-    iTestEngineServer->iTestReportSettings.iPath = path().AllocL();
-    iTestEngineServer->iTestReportSettings.iName = name().AllocL();
-    iTestEngineServer->iTestReportSettings.iFormat = CStifLogger::ETxt;
-    iTestEngineServer->iTestReportSettings.iOutput = CStifLogger::EFile;
-    iTestEngineServer->iTestReportSettings.iOverwrite = ETrue;
+    delete iTestEngineServer->iTestReportSettings->iPath;
+    iTestEngineServer->iTestReportSettings->iPath = NULL;
+    iTestEngineServer->iTestReportSettings->iPath = path().AllocL();
+    delete iTestEngineServer->iTestReportSettings->iName;
+    iTestEngineServer->iTestReportSettings->iName = NULL;
+    iTestEngineServer->iTestReportSettings->iName = name().AllocL();
+    iTestEngineServer->iTestReportSettings->iFormat = CStifLogger::ETxt;
+    iTestEngineServer->iTestReportSettings->iOutput = CStifLogger::EFile;
+    iTestEngineServer->iTestReportSettings->iOverwrite = ETrue;
 
     // Initializations to indicator is setting in use
     iTestEngineServer->iLoggerSettings.iIsDefined.iCreateLogDir = EFalse;
@@ -1370,10 +1379,10 @@
     Logger()->WriteDelimiter();
     
     // Create Test Reporter if allowed
-    if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
+    if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
         {
         TRAPD(err, iTestReport = 
-            CTestReport::NewL( iTestEngineServer->iTestReportSettings, 
+            CTestReport::NewL( *(iTestEngineServer->iTestReportSettings), 
                                ( CTestReport::TTestReportMode ) iReportMode ));
         if(err!=KErrNone)
             {
@@ -1476,7 +1485,7 @@
         if ( get_ret == KErrNone )
             {
             __TRACE( KInit,( _L( "Test report creation indicator: %d"), createTestReport ) );
-            iTestEngineServer->iTestReportSettings.iCreateTestReport = createTestReport;
+            iTestEngineServer->iTestReportSettings->iCreateTestReport = createTestReport;
             }
         else
             {
@@ -1484,7 +1493,7 @@
             }
 
         // Get Test report path settings
-        if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
+        if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
             {
             __TRACE( KInit,( _L( "Parsing Test report path" ) ) );
             TPtrC path;
@@ -1494,9 +1503,9 @@
                 {
                 __TRACE( KInit,( _L( "Test report path: %S"), &path ) );
                 // Delete old one before setting new one
-                delete iTestEngineServer->iTestReportSettings.iPath;
-				iTestEngineServer->iTestReportSettings.iPath = NULL;
-                iTestEngineServer->iTestReportSettings.iPath = path.AllocL();
+                delete iTestEngineServer->iTestReportSettings->iPath;
+				iTestEngineServer->iTestReportSettings->iPath = NULL;
+                iTestEngineServer->iTestReportSettings->iPath = path.AllocL();
                 }
             else
                 {
@@ -1505,7 +1514,7 @@
             }
 
         // Get Test report name settings
-        if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
+        if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
             {
             __TRACE( KInit,( _L( "Parsing Test report filename" ) ) );
             TPtrC name;
@@ -1515,9 +1524,9 @@
                 {
                 __TRACE( KInit,( _L( "Test report filename: %S"), &name ) );
                 // Delete old one before setting new one
-                delete iTestEngineServer->iTestReportSettings.iName;
-				iTestEngineServer->iTestReportSettings.iName = NULL;
-                iTestEngineServer->iTestReportSettings.iName = name.AllocL();
+                delete iTestEngineServer->iTestReportSettings->iName;
+				iTestEngineServer->iTestReportSettings->iName = NULL;
+                iTestEngineServer->iTestReportSettings->iName = name.AllocL();
                 }
             else
                 {
@@ -1526,7 +1535,7 @@
             }
 
         // Get Test report format settings
-        if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
+        if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
             {
             __TRACE( KInit,( _L( "Parsing Test report format" ) ) );
             CStifLogger::TLoggerType type;
@@ -1536,8 +1545,8 @@
             if ( get_ret == KErrNone )
                 {
                 __TRACE( KInit,( _L( "Test report format: %d, xml: %d"), type, xml ) );
-                iTestEngineServer->iTestReportSettings.iFormat = type;
-                iTestEngineServer->iTestReportSettings.iXML = xml;
+                iTestEngineServer->iTestReportSettings->iFormat = type;
+                iTestEngineServer->iTestReportSettings->iXML = xml;
                 }
             else
                 {
@@ -1546,7 +1555,7 @@
             }
 
         // Get Test report output settings
-        if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
+        if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
             {
             __TRACE( KInit,( _L( "Parsing Test report output" ) ) );
             CStifLogger::TOutput output;
@@ -1555,7 +1564,7 @@
             if ( get_ret == KErrNone )
                 {
                 __TRACE( KInit,( _L( "Test report output: %d"), output ) );
-                iTestEngineServer->iTestReportSettings.iOutput = output;
+                iTestEngineServer->iTestReportSettings->iOutput = output;
                 }
             else
                 {
@@ -1564,7 +1573,7 @@
             }
 
         // Get Test report file creation mode (overwrite settings)
-        if ( iTestEngineServer->iTestReportSettings.iCreateTestReport )
+        if ( iTestEngineServer->iTestReportSettings->iCreateTestReport )
             {
             __TRACE( KInit,( _L( "Parsing Test report file writing mode" ) ) );
             TBool overwrite;
@@ -1573,7 +1582,7 @@
             if ( get_ret == KErrNone )
                 {
                 __TRACE( KInit,( _L( "Test report file creation mode: %d"), overwrite ) );
-                iTestEngineServer->iTestReportSettings.iOverwrite = overwrite;
+                iTestEngineServer->iTestReportSettings->iOverwrite = overwrite;
                 }
             else
                 {
@@ -5570,6 +5579,74 @@
 
     DESCRIPTION
 
+    Default constructor
+
+-------------------------------------------------------------------------------
+*/
+CTestReportSettings::CTestReportSettings()
+    {
+    iCreateTestReport = ETrue;
+    iPath = NULL;
+    iName = NULL;
+    iFormat = CStifLogger::ETxt;
+    iOutput = CStifLogger::EFile;
+    iOverwrite = ETrue; 
+    iXML = EFalse;
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    DESCRIPTION
+
+    Two-phased constructor.
+
+-------------------------------------------------------------------------------
+*/
+CTestReportSettings* CTestReportSettings::NewL()
+    {
+    CTestReportSettings* self = new ( ELeave ) CTestReportSettings();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop();
+    return self;
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    DESCRIPTION
+
+    Symbian OS second phase constructor
+
+-------------------------------------------------------------------------------
+*/
+void CTestReportSettings::ConstructL()
+    {
+    
+    }
+/*
+-------------------------------------------------------------------------------
+
+    DESCRIPTION
+
+    Destructor
+
+-------------------------------------------------------------------------------
+*/
+CTestReportSettings::~CTestReportSettings()
+    { 
+    delete iPath; 
+    iPath = NULL;
+    delete iName;
+    iName = NULL;
+    } 
+
+/*
+-------------------------------------------------------------------------------
+
+    DESCRIPTION
+
     This module contains implementation of CRebootParams class member functions.
 
 -------------------------------------------------------------------------------
--- a/stif/TestEngine/src/TestEngineClient.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestEngine/src/TestEngineClient.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -661,6 +661,37 @@
 
     Class: RTestCase
 
+    Method: RunTestCase
+
+    Description: Run a test case asynchronously.
+
+    Parameters: TFullTestResultPckg& aTestResult : TFullTestResult :
+                 Test Result package
+                const TDesC& aTestCaseArgs: Test case arguments
+                TRequestStatus& aStatus : Request status
+
+    Return Values: TInt KErrNone : Test case could be run
+                        Other error code : Reason the test case couldn't be run
+
+    Errors/Exceptions: None
+
+    Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+EXPORT_C void RTestCase::RunTestCase( TFullTestResultPckg& aTestResult,
+                                      const TDesC& aTestCaseArgs,
+                                      TRequestStatus& aStatus )
+    {
+    TIpcArgs args( &aTestResult, &aTestCaseArgs, TIpcArgs::ENothing );
+    SendReceive( ETestCaseRunTestCase, args, aStatus );
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: RTestCase
+
     Method: Pause
 
     Description: Pause suspends the execution of the test case.
--- a/stif/TestEngine/src/TestModuleController.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestEngine/src/TestModuleController.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -250,6 +250,11 @@
 
     if ( r != KErrNone )
         {
+        if ( r == KErrBadName )
+            {
+            __TRACE( KError, ( CStifLogger::ERed, _L( "Test Module name or Configuration File name is too long: [%S]" ), &name) );
+            LeaveWithNotifyL( r,  _L( "Test Module name or Configuration File name is too long." ) );
+            }
         __TRACE( KError, ( CStifLogger::ERed, _L( "Can't connect to test module [%S], IniFile [%S]" ), &name, &aIniFile ) );
         LeaveWithNotifyL( r,  _L( "Can't connect to test module" ) );
         }
@@ -393,10 +398,11 @@
     iTestCaseArray.Close();
 
     // Release the config file array
+    iConfigFiles.ResetAndDestroy();
     iConfigFiles.Close();
 
     // Release the config file array
-    iFailedEnumerateConfig.Reset();
+    iFailedEnumerateConfig.ResetAndDestroy();
     iFailedEnumerateConfig.Close();
     
     // Release the children array
--- a/stif/TestEngine/src/TestReport.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestEngine/src/TestReport.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -194,7 +194,7 @@
 
 -------------------------------------------------------------------------------
 */
-void CTestReport::ConstructL( TTestReportSettings& aTestReportSettings )
+void CTestReport::ConstructL( CTestReportSettings& aTestReportSettings )
     {
     // Create summary for all test cases
     _LIT( KName, "All test cases" );
@@ -248,28 +248,24 @@
             {
             User::LeaveIfError( iFile.Replace( iFs, 
                            pathAndFile,
-                           EFileWrite | EFileStreamText | EFileShareAny ) );
+                           EFileWrite | EFileStreamText | EFileShareExclusive ) );
             }
         else
             {
-            TBool isOpen( EFalse );
-            TInt fileOpen = iFs.IsFileOpen( pathAndFile, isOpen );
+            TInt fileOpen = iFile.Open( iFs, 
+                                        pathAndFile, 
+                                        EFileWrite | EFileStreamText | EFileShareAny );
             if( fileOpen == KErrNotFound )
                 {
                 User::LeaveIfError( 
                     iFile.Create( iFs, 
                                   pathAndFile, 
-                                  EFileWrite | EFileStreamText | EFileShareAny ) );
+                                  EFileWrite | EFileStreamText | EFileShareExclusive ) );
                 }
             else if( fileOpen == KErrNone )
                 {
-                User::LeaveIfError( 
-                    iFile.Open( iFs, 
-                                pathAndFile, 
-                                EFileWrite | EFileStreamText | EFileShareAny ) );
                 TInt endPosOfFile = 0;
                 User::LeaveIfError( iFile.Seek( ESeekEnd, endPosOfFile ) );
-
                 }
             else
                 {
@@ -307,7 +303,7 @@
 
 -------------------------------------------------------------------------------
 */
-CTestReport* CTestReport::NewL( TTestReportSettings& aTestReportSettings,
+CTestReport* CTestReport::NewL( CTestReportSettings& aTestReportSettings,
                                 const TTestReportMode aReportMode )
     {
     CTestReport* self = new ( ELeave ) CTestReport( aReportMode );
@@ -339,6 +335,9 @@
 */
 CTestReport::~CTestReport()
     {
+    iTestModulesVersionsInfo.ResetAndDestroy();
+    iTestModulesVersionsInfo.Close();
+        
     // Reset and destroy arrays
     iTestSummaries.ResetAndDestroy();
     delete iTotalSummary;
--- a/stif/TestInterface/BMARM/STIFTESTINTERFACEU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-EXPORTS
-	__9TTestInfo @ 1 NONAME R3UNUSED ; TTestInfo::TTestInfo(void)
-	Append__14CStifTFwIfProtPFi_7TPtrC16i @ 2 NONAME R3UNUSED ; CStifTFwIfProt::Append(TPtrC16 (*)(int), int)
-	Append__14CStifTFwIfProtPFi_7TPtrC16iRC7TDesC16 @ 3 NONAME ; CStifTFwIfProt::Append(TPtrC16 (*)(int), int, TDesC16 const &)
-	Append__14CStifTFwIfProtPFi_7TPtrC16iT1i @ 4 NONAME ; (null)
-	Append__14CStifTFwIfProtPFi_7TPtrC16ii @ 5 NONAME ; CStifTFwIfProt::Append(TPtrC16 (*)(int), int, int)
-	Append__14CStifTFwIfProtRC7TDesC16 @ 6 NONAME R3UNUSED ; CStifTFwIfProt::Append(TDesC16 const &)
-	CallTestClass__11CScriptBaseRC7TDesC16 @ 7 NONAME R3UNUSED ; CScriptBase::CallTestClass(TDesC16 const &)
-	CancelEvent__13CTestModuleIfR8TEventIfP14TRequestStatus @ 8 NONAME R3UNUSED ; CTestModuleIf::CancelEvent(TEventIf &, TRequestStatus *)
-	CancelSignal__11CScriptBase @ 9 NONAME R3UNUSED ; CScriptBase::CancelSignal(void)
-	CheckAllowResult__13CTestModuleIfi @ 10 NONAME R3UNUSED ; CTestModuleIf::CheckAllowResult(int)
-	CmdType__14CStifTFwIfProti @ 11 NONAME R3UNUSED ; CStifTFwIfProt::CmdType(int)
-	CreateL__14CStifTFwIfProti @ 12 NONAME R3UNUSED ; CStifTFwIfProt::CreateL(int)
-	CreationResult__11CStifLogger @ 13 NONAME R3UNUSED ; CStifLogger::CreationResult(void)
-	DstDevId__14CStifTFwIfProt @ 14 NONAME R3UNUSED ; CStifTFwIfProt::DstDevId(void)
-	DstId__14CStifTFwIfProt @ 15 NONAME R3UNUSED ; CStifTFwIfProt::DstId(void)
-	DstTestId__14CStifTFwIfProt @ 16 NONAME R3UNUSED ; CStifTFwIfProt::DstTestId(void)
-	EnableSignal__11CScriptBaseR14TRequestStatus @ 17 NONAME R3UNUSED ; CScriptBase::EnableSignal(TRequestStatus &)
-	EventStatusParams__14CStifTFwIfProti @ 18 NONAME R3UNUSED ; CStifTFwIfProt::EventStatusParams(int)
-	EventStatus__14CStifTFwIfProti @ 19 NONAME R3UNUSED ; CStifTFwIfProt::EventStatus(int)
-	EventType__14CStifTFwIfProti @ 20 NONAME R3UNUSED ; CStifTFwIfProt::EventType(int)
-	Event__13CTestModuleIfR8TEventIf @ 21 NONAME R3UNUSED ; CTestModuleIf::Event(TEventIf &)
-	Event__13CTestModuleIfR8TEventIfR14TRequestStatus @ 22 NONAME R3UNUSED ; CTestModuleIf::Event(TEventIf &, TRequestStatus &)
-	GetChar__15CStifItemParserRC7TDesC16R5TChar @ 23 NONAME R3UNUSED ; CStifItemParser::GetChar(TDesC16 const &, TChar &)
-	GetInt__15CStifItemParserRC7TDesC16RUi6TRadix @ 24 NONAME ; CStifItemParser::GetInt(TDesC16 const &, unsigned int &, TRadix)
-	GetInt__15CStifItemParserRC7TDesC16Ri @ 25 NONAME R3UNUSED ; CStifItemParser::GetInt(TDesC16 const &, int &)
-	GetItemLineL__18CStifSectionParserRC7TDesC1617TTagToReturnValue @ 26 NONAME R3UNUSED ; CStifSectionParser::GetItemLineL(TDesC16 const &, TTagToReturnValue)
-	GetLine__18CStifSectionParserRC7TDesC16R7TPtrC1617TTagToReturnValue @ 27 NONAME ; CStifSectionParser::GetLine(TDesC16 const &, TPtrC16 &, TTagToReturnValue)
-	GetMeasurementOptions__13CTestModuleIfRi @ 28 NONAME R3UNUSED ; CTestModuleIf::GetMeasurementOptions(int &)
-	GetNextChar__15CStifItemParserR5TChar @ 29 NONAME R3UNUSED ; CStifItemParser::GetNextChar(TChar &)
-	GetNextChar__15CStifItemParserRC7TDesC16R5TChar @ 30 NONAME R3UNUSED ; CStifItemParser::GetNextChar(TDesC16 const &, TChar &)
-	GetNextInt__15CStifItemParserRC7TDesC16RUi6TRadix @ 31 NONAME ; CStifItemParser::GetNextInt(TDesC16 const &, unsigned int &, TRadix)
-	GetNextInt__15CStifItemParserRC7TDesC16Ri @ 32 NONAME R3UNUSED ; CStifItemParser::GetNextInt(TDesC16 const &, int &)
-	GetNextInt__15CStifItemParserRUi6TRadix @ 33 NONAME R3UNUSED ; CStifItemParser::GetNextInt(unsigned int &, TRadix)
-	GetNextInt__15CStifItemParserRi @ 34 NONAME R3UNUSED ; CStifItemParser::GetNextInt(int &)
-	GetNextItemLineL__18CStifSectionParser @ 35 NONAME R3UNUSED ; CStifSectionParser::GetNextItemLineL(void)
-	GetNextItemLineL__18CStifSectionParserRC7TDesC1617TTagToReturnValue @ 36 NONAME R3UNUSED ; CStifSectionParser::GetNextItemLineL(TDesC16 const &, TTagToReturnValue)
-	GetNextLine__18CStifSectionParserR7TPtrC16 @ 37 NONAME R3UNUSED ; CStifSectionParser::GetNextLine(TPtrC16 &)
-	GetNextLine__18CStifSectionParserRC7TDesC16R7TPtrC1617TTagToReturnValue @ 38 NONAME ; CStifSectionParser::GetNextLine(TDesC16 const &, TPtrC16 &, TTagToReturnValue)
-	GetNextString__15CStifItemParserR7TPtrC16 @ 39 NONAME R3UNUSED ; CStifItemParser::GetNextString(TPtrC16 &)
-	GetNextString__15CStifItemParserRC7TDesC16R7TPtrC16 @ 40 NONAME R3UNUSED ; CStifItemParser::GetNextString(TDesC16 const &, TPtrC16 &)
-	GetPosition__18CStifSectionParser @ 41 NONAME R3UNUSED ; CStifSectionParser::GetPosition(void)
-	GetStoredState__13CTestModuleIfRiRt4TBuf1i128 @ 42 NONAME R3UNUSED ; CTestModuleIf::GetStoredState(int &, TBuf<128> &)
-	GetString__15CStifItemParserRC7TDesC16R7TPtrC16 @ 43 NONAME R3UNUSED ; CStifItemParser::GetString(TDesC16 const &, TPtrC16 &)
-	GetTestObject__11CScriptBaseRC7TDesC16 @ 44 NONAME R3UNUSED ; CScriptBase::GetTestObject(TDesC16 const &)
-	Log__11CStifLoggerGt11TRefByValue1ZC6TDesC8e @ 45 NONAME ; CStifLogger::Log(TRefByValue<TDesC8 const>,...)
-	Log__11CStifLoggerGt11TRefByValue1ZC7TDesC16e @ 46 NONAME ; CStifLogger::Log(TRefByValue<TDesC16 const>,...)
-	Log__11CStifLoggerRC6TDesC8 @ 47 NONAME R3UNUSED ; CStifLogger::Log(TDesC8 const &)
-	Log__11CStifLoggerRC7TDesC16 @ 48 NONAME R3UNUSED ; CStifLogger::Log(TDesC16 const &)
-	Log__11CStifLoggeriGt11TRefByValue1ZC6TDesC8e @ 49 NONAME ; CStifLogger::Log(int, TRefByValue<TDesC8 const>,...)
-	Log__11CStifLoggeriGt11TRefByValue1ZC7TDesC16e @ 50 NONAME ; CStifLogger::Log(int, TRefByValue<TDesC16 const>,...)
-	Log__11CStifLoggeriRC6TDesC8 @ 51 NONAME R3UNUSED ; CStifLogger::Log(int, TDesC8 const &)
-	Log__11CStifLoggeriRC7TDesC16 @ 52 NONAME R3UNUSED ; CStifLogger::Log(int, TDesC16 const &)
-	MsgType__14CStifTFwIfProti @ 53 NONAME R3UNUSED ; CStifTFwIfProt::MsgType(int)
-	NewL__11CStifLoggerRC7TDesC16T1Q211CStifLogger11TLoggerTypeQ211CStifLogger7TOutputiiiiiiii @ 54 NONAME ; CStifLogger::NewL(TDesC16 const &, TDesC16 const &, CStifLogger::TLoggerType, CStifLogger::TOutput, int, int, int, int, int, int, int, int)
-	NewL__11CStifLoggerRC7TDesC16T1R15TLoggerSettings @ 55 NONAME R3UNUSED ; CStifLogger::NewL(TDesC16 const &, TDesC16 const &, TLoggerSettings &)
-	NewL__11CStifParserRC7TDesC16Q211CStifParser12TCommentType @ 56 NONAME R3UNUSED ; CStifParser::NewL(TDesC16 const &, CStifParser::TCommentType)
-	NewL__11CStifParserRC7TDesC16T1Q211CStifParser12TCommentType @ 57 NONAME R3UNUSED ; CStifParser::NewL(TDesC16 const &, TDesC16 const &, CStifParser::TCommentType)
-	NewL__13CTestModuleIfP20CTestThreadContainerP15CTestModuleBase @ 58 NONAME R3UNUSED ; CTestModuleIf::NewL(CTestThreadContainer *, CTestModuleBase *)
-	NewL__14CStifTFwIfProt @ 59 NONAME R3UNUSED ; CStifTFwIfProt::NewL(void)
-	NewL__15CStifItemParserG7TPtrC16ii @ 60 NONAME ; CStifItemParser::NewL(TPtrC16, int, int)
-	NewL__20CSTIFTestMeasurementP15CTestModuleBaseQ220CSTIFTestMeasurement20TSTIFMeasurementTypeRC7TDesC16 @ 61 NONAME R3UNUSED ; CSTIFTestMeasurement::NewL(CTestModuleBase *, CSTIFTestMeasurement::TSTIFMeasurementType, TDesC16 const &)
-	NewL__21CTestModuleParamVer01 @ 62 NONAME R3UNUSED ; CTestModuleParamVer01::NewL(void)
-	NewL__21MSTIFTestInterferenceP15CTestModuleBaseQ221MSTIFTestInterference29TStifTestInterferenceCategory @ 63 NONAME R3UNUSED ; MSTIFTestInterference::NewL(CTestModuleBase *, MSTIFTestInterference::TStifTestInterferenceCategory)
-	NextSectionL__11CStifParserRC7TDesC16T1i @ 64 NONAME ; CStifParser::NextSectionL(TDesC16 const &, TDesC16 const &, int)
-	NextSubSectionL__18CStifSectionParserRC7TDesC16T1i @ 65 NONAME ; CStifSectionParser::NextSubSectionL(TDesC16 const &, TDesC16 const &, int)
-	OutputType__11CStifLogger @ 66 NONAME R3UNUSED ; CStifLogger::OutputType(void)
-	ParsingType__15CStifItemParser @ 67 NONAME R3UNUSED ; CStifItemParser::ParsingType(void)
-	Printf__13CTestModuleIfiRC7TDesC16Gt11TRefByValue1ZC7TDesC16e @ 68 NONAME ; CTestModuleIf::Printf(int, TDesC16 const &, TRefByValue<TDesC16 const>,...)
-	Reboot__13CTestModuleIfi @ 69 NONAME R3UNUSED ; CTestModuleIf::Reboot(int)
-	Remainder__15CStifItemParserR7TPtrC16 @ 70 NONAME R3UNUSED ; CStifItemParser::Remainder(TPtrC16 &)
-	RemoteReceiveCancel__13CTestModuleIf @ 71 NONAME R3UNUSED ; CTestModuleIf::RemoteReceiveCancel(void)
-	RemoteReceive__13CTestModuleIfR6TDes16R14TRequestStatus @ 72 NONAME R3UNUSED ; CTestModuleIf::RemoteReceive(TDes16 &, TRequestStatus &)
-	RemoteSend__13CTestModuleIfRC7TDesC16 @ 73 NONAME R3UNUSED ; CTestModuleIf::RemoteSend(TDesC16 const &)
-	RemoteType__14CStifTFwIfProti @ 74 NONAME R3UNUSED ; CStifTFwIfProt::RemoteType(int)
-	ResetAllowResult__13CTestModuleIf @ 75 NONAME R3UNUSED ; CTestModuleIf::ResetAllowResult(void)
-	RespParam__14CStifTFwIfProti @ 76 NONAME R3UNUSED ; CStifTFwIfProt::RespParam(int)
-	ResultCategory__14CStifTFwIfProti @ 77 NONAME R3UNUSED ; CStifTFwIfProt::ResultCategory(int)
-	RunInternalL__11CScriptBasePC17TStifFunctionInfoiR15CStifItemParser @ 78 NONAME ; CScriptBase::RunInternalL(TStifFunctionInfo const *, int, CStifItemParser &)
-	RunParams__14CStifTFwIfProti @ 79 NONAME R3UNUSED ; CStifTFwIfProt::RunParams(int)
-	RunStatusParams__14CStifTFwIfProti @ 80 NONAME R3UNUSED ; CStifTFwIfProt::RunStatusParams(int)
-	RunStatus__14CStifTFwIfProti @ 81 NONAME R3UNUSED ; CStifTFwIfProt::RunStatus(int)
-	SaveData__11CStifLoggerR6TDesC8 @ 82 NONAME R3UNUSED ; CStifLogger::SaveData(TDesC8 &)
-	SaveData__11CStifLoggerR7TDesC16 @ 83 NONAME R3UNUSED ; CStifLogger::SaveData(TDesC16 &)
-	SectionL__11CStifParserRC7TDesC16T1i @ 84 NONAME ; CStifParser::SectionL(TDesC16 const &, TDesC16 const &, int)
-	SetAllowResult__13CTestModuleIfi @ 85 NONAME R3UNUSED ; CTestModuleIf::SetAllowResult(int)
-	SetBehavior__13CTestModuleIfQ213CTestModuleIf13TTestBehaviorPv @ 86 NONAME R3UNUSED ; CTestModuleIf::SetBehavior(CTestModuleIf::TTestBehavior, void *)
-	SetCmdType__14CStifTFwIfProtQ214CStifTFwIfProt8TCmdType @ 87 NONAME R3UNUSED ; CStifTFwIfProt::SetCmdType(CStifTFwIfProt::TCmdType)
-	SetDstId__14CStifTFwIfProtUl @ 88 NONAME R3UNUSED ; CStifTFwIfProt::SetDstId(unsigned long)
-	SetExitReason__13CTestModuleIfQ213CTestModuleIf11TExitReasoni @ 89 NONAME R3UNUSED ; CTestModuleIf::SetExitReason(CTestModuleIf::TExitReason, int)
-	SetL__14CStifTFwIfProtRC7TDesC16 @ 90 NONAME R3UNUSED ; CStifTFwIfProt::SetL(TDesC16 const &)
-	SetMsgType__14CStifTFwIfProtQ214CStifTFwIfProt8TMsgType @ 91 NONAME R3UNUSED ; CStifTFwIfProt::SetMsgType(CStifTFwIfProt::TMsgType)
-	SetParsingType__15CStifItemParserQ215CStifItemParser12TParsingType @ 92 NONAME R3UNUSED ; CStifItemParser::SetParsingType(CStifItemParser::TParsingType)
-	SetPosition__18CStifSectionParseri @ 93 NONAME R3UNUSED ; CStifSectionParser::SetPosition(int)
-	SetRespType__14CStifTFwIfProtQ214CStifTFwIfProt8TMsgType @ 94 NONAME R3UNUSED ; CStifTFwIfProt::SetRespType(CStifTFwIfProt::TMsgType)
-	SetResult__11TTestResultiRC7TDesC16 @ 95 NONAME R3UNUSED ; TTestResult::SetResult(int, TDesC16 const &)
-	SetScripter__11CScriptBasePFP13CTestScripter19TStifTSCallBackTypeRC7TDesC16_iP13CTestScripter @ 96 NONAME R3UNUSED ; CScriptBase::SetScripter(int (*)(CTestScripter *, TStifTSCallBackType, TDesC16 const &), CTestScripter *)
-	SetSrcId__14CStifTFwIfProtUl @ 97 NONAME R3UNUSED ; CStifTFwIfProt::SetSrcId(unsigned long)
-	Signal__11CScriptBasei @ 98 NONAME R3UNUSED ; CScriptBase::Signal(int)
-	SrcDevId__14CStifTFwIfProt @ 99 NONAME R3UNUSED ; CStifTFwIfProt::SrcDevId(void)
-	SrcId__14CStifTFwIfProt @ 100 NONAME R3UNUSED ; CStifTFwIfProt::SrcId(void)
-	SrcTestId__14CStifTFwIfProt @ 101 NONAME R3UNUSED ; CStifTFwIfProt::SrcTestId(void)
-	StartSession__Fv @ 102 NONAME R3UNUSED ; StartSession(void)
-	Start__20CSTIFTestMeasurement @ 103 NONAME R3UNUSED ; CSTIFTestMeasurement::Start(void)
-	StifMacroError__13CTestModuleIfiPCUcPCciiiiiii @ 104 NONAME ; CTestModuleIf::StifMacroError(int, unsigned char const *, char const *, int, int, int, int, int, int, int)
-	Stop__20CSTIFTestMeasurement @ 105 NONAME R3UNUSED ; CSTIFTestMeasurement::Stop(void)
-	StoreState__13CTestModuleIfiRt4TBuf1i128 @ 106 NONAME R3UNUSED ; CTestModuleIf::StoreState(int, TBuf<128> &)
-	SubSectionL__18CStifSectionParserRC7TDesC16T1i @ 107 NONAME ; CStifSectionParser::SubSectionL(TDesC16 const &, TDesC16 const &, int)
-	TestModuleIf__11CScriptBase @ 108 NONAME R3UNUSED ; CScriptBase::TestModuleIf(void)
-	WriteDelimiter__11CStifLoggerRC6TDesC8i @ 109 NONAME R3UNUSED ; CStifLogger::WriteDelimiter(TDesC8 const &, int)
-	WriteDelimiter__11CStifLoggerRC7TDesC16i @ 110 NONAME R3UNUSED ; CStifLogger::WriteDelimiter(TDesC16 const &, int)
-	"_._11CStifParser" @ 111 NONAME R3UNUSED ; CStifParser::~CStifParser(void)
-	"_._14CStifTFwIfProt" @ 112 NONAME R3UNUSED ; CStifTFwIfProt::~CStifTFwIfProt(void)
-	"_._21CTestModuleParamVer01" @ 113 NONAME R3UNUSED ; CTestModuleParamVer01::~CTestModuleParamVer01(void)
-	__11CScriptBaseR13CTestModuleIf @ 114 NONAME R3UNUSED ; CScriptBase::CScriptBase(CTestModuleIf &)
-	__11TTestResult @ 115 NONAME R3UNUSED ; TTestResult::TTestResult(void)
-	__13TTestCaseInfo @ 116 NONAME R3UNUSED ; TTestCaseInfo::TTestCaseInfo(void)
-	__13TTestProgress @ 117 NONAME R3UNUSED ; TTestProgress::TTestProgress(void)
-	__15TFullTestResult @ 118 NONAME R3UNUSED ; TFullTestResult::TFullTestResult(void)
-	__18TErrorNotification @ 119 NONAME R3UNUSED ; TErrorNotification::TErrorNotification(void)
-	AppendId__14CStifTFwIfProtUl @ 120 NONAME R3UNUSED ; CStifTFwIfProt::AppendId(unsigned long)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestInterface/BMARM/StifTestInterfaceu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,122 @@
+EXPORTS
+	__9TTestInfo @ 1 NONAME R3UNUSED ; TTestInfo::TTestInfo(void)
+	Append__14CStifTFwIfProtPFi_7TPtrC16i @ 2 NONAME R3UNUSED ; CStifTFwIfProt::Append(TPtrC16 (*)(int), int)
+	Append__14CStifTFwIfProtPFi_7TPtrC16iRC7TDesC16 @ 3 NONAME ; CStifTFwIfProt::Append(TPtrC16 (*)(int), int, TDesC16 const &)
+	Append__14CStifTFwIfProtPFi_7TPtrC16iT1i @ 4 NONAME ; (null)
+	Append__14CStifTFwIfProtPFi_7TPtrC16ii @ 5 NONAME ; CStifTFwIfProt::Append(TPtrC16 (*)(int), int, int)
+	Append__14CStifTFwIfProtRC7TDesC16 @ 6 NONAME R3UNUSED ; CStifTFwIfProt::Append(TDesC16 const &)
+	CallTestClass__11CScriptBaseRC7TDesC16 @ 7 NONAME R3UNUSED ; CScriptBase::CallTestClass(TDesC16 const &)
+	CancelEvent__13CTestModuleIfR8TEventIfP14TRequestStatus @ 8 NONAME R3UNUSED ; CTestModuleIf::CancelEvent(TEventIf &, TRequestStatus *)
+	CancelSignal__11CScriptBase @ 9 NONAME R3UNUSED ; CScriptBase::CancelSignal(void)
+	CheckAllowResult__13CTestModuleIfi @ 10 NONAME R3UNUSED ; CTestModuleIf::CheckAllowResult(int)
+	CmdType__14CStifTFwIfProti @ 11 NONAME R3UNUSED ; CStifTFwIfProt::CmdType(int)
+	CreateL__14CStifTFwIfProti @ 12 NONAME R3UNUSED ; CStifTFwIfProt::CreateL(int)
+	CreationResult__11CStifLogger @ 13 NONAME R3UNUSED ; CStifLogger::CreationResult(void)
+	DstDevId__14CStifTFwIfProt @ 14 NONAME R3UNUSED ; CStifTFwIfProt::DstDevId(void)
+	DstId__14CStifTFwIfProt @ 15 NONAME R3UNUSED ; CStifTFwIfProt::DstId(void)
+	DstTestId__14CStifTFwIfProt @ 16 NONAME R3UNUSED ; CStifTFwIfProt::DstTestId(void)
+	EnableSignal__11CScriptBaseR14TRequestStatus @ 17 NONAME R3UNUSED ; CScriptBase::EnableSignal(TRequestStatus &)
+	EventStatusParams__14CStifTFwIfProti @ 18 NONAME R3UNUSED ; CStifTFwIfProt::EventStatusParams(int)
+	EventStatus__14CStifTFwIfProti @ 19 NONAME R3UNUSED ; CStifTFwIfProt::EventStatus(int)
+	EventType__14CStifTFwIfProti @ 20 NONAME R3UNUSED ; CStifTFwIfProt::EventType(int)
+	Event__13CTestModuleIfR8TEventIf @ 21 NONAME R3UNUSED ; CTestModuleIf::Event(TEventIf &)
+	Event__13CTestModuleIfR8TEventIfR14TRequestStatus @ 22 NONAME R3UNUSED ; CTestModuleIf::Event(TEventIf &, TRequestStatus &)
+	GetChar__15CStifItemParserRC7TDesC16R5TChar @ 23 NONAME R3UNUSED ; CStifItemParser::GetChar(TDesC16 const &, TChar &)
+	GetInt__15CStifItemParserRC7TDesC16RUi6TRadix @ 24 NONAME ; CStifItemParser::GetInt(TDesC16 const &, unsigned int &, TRadix)
+	GetInt__15CStifItemParserRC7TDesC16Ri @ 25 NONAME R3UNUSED ; CStifItemParser::GetInt(TDesC16 const &, int &)
+	GetItemLineL__18CStifSectionParserRC7TDesC1617TTagToReturnValue @ 26 NONAME R3UNUSED ; CStifSectionParser::GetItemLineL(TDesC16 const &, TTagToReturnValue)
+	GetLine__18CStifSectionParserRC7TDesC16R7TPtrC1617TTagToReturnValue @ 27 NONAME ; CStifSectionParser::GetLine(TDesC16 const &, TPtrC16 &, TTagToReturnValue)
+	GetMeasurementOptions__13CTestModuleIfRi @ 28 NONAME R3UNUSED ; CTestModuleIf::GetMeasurementOptions(int &)
+	GetNextChar__15CStifItemParserR5TChar @ 29 NONAME R3UNUSED ; CStifItemParser::GetNextChar(TChar &)
+	GetNextChar__15CStifItemParserRC7TDesC16R5TChar @ 30 NONAME R3UNUSED ; CStifItemParser::GetNextChar(TDesC16 const &, TChar &)
+	GetNextInt__15CStifItemParserRC7TDesC16RUi6TRadix @ 31 NONAME ; CStifItemParser::GetNextInt(TDesC16 const &, unsigned int &, TRadix)
+	GetNextInt__15CStifItemParserRC7TDesC16Ri @ 32 NONAME R3UNUSED ; CStifItemParser::GetNextInt(TDesC16 const &, int &)
+	GetNextInt__15CStifItemParserRUi6TRadix @ 33 NONAME R3UNUSED ; CStifItemParser::GetNextInt(unsigned int &, TRadix)
+	GetNextInt__15CStifItemParserRi @ 34 NONAME R3UNUSED ; CStifItemParser::GetNextInt(int &)
+	GetNextItemLineL__18CStifSectionParser @ 35 NONAME R3UNUSED ; CStifSectionParser::GetNextItemLineL(void)
+	GetNextItemLineL__18CStifSectionParserRC7TDesC1617TTagToReturnValue @ 36 NONAME R3UNUSED ; CStifSectionParser::GetNextItemLineL(TDesC16 const &, TTagToReturnValue)
+	GetNextLine__18CStifSectionParserR7TPtrC16 @ 37 NONAME R3UNUSED ; CStifSectionParser::GetNextLine(TPtrC16 &)
+	GetNextLine__18CStifSectionParserRC7TDesC16R7TPtrC1617TTagToReturnValue @ 38 NONAME ; CStifSectionParser::GetNextLine(TDesC16 const &, TPtrC16 &, TTagToReturnValue)
+	GetNextString__15CStifItemParserR7TPtrC16 @ 39 NONAME R3UNUSED ; CStifItemParser::GetNextString(TPtrC16 &)
+	GetNextString__15CStifItemParserRC7TDesC16R7TPtrC16 @ 40 NONAME R3UNUSED ; CStifItemParser::GetNextString(TDesC16 const &, TPtrC16 &)
+	GetPosition__18CStifSectionParser @ 41 NONAME R3UNUSED ; CStifSectionParser::GetPosition(void)
+	GetStoredState__13CTestModuleIfRiRt4TBuf1i128 @ 42 NONAME R3UNUSED ; CTestModuleIf::GetStoredState(int &, TBuf<128> &)
+	GetString__15CStifItemParserRC7TDesC16R7TPtrC16 @ 43 NONAME R3UNUSED ; CStifItemParser::GetString(TDesC16 const &, TPtrC16 &)
+	GetTestObject__11CScriptBaseRC7TDesC16 @ 44 NONAME R3UNUSED ; CScriptBase::GetTestObject(TDesC16 const &)
+	Log__11CStifLoggerGt11TRefByValue1ZC6TDesC8e @ 45 NONAME ; CStifLogger::Log(TRefByValue<TDesC8 const>,...)
+	Log__11CStifLoggerGt11TRefByValue1ZC7TDesC16e @ 46 NONAME ; CStifLogger::Log(TRefByValue<TDesC16 const>,...)
+	Log__11CStifLoggerRC6TDesC8 @ 47 NONAME R3UNUSED ; CStifLogger::Log(TDesC8 const &)
+	Log__11CStifLoggerRC7TDesC16 @ 48 NONAME R3UNUSED ; CStifLogger::Log(TDesC16 const &)
+	Log__11CStifLoggeriGt11TRefByValue1ZC6TDesC8e @ 49 NONAME ; CStifLogger::Log(int, TRefByValue<TDesC8 const>,...)
+	Log__11CStifLoggeriGt11TRefByValue1ZC7TDesC16e @ 50 NONAME ; CStifLogger::Log(int, TRefByValue<TDesC16 const>,...)
+	Log__11CStifLoggeriRC6TDesC8 @ 51 NONAME R3UNUSED ; CStifLogger::Log(int, TDesC8 const &)
+	Log__11CStifLoggeriRC7TDesC16 @ 52 NONAME R3UNUSED ; CStifLogger::Log(int, TDesC16 const &)
+	MsgType__14CStifTFwIfProti @ 53 NONAME R3UNUSED ; CStifTFwIfProt::MsgType(int)
+	NewL__11CStifLoggerRC7TDesC16T1Q211CStifLogger11TLoggerTypeQ211CStifLogger7TOutputiiiiiiii @ 54 NONAME ; CStifLogger::NewL(TDesC16 const &, TDesC16 const &, CStifLogger::TLoggerType, CStifLogger::TOutput, int, int, int, int, int, int, int, int)
+	NewL__11CStifLoggerRC7TDesC16T1R15TLoggerSettings @ 55 NONAME R3UNUSED ; CStifLogger::NewL(TDesC16 const &, TDesC16 const &, TLoggerSettings &)
+	NewL__11CStifParserRC7TDesC16Q211CStifParser12TCommentType @ 56 NONAME R3UNUSED ; CStifParser::NewL(TDesC16 const &, CStifParser::TCommentType)
+	NewL__11CStifParserRC7TDesC16T1Q211CStifParser12TCommentType @ 57 NONAME R3UNUSED ; CStifParser::NewL(TDesC16 const &, TDesC16 const &, CStifParser::TCommentType)
+	NewL__13CTestModuleIfP20CTestThreadContainerP15CTestModuleBase @ 58 NONAME R3UNUSED ; CTestModuleIf::NewL(CTestThreadContainer *, CTestModuleBase *)
+	NewL__14CStifTFwIfProt @ 59 NONAME R3UNUSED ; CStifTFwIfProt::NewL(void)
+	NewL__15CStifItemParserG7TPtrC16ii @ 60 NONAME ; CStifItemParser::NewL(TPtrC16, int, int)
+	NewL__20CSTIFTestMeasurementP15CTestModuleBaseQ220CSTIFTestMeasurement20TSTIFMeasurementTypeRC7TDesC16 @ 61 NONAME R3UNUSED ; CSTIFTestMeasurement::NewL(CTestModuleBase *, CSTIFTestMeasurement::TSTIFMeasurementType, TDesC16 const &)
+	NewL__21CTestModuleParamVer01 @ 62 NONAME R3UNUSED ; CTestModuleParamVer01::NewL(void)
+	NewL__21MSTIFTestInterferenceP15CTestModuleBaseQ221MSTIFTestInterference29TStifTestInterferenceCategory @ 63 NONAME R3UNUSED ; MSTIFTestInterference::NewL(CTestModuleBase *, MSTIFTestInterference::TStifTestInterferenceCategory)
+	NextSectionL__11CStifParserRC7TDesC16T1i @ 64 NONAME ; CStifParser::NextSectionL(TDesC16 const &, TDesC16 const &, int)
+	NextSubSectionL__18CStifSectionParserRC7TDesC16T1i @ 65 NONAME ; CStifSectionParser::NextSubSectionL(TDesC16 const &, TDesC16 const &, int)
+	OutputType__11CStifLogger @ 66 NONAME R3UNUSED ; CStifLogger::OutputType(void)
+	ParsingType__15CStifItemParser @ 67 NONAME R3UNUSED ; CStifItemParser::ParsingType(void)
+	Printf__13CTestModuleIfiRC7TDesC16Gt11TRefByValue1ZC7TDesC16e @ 68 NONAME ; CTestModuleIf::Printf(int, TDesC16 const &, TRefByValue<TDesC16 const>,...)
+	Reboot__13CTestModuleIfi @ 69 NONAME R3UNUSED ; CTestModuleIf::Reboot(int)
+	Remainder__15CStifItemParserR7TPtrC16 @ 70 NONAME R3UNUSED ; CStifItemParser::Remainder(TPtrC16 &)
+	RemoteReceiveCancel__13CTestModuleIf @ 71 NONAME R3UNUSED ; CTestModuleIf::RemoteReceiveCancel(void)
+	RemoteReceive__13CTestModuleIfR6TDes16R14TRequestStatus @ 72 NONAME R3UNUSED ; CTestModuleIf::RemoteReceive(TDes16 &, TRequestStatus &)
+	RemoteSend__13CTestModuleIfRC7TDesC16 @ 73 NONAME R3UNUSED ; CTestModuleIf::RemoteSend(TDesC16 const &)
+	RemoteType__14CStifTFwIfProti @ 74 NONAME R3UNUSED ; CStifTFwIfProt::RemoteType(int)
+	ResetAllowResult__13CTestModuleIf @ 75 NONAME R3UNUSED ; CTestModuleIf::ResetAllowResult(void)
+	RespParam__14CStifTFwIfProti @ 76 NONAME R3UNUSED ; CStifTFwIfProt::RespParam(int)
+	ResultCategory__14CStifTFwIfProti @ 77 NONAME R3UNUSED ; CStifTFwIfProt::ResultCategory(int)
+	RunInternalL__11CScriptBasePC17TStifFunctionInfoiR15CStifItemParser @ 78 NONAME ; CScriptBase::RunInternalL(TStifFunctionInfo const *, int, CStifItemParser &)
+	RunParams__14CStifTFwIfProti @ 79 NONAME R3UNUSED ; CStifTFwIfProt::RunParams(int)
+	RunStatusParams__14CStifTFwIfProti @ 80 NONAME R3UNUSED ; CStifTFwIfProt::RunStatusParams(int)
+	RunStatus__14CStifTFwIfProti @ 81 NONAME R3UNUSED ; CStifTFwIfProt::RunStatus(int)
+	SaveData__11CStifLoggerR6TDesC8 @ 82 NONAME R3UNUSED ; CStifLogger::SaveData(TDesC8 &)
+	SaveData__11CStifLoggerR7TDesC16 @ 83 NONAME R3UNUSED ; CStifLogger::SaveData(TDesC16 &)
+	SectionL__11CStifParserRC7TDesC16T1i @ 84 NONAME ; CStifParser::SectionL(TDesC16 const &, TDesC16 const &, int)
+	SetAllowResult__13CTestModuleIfi @ 85 NONAME R3UNUSED ; CTestModuleIf::SetAllowResult(int)
+	SetBehavior__13CTestModuleIfQ213CTestModuleIf13TTestBehaviorPv @ 86 NONAME R3UNUSED ; CTestModuleIf::SetBehavior(CTestModuleIf::TTestBehavior, void *)
+	SetCmdType__14CStifTFwIfProtQ214CStifTFwIfProt8TCmdType @ 87 NONAME R3UNUSED ; CStifTFwIfProt::SetCmdType(CStifTFwIfProt::TCmdType)
+	SetDstId__14CStifTFwIfProtUl @ 88 NONAME R3UNUSED ; CStifTFwIfProt::SetDstId(unsigned long)
+	SetExitReason__13CTestModuleIfQ213CTestModuleIf11TExitReasoni @ 89 NONAME R3UNUSED ; CTestModuleIf::SetExitReason(CTestModuleIf::TExitReason, int)
+	SetL__14CStifTFwIfProtRC7TDesC16 @ 90 NONAME R3UNUSED ; CStifTFwIfProt::SetL(TDesC16 const &)
+	SetMsgType__14CStifTFwIfProtQ214CStifTFwIfProt8TMsgType @ 91 NONAME R3UNUSED ; CStifTFwIfProt::SetMsgType(CStifTFwIfProt::TMsgType)
+	SetParsingType__15CStifItemParserQ215CStifItemParser12TParsingType @ 92 NONAME R3UNUSED ; CStifItemParser::SetParsingType(CStifItemParser::TParsingType)
+	SetPosition__18CStifSectionParseri @ 93 NONAME R3UNUSED ; CStifSectionParser::SetPosition(int)
+	SetRespType__14CStifTFwIfProtQ214CStifTFwIfProt8TMsgType @ 94 NONAME R3UNUSED ; CStifTFwIfProt::SetRespType(CStifTFwIfProt::TMsgType)
+	SetResult__11TTestResultiRC7TDesC16 @ 95 NONAME R3UNUSED ; TTestResult::SetResult(int, TDesC16 const &)
+	SetScripter__11CScriptBasePFP13CTestScripter19TStifTSCallBackTypeRC7TDesC16_iP13CTestScripter @ 96 NONAME R3UNUSED ; CScriptBase::SetScripter(int (*)(CTestScripter *, TStifTSCallBackType, TDesC16 const &), CTestScripter *)
+	SetSrcId__14CStifTFwIfProtUl @ 97 NONAME R3UNUSED ; CStifTFwIfProt::SetSrcId(unsigned long)
+	Signal__11CScriptBasei @ 98 NONAME R3UNUSED ; CScriptBase::Signal(int)
+	SrcDevId__14CStifTFwIfProt @ 99 NONAME R3UNUSED ; CStifTFwIfProt::SrcDevId(void)
+	SrcId__14CStifTFwIfProt @ 100 NONAME R3UNUSED ; CStifTFwIfProt::SrcId(void)
+	SrcTestId__14CStifTFwIfProt @ 101 NONAME R3UNUSED ; CStifTFwIfProt::SrcTestId(void)
+	StartSession__Fv @ 102 NONAME R3UNUSED ; StartSession(void)
+	Start__20CSTIFTestMeasurement @ 103 NONAME R3UNUSED ; CSTIFTestMeasurement::Start(void)
+	StifMacroError__13CTestModuleIfiPCUcPCciiiiiii @ 104 NONAME ; CTestModuleIf::StifMacroError(int, unsigned char const *, char const *, int, int, int, int, int, int, int)
+	Stop__20CSTIFTestMeasurement @ 105 NONAME R3UNUSED ; CSTIFTestMeasurement::Stop(void)
+	StoreState__13CTestModuleIfiRt4TBuf1i128 @ 106 NONAME R3UNUSED ; CTestModuleIf::StoreState(int, TBuf<128> &)
+	SubSectionL__18CStifSectionParserRC7TDesC16T1i @ 107 NONAME ; CStifSectionParser::SubSectionL(TDesC16 const &, TDesC16 const &, int)
+	TestModuleIf__11CScriptBase @ 108 NONAME R3UNUSED ; CScriptBase::TestModuleIf(void)
+	WriteDelimiter__11CStifLoggerRC6TDesC8i @ 109 NONAME R3UNUSED ; CStifLogger::WriteDelimiter(TDesC8 const &, int)
+	WriteDelimiter__11CStifLoggerRC7TDesC16i @ 110 NONAME R3UNUSED ; CStifLogger::WriteDelimiter(TDesC16 const &, int)
+	"_._11CStifParser" @ 111 NONAME R3UNUSED ; CStifParser::~CStifParser(void)
+	"_._14CStifTFwIfProt" @ 112 NONAME R3UNUSED ; CStifTFwIfProt::~CStifTFwIfProt(void)
+	"_._21CTestModuleParamVer01" @ 113 NONAME R3UNUSED ; CTestModuleParamVer01::~CTestModuleParamVer01(void)
+	__11CScriptBaseR13CTestModuleIf @ 114 NONAME R3UNUSED ; CScriptBase::CScriptBase(CTestModuleIf &)
+	__11TTestResult @ 115 NONAME R3UNUSED ; TTestResult::TTestResult(void)
+	__13TTestCaseInfo @ 116 NONAME R3UNUSED ; TTestCaseInfo::TTestCaseInfo(void)
+	__13TTestProgress @ 117 NONAME R3UNUSED ; TTestProgress::TTestProgress(void)
+	__15TFullTestResult @ 118 NONAME R3UNUSED ; TFullTestResult::TFullTestResult(void)
+	__18TErrorNotification @ 119 NONAME R3UNUSED ; TErrorNotification::TErrorNotification(void)
+	AppendId__14CStifTFwIfProtUl @ 120 NONAME R3UNUSED ; CStifTFwIfProt::AppendId(unsigned long)
+
--- a/stif/TestInterface/BWINS/STIFTESTINTERFACEU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-EXPORTS
-	??0CScriptBase@@IAE@AAVCTestModuleIf@@@Z @ 1 NONAME ; CScriptBase::CScriptBase(class CTestModuleIf &)
-	??0TErrorNotification@@QAE@XZ @ 2 NONAME ; TErrorNotification::TErrorNotification(void)
-	??0TFullTestResult@@QAE@XZ @ 3 NONAME ; TFullTestResult::TFullTestResult(void)
-	??0TTestCaseInfo@@QAE@XZ @ 4 NONAME ; TTestCaseInfo::TTestCaseInfo(void)
-	??0TTestInfo@@QAE@XZ @ 5 NONAME ; TTestInfo::TTestInfo(void)
-	??0TTestProgress@@QAE@XZ @ 6 NONAME ; TTestProgress::TTestProgress(void)
-	??0TTestResult@@QAE@XZ @ 7 NONAME ; TTestResult::TTestResult(void)
-	??1CStifParser@@UAE@XZ @ 8 NONAME ; CStifParser::~CStifParser(void)
-	??1CStifTFwIfProt@@UAE@XZ @ 9 NONAME ; CStifTFwIfProt::~CStifTFwIfProt(void)
-	??1CTestModuleParamVer01@@UAE@XZ @ 10 NONAME ; CTestModuleParamVer01::~CTestModuleParamVer01(void)
-	?Append@CStifTFwIfProt@@QAEHABVTDesC16@@@Z @ 11 NONAME ; int CStifTFwIfProt::Append(class TDesC16 const &)
-	?Append@CStifTFwIfProt@@QAEHP6A?AVTPtrC16@@H@ZH0H@Z @ 12 NONAME ; int CStifTFwIfProt::Append(class TPtrC16 (*)(int), int, class TPtrC16 (*)(int), int)
-	?Append@CStifTFwIfProt@@QAEHP6A?AVTPtrC16@@H@ZH@Z @ 13 NONAME ; int CStifTFwIfProt::Append(class TPtrC16 (*)(int), int)
-	?Append@CStifTFwIfProt@@QAEHP6A?AVTPtrC16@@H@ZHABVTDesC16@@@Z @ 14 NONAME ; int CStifTFwIfProt::Append(class TPtrC16 (*)(int), int, class TDesC16 const &)
-	?Append@CStifTFwIfProt@@QAEHP6A?AVTPtrC16@@H@ZHH@Z @ 15 NONAME ; int CStifTFwIfProt::Append(class TPtrC16 (*)(int), int, int)
-	?AppendId@CStifTFwIfProt@@QAEHK@Z @ 16 NONAME ; int CStifTFwIfProt::AppendId(unsigned long)
-	?CallTestClass@CScriptBase@@QAEHABVTDesC16@@@Z @ 17 NONAME ; int CScriptBase::CallTestClass(class TDesC16 const &)
-	?CancelEvent@CTestModuleIf@@QAEHAAVTEventIf@@PAVTRequestStatus@@@Z @ 18 NONAME ; int CTestModuleIf::CancelEvent(class TEventIf &, class TRequestStatus *)
-	?CancelSignal@CScriptBase@@AAEXXZ @ 19 NONAME ; void CScriptBase::CancelSignal(void)
-	?CheckAllowResult@CTestModuleIf@@QAEHH@Z @ 20 NONAME ; int CTestModuleIf::CheckAllowResult(int)
-	?CmdType@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 21 NONAME ; class TPtrC16 CStifTFwIfProt::CmdType(int)
-	?CreateL@CStifTFwIfProt@@QAEXH@Z @ 22 NONAME ; void CStifTFwIfProt::CreateL(int)
-	?CreationResult@CStifLogger@@QAEHXZ @ 23 NONAME ; int CStifLogger::CreationResult(void)
-	?DstDevId@CStifTFwIfProt@@QAEGXZ @ 24 NONAME ; unsigned short CStifTFwIfProt::DstDevId(void)
-	?DstId@CStifTFwIfProt@@QAEKXZ @ 25 NONAME ; unsigned long CStifTFwIfProt::DstId(void)
-	?DstTestId@CStifTFwIfProt@@QAEGXZ @ 26 NONAME ; unsigned short CStifTFwIfProt::DstTestId(void)
-	?EnableSignal@CScriptBase@@AAEXAAVTRequestStatus@@@Z @ 27 NONAME ; void CScriptBase::EnableSignal(class TRequestStatus &)
-	?Event@CTestModuleIf@@QAEHAAVTEventIf@@@Z @ 28 NONAME ; int CTestModuleIf::Event(class TEventIf &)
-	?Event@CTestModuleIf@@QAEXAAVTEventIf@@AAVTRequestStatus@@@Z @ 29 NONAME ; void CTestModuleIf::Event(class TEventIf &, class TRequestStatus &)
-	?EventStatus@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 30 NONAME ; class TPtrC16 CStifTFwIfProt::EventStatus(int)
-	?EventStatusParams@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 31 NONAME ; class TPtrC16 CStifTFwIfProt::EventStatusParams(int)
-	?EventType@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 32 NONAME ; class TPtrC16 CStifTFwIfProt::EventType(int)
-	?GetChar@CStifItemParser@@QAEHABVTDesC16@@AAVTChar@@@Z @ 33 NONAME ; int CStifItemParser::GetChar(class TDesC16 const &, class TChar &)
-	?GetInt@CStifItemParser@@QAEHABVTDesC16@@AAH@Z @ 34 NONAME ; int CStifItemParser::GetInt(class TDesC16 const &, int &)
-	?GetInt@CStifItemParser@@QAEHABVTDesC16@@AAIW4TRadix@@@Z @ 35 NONAME ; int CStifItemParser::GetInt(class TDesC16 const &, unsigned int &, enum TRadix)
-	?GetItemLineL@CStifSectionParser@@QAEPAVCStifItemParser@@ABVTDesC16@@W4TTagToReturnValue@@@Z @ 36 NONAME ; class CStifItemParser * CStifSectionParser::GetItemLineL(class TDesC16 const &, enum TTagToReturnValue)
-	?GetLine@CStifSectionParser@@QAEHABVTDesC16@@AAVTPtrC16@@W4TTagToReturnValue@@@Z @ 37 NONAME ; int CStifSectionParser::GetLine(class TDesC16 const &, class TPtrC16 &, enum TTagToReturnValue)
-	?GetMeasurementOptions@CTestModuleIf@@QAEHAAH@Z @ 38 NONAME ; int CTestModuleIf::GetMeasurementOptions(int &)
-	?GetNextChar@CStifItemParser@@QAEHAAVTChar@@@Z @ 39 NONAME ; int CStifItemParser::GetNextChar(class TChar &)
-	?GetNextChar@CStifItemParser@@QAEHABVTDesC16@@AAVTChar@@@Z @ 40 NONAME ; int CStifItemParser::GetNextChar(class TDesC16 const &, class TChar &)
-	?GetNextInt@CStifItemParser@@QAEHAAH@Z @ 41 NONAME ; int CStifItemParser::GetNextInt(int &)
-	?GetNextInt@CStifItemParser@@QAEHAAIW4TRadix@@@Z @ 42 NONAME ; int CStifItemParser::GetNextInt(unsigned int &, enum TRadix)
-	?GetNextInt@CStifItemParser@@QAEHABVTDesC16@@AAH@Z @ 43 NONAME ; int CStifItemParser::GetNextInt(class TDesC16 const &, int &)
-	?GetNextInt@CStifItemParser@@QAEHABVTDesC16@@AAIW4TRadix@@@Z @ 44 NONAME ; int CStifItemParser::GetNextInt(class TDesC16 const &, unsigned int &, enum TRadix)
-	?GetNextItemLineL@CStifSectionParser@@QAEPAVCStifItemParser@@ABVTDesC16@@W4TTagToReturnValue@@@Z @ 45 NONAME ; class CStifItemParser * CStifSectionParser::GetNextItemLineL(class TDesC16 const &, enum TTagToReturnValue)
-	?GetNextItemLineL@CStifSectionParser@@QAEPAVCStifItemParser@@XZ @ 46 NONAME ; class CStifItemParser * CStifSectionParser::GetNextItemLineL(void)
-	?GetNextLine@CStifSectionParser@@QAEHAAVTPtrC16@@@Z @ 47 NONAME ; int CStifSectionParser::GetNextLine(class TPtrC16 &)
-	?GetNextLine@CStifSectionParser@@QAEHABVTDesC16@@AAVTPtrC16@@W4TTagToReturnValue@@@Z @ 48 NONAME ; int CStifSectionParser::GetNextLine(class TDesC16 const &, class TPtrC16 &, enum TTagToReturnValue)
-	?GetNextString@CStifItemParser@@QAEHAAVTPtrC16@@@Z @ 49 NONAME ; int CStifItemParser::GetNextString(class TPtrC16 &)
-	?GetNextString@CStifItemParser@@QAEHABVTDesC16@@AAVTPtrC16@@@Z @ 50 NONAME ; int CStifItemParser::GetNextString(class TDesC16 const &, class TPtrC16 &)
-	?GetPosition@CStifSectionParser@@QAEHXZ @ 51 NONAME ; int CStifSectionParser::GetPosition(void)
-	?GetStoredState@CTestModuleIf@@QAEHAAHAAV?$TBuf@$0IA@@@@Z @ 52 NONAME ; int CTestModuleIf::GetStoredState(int &, class TBuf<128> &)
-	?GetString@CStifItemParser@@QAEHABVTDesC16@@AAVTPtrC16@@@Z @ 53 NONAME ; int CStifItemParser::GetString(class TDesC16 const &, class TPtrC16 &)
-	?GetTestObject@CScriptBase@@QAEPAV1@ABVTDesC16@@@Z @ 54 NONAME ; class CScriptBase * CScriptBase::GetTestObject(class TDesC16 const &)
-	?Log@CStifLogger@@QAAHHV?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 55 NONAME ; int CStifLogger::Log(int, class TRefByValue<class TDesC16 const >, ...)
-	?Log@CStifLogger@@QAAHHV?$TRefByValue@$$CBVTDesC8@@@@ZZ @ 56 NONAME ; int CStifLogger::Log(int, class TRefByValue<class TDesC8 const >, ...)
-	?Log@CStifLogger@@QAAHV?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 57 NONAME ; int CStifLogger::Log(class TRefByValue<class TDesC16 const >, ...)
-	?Log@CStifLogger@@QAAHV?$TRefByValue@$$CBVTDesC8@@@@ZZ @ 58 NONAME ; int CStifLogger::Log(class TRefByValue<class TDesC8 const >, ...)
-	?Log@CStifLogger@@QAEHABVTDesC16@@@Z @ 59 NONAME ; int CStifLogger::Log(class TDesC16 const &)
-	?Log@CStifLogger@@QAEHABVTDesC8@@@Z @ 60 NONAME ; int CStifLogger::Log(class TDesC8 const &)
-	?Log@CStifLogger@@QAEHHABVTDesC16@@@Z @ 61 NONAME ; int CStifLogger::Log(int, class TDesC16 const &)
-	?Log@CStifLogger@@QAEHHABVTDesC8@@@Z @ 62 NONAME ; int CStifLogger::Log(int, class TDesC8 const &)
-	?MsgType@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 63 NONAME ; class TPtrC16 CStifTFwIfProt::MsgType(int)
-	?NewL@CSTIFTestMeasurement@@SAPAV1@PAVCTestModuleBase@@W4TSTIFMeasurementType@1@ABVTDesC16@@@Z @ 64 NONAME ; class CSTIFTestMeasurement * CSTIFTestMeasurement::NewL(class CTestModuleBase *, enum CSTIFTestMeasurement::TSTIFMeasurementType, class TDesC16 const &)
-	?NewL@CStifItemParser@@SAPAV1@VTPtrC16@@HH@Z @ 65 NONAME ; class CStifItemParser * CStifItemParser::NewL(class TPtrC16, int, int)
-	?NewL@CStifLogger@@KAPAV1@ABVTDesC16@@0AAUTLoggerSettings@@@Z @ 66 NONAME ; class CStifLogger * CStifLogger::NewL(class TDesC16 const &, class TDesC16 const &, struct TLoggerSettings &)
-	?NewL@CStifLogger@@SAPAV1@ABVTDesC16@@0W4TLoggerType@1@W4TOutput@1@HHHHHHHH@Z @ 67 NONAME ; class CStifLogger * CStifLogger::NewL(class TDesC16 const &, class TDesC16 const &, enum CStifLogger::TLoggerType, enum CStifLogger::TOutput, int, int, int, int, int, int, int, int)
-	?NewL@CStifParser@@SAPAV1@ABVTDesC16@@0W4TCommentType@1@@Z @ 68 NONAME ; class CStifParser * CStifParser::NewL(class TDesC16 const &, class TDesC16 const &, enum CStifParser::TCommentType)
-	?NewL@CStifParser@@SAPAV1@ABVTDesC16@@W4TCommentType@1@@Z @ 69 NONAME ; class CStifParser * CStifParser::NewL(class TDesC16 const &, enum CStifParser::TCommentType)
-	?NewL@CStifTFwIfProt@@SAPAV1@XZ @ 70 NONAME ; class CStifTFwIfProt * CStifTFwIfProt::NewL(void)
-	?NewL@CTestModuleIf@@SAPAV1@PAVCTestThreadContainer@@PAVCTestModuleBase@@@Z @ 71 NONAME ; class CTestModuleIf * CTestModuleIf::NewL(class CTestThreadContainer *, class CTestModuleBase *)
-	?NewL@CTestModuleParamVer01@@SAPAV1@XZ @ 72 NONAME ; class CTestModuleParamVer01 * CTestModuleParamVer01::NewL(void)
-	?NewL@MSTIFTestInterference@@SAPAV1@PAVCTestModuleBase@@W4TStifTestInterferenceCategory@1@@Z @ 73 NONAME ; class MSTIFTestInterference * MSTIFTestInterference::NewL(class CTestModuleBase *, enum MSTIFTestInterference::TStifTestInterferenceCategory)
-	?NextSectionL@CStifParser@@QAEPAVCStifSectionParser@@ABVTDesC16@@0H@Z @ 74 NONAME ; class CStifSectionParser * CStifParser::NextSectionL(class TDesC16 const &, class TDesC16 const &, int)
-	?NextSubSectionL@CStifSectionParser@@QAEPAV1@ABVTDesC16@@0H@Z @ 75 NONAME ; class CStifSectionParser * CStifSectionParser::NextSubSectionL(class TDesC16 const &, class TDesC16 const &, int)
-	?OutputType@CStifLogger@@QAE?AW4TOutput@1@XZ @ 76 NONAME ; enum CStifLogger::TOutput CStifLogger::OutputType(void)
-	?ParsingType@CStifItemParser@@QAE?AW4TParsingType@1@XZ @ 77 NONAME ; enum CStifItemParser::TParsingType CStifItemParser::ParsingType(void)
-	?Printf@CTestModuleIf@@QAAXHABVTDesC16@@V?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 78 NONAME ; void CTestModuleIf::Printf(int, class TDesC16 const &, class TRefByValue<class TDesC16 const >, ...)
-	?Reboot@CTestModuleIf@@QAEHH@Z @ 79 NONAME ; int CTestModuleIf::Reboot(int)
-	?Remainder@CStifItemParser@@QAEHAAVTPtrC16@@@Z @ 80 NONAME ; int CStifItemParser::Remainder(class TPtrC16 &)
-	?RemoteReceive@CTestModuleIf@@QAEXAAVTDes16@@AAVTRequestStatus@@@Z @ 81 NONAME ; void CTestModuleIf::RemoteReceive(class TDes16 &, class TRequestStatus &)
-	?RemoteReceiveCancel@CTestModuleIf@@QAEXXZ @ 82 NONAME ; void CTestModuleIf::RemoteReceiveCancel(void)
-	?RemoteSend@CTestModuleIf@@QAEHABVTDesC16@@@Z @ 83 NONAME ; int CTestModuleIf::RemoteSend(class TDesC16 const &)
-	?RemoteType@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 84 NONAME ; class TPtrC16 CStifTFwIfProt::RemoteType(int)
-	?ResetAllowResult@CTestModuleIf@@QAEHXZ @ 85 NONAME ; int CTestModuleIf::ResetAllowResult(void)
-	?RespParam@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 86 NONAME ; class TPtrC16 CStifTFwIfProt::RespParam(int)
-	?ResultCategory@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 87 NONAME ; class TPtrC16 CStifTFwIfProt::ResultCategory(int)
-	?RunInternalL@CScriptBase@@MAEHQBVTStifFunctionInfo@@HAAVCStifItemParser@@@Z @ 88 NONAME ; int CScriptBase::RunInternalL(class TStifFunctionInfo const * const, int, class CStifItemParser &)
-	?RunParams@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 89 NONAME ; class TPtrC16 CStifTFwIfProt::RunParams(int)
-	?RunStatus@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 90 NONAME ; class TPtrC16 CStifTFwIfProt::RunStatus(int)
-	?RunStatusParams@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 91 NONAME ; class TPtrC16 CStifTFwIfProt::RunStatusParams(int)
-	?SaveData@CStifLogger@@QAEHAAVTDesC16@@@Z @ 92 NONAME ; int CStifLogger::SaveData(class TDesC16 &)
-	?SaveData@CStifLogger@@QAEHAAVTDesC8@@@Z @ 93 NONAME ; int CStifLogger::SaveData(class TDesC8 &)
-	?SectionL@CStifParser@@QAEPAVCStifSectionParser@@ABVTDesC16@@0H@Z @ 94 NONAME ; class CStifSectionParser * CStifParser::SectionL(class TDesC16 const &, class TDesC16 const &, int)
-	?SetAllowResult@CTestModuleIf@@QAEHH@Z @ 95 NONAME ; int CTestModuleIf::SetAllowResult(int)
-	?SetBehavior@CTestModuleIf@@QAEHW4TTestBehavior@1@PAX@Z @ 96 NONAME ; int CTestModuleIf::SetBehavior(enum CTestModuleIf::TTestBehavior, void *)
-	?SetCmdType@CStifTFwIfProt@@QAEHW4TCmdType@1@@Z @ 97 NONAME ; int CStifTFwIfProt::SetCmdType(enum CStifTFwIfProt::TCmdType)
-	?SetDstId@CStifTFwIfProt@@QAEHK@Z @ 98 NONAME ; int CStifTFwIfProt::SetDstId(unsigned long)
-	?SetExitReason@CTestModuleIf@@QAEXW4TExitReason@1@H@Z @ 99 NONAME ; void CTestModuleIf::SetExitReason(enum CTestModuleIf::TExitReason, int)
-	?SetL@CStifTFwIfProt@@QAEHABVTDesC16@@@Z @ 100 NONAME ; int CStifTFwIfProt::SetL(class TDesC16 const &)
-	?SetMsgType@CStifTFwIfProt@@QAEHW4TMsgType@1@@Z @ 101 NONAME ; int CStifTFwIfProt::SetMsgType(enum CStifTFwIfProt::TMsgType)
-	?SetParsingType@CStifItemParser@@QAEHW4TParsingType@1@@Z @ 102 NONAME ; int CStifItemParser::SetParsingType(enum CStifItemParser::TParsingType)
-	?SetPosition@CStifSectionParser@@QAEHH@Z @ 103 NONAME ; int CStifSectionParser::SetPosition(int)
-	?SetRespType@CStifTFwIfProt@@QAEHW4TMsgType@1@@Z @ 104 NONAME ; int CStifTFwIfProt::SetRespType(enum CStifTFwIfProt::TMsgType)
-	?SetResult@TTestResult@@QAEXHABVTDesC16@@@Z @ 105 NONAME ; void TTestResult::SetResult(int, class TDesC16 const &)
-	?SetScripter@CScriptBase@@AAEXP6AHPAVCTestScripter@@W4TStifTSCallBackType@@ABVTDesC16@@@Z0@Z @ 106 NONAME ; void CScriptBase::SetScripter(int (*)(class CTestScripter *, enum TStifTSCallBackType, class TDesC16 const &), class CTestScripter *)
-	?SetSrcId@CStifTFwIfProt@@QAEHK@Z @ 107 NONAME ; int CStifTFwIfProt::SetSrcId(unsigned long)
-	?Signal@CScriptBase@@QAEXH@Z @ 108 NONAME ; void CScriptBase::Signal(int)
-	?SrcDevId@CStifTFwIfProt@@QAEGXZ @ 109 NONAME ; unsigned short CStifTFwIfProt::SrcDevId(void)
-	?SrcId@CStifTFwIfProt@@QAEKXZ @ 110 NONAME ; unsigned long CStifTFwIfProt::SrcId(void)
-	?SrcTestId@CStifTFwIfProt@@QAEGXZ @ 111 NONAME ; unsigned short CStifTFwIfProt::SrcTestId(void)
-	?Start@CSTIFTestMeasurement@@QAEHXZ @ 112 NONAME ; int CSTIFTestMeasurement::Start(void)
-	?StartSession@@YAHXZ @ 113 NONAME ; int StartSession(void)
-	?StifMacroError@CTestModuleIf@@QAEHHPBEPBDHHHHHHH@Z @ 114 NONAME ; int CTestModuleIf::StifMacroError(int, unsigned char const *, char const *, int, int, int, int, int, int, int)
-	?Stop@CSTIFTestMeasurement@@QAEHXZ @ 115 NONAME ; int CSTIFTestMeasurement::Stop(void)
-	?StoreState@CTestModuleIf@@QAEHHAAV?$TBuf@$0IA@@@@Z @ 116 NONAME ; int CTestModuleIf::StoreState(int, class TBuf<128> &)
-	?SubSectionL@CStifSectionParser@@QAEPAV1@ABVTDesC16@@0H@Z @ 117 NONAME ; class CStifSectionParser * CStifSectionParser::SubSectionL(class TDesC16 const &, class TDesC16 const &, int)
-	?TestModuleIf@CScriptBase@@QAEAAVCTestModuleIf@@XZ @ 118 NONAME ; class CTestModuleIf & CScriptBase::TestModuleIf(void)
-	?WriteDelimiter@CStifLogger@@QAEHABVTDesC16@@H@Z @ 119 NONAME ; int CStifLogger::WriteDelimiter(class TDesC16 const &, int)
-	?WriteDelimiter@CStifLogger@@QAEHABVTDesC8@@H@Z @ 120 NONAME ; int CStifLogger::WriteDelimiter(class TDesC8 const &, int)
-	?StopExecution@CTestModuleIf@@QAEHW4TStopExecutionType@@H@Z @ 121 NONAME ; int CTestModuleIf::StopExecution(enum TStopExecutionType, int)
-	?GetConstantValue@CScriptBase@@IAEHABVTDesC16@@AAH@Z @ 122 NONAME ; int CScriptBase::GetConstantValue(class TDesC16 const &, int &)
-	?GetConstantValue@CScriptBase@@IAEHABVTDesC16@@AAN@Z @ 123 NONAME ; int CScriptBase::GetConstantValue(class TDesC16 const &, double &)
-	?GetConstantValue@CScriptBase@@IAEHABVTDesC16@@AAVTDes16@@@Z @ 124 NONAME ; int CScriptBase::GetConstantValue(class TDesC16 const &, class TDes16 &)
-	?CorrectFilePathL@TStifUtil@@SAXAAVTDes16@@@Z @ 125 NONAME ; void TStifUtil::CorrectFilePathL(class TDes16 &)
-	?GetTestCaseTitleL@CTestModuleIf@@QAEXAAVTDes16@@@Z @ 126 NONAME ; void CTestModuleIf::GetTestCaseTitleL(class TDes16 &)
-	?STIFVersion@TStifUtil@@SAXAAH00AAVTDes16@@@Z @ 127 NONAME ; void TStifUtil::STIFVersion(int &, int &, int &, class TDes16 &)
-	?GetUiEnvProxy@CTestModuleIf@@QAEPAVCUiEnvProxy@@XZ @ 128 NONAME ; class CUiEnvProxy * CTestModuleIf::GetUiEnvProxy(void)
-	?UITesting@CTestModuleIf@@QAEHXZ @ 129 NONAME ; int CTestModuleIf::UITesting(void)
-	?SendTestModuleVersion@CTestModuleIf@@QAEHVTVersion@@V?$TBuf@$0BAA@@@@Z @ 130 NONAME ; int CTestModuleIf::SendTestModuleVersion(class TVersion, class TBuf<256>)
-	?SendTestModuleVersion@CTestModuleIf@@QAEHAAVTVersion@@ABVTDesC16@@H@Z @ 131 NONAME ; int CTestModuleIf::SendTestModuleVersion(class TVersion &, class TDesC16 const &, int)
-	?SetResultDescription@CScriptBase@@QAEXABVTDesC16@@@Z @ 132 NONAME ; void CScriptBase::SetResultDescription(class TDesC16 const &)
-	?SetLocalValue@CScriptBase@@IAEHABVTDesC16@@0@Z @ 133 NONAME ; int CScriptBase::SetLocalValue(class TDesC16 const &, class TDesC16 const &)
-	?SetLocalValue@CScriptBase@@IAEHABVTDesC16@@H@Z @ 134 NONAME ; int CScriptBase::SetLocalValue(class TDesC16 const &, int)
-	?SetLocalValue@CScriptBase@@IAEHABVTDesC16@@N@Z @ 135 NONAME ; int CScriptBase::SetLocalValue(class TDesC16 const &, double)
-	?GetLocalValue@CScriptBase@@IAEHABVTDesC16@@AAH@Z @ 136 NONAME ; int CScriptBase::GetLocalValue(class TDesC16 const &, int &)
-	?GetLocalValue@CScriptBase@@IAEHABVTDesC16@@AAN@Z @ 137 NONAME ; int CScriptBase::GetLocalValue(class TDesC16 const &, double &)
-	?GetLocalValue@CScriptBase@@IAEHABVTDesC16@@AAVTDes16@@@Z @ 138 NONAME ; int CScriptBase::GetLocalValue(class TDesC16 const &, class TDes16 &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestInterface/BWINS/StifTestInterfaceu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,141 @@
+EXPORTS
+	??0CScriptBase@@IAE@AAVCTestModuleIf@@@Z @ 1 NONAME ; CScriptBase::CScriptBase(class CTestModuleIf &)
+	??0TErrorNotification@@QAE@XZ @ 2 NONAME ; TErrorNotification::TErrorNotification(void)
+	??0TFullTestResult@@QAE@XZ @ 3 NONAME ; TFullTestResult::TFullTestResult(void)
+	??0TTestCaseInfo@@QAE@XZ @ 4 NONAME ; TTestCaseInfo::TTestCaseInfo(void)
+	??0TTestInfo@@QAE@XZ @ 5 NONAME ; TTestInfo::TTestInfo(void)
+	??0TTestProgress@@QAE@XZ @ 6 NONAME ; TTestProgress::TTestProgress(void)
+	??0TTestResult@@QAE@XZ @ 7 NONAME ; TTestResult::TTestResult(void)
+	??1CStifParser@@UAE@XZ @ 8 NONAME ; CStifParser::~CStifParser(void)
+	??1CStifTFwIfProt@@UAE@XZ @ 9 NONAME ; CStifTFwIfProt::~CStifTFwIfProt(void)
+	??1CTestModuleParamVer01@@UAE@XZ @ 10 NONAME ; CTestModuleParamVer01::~CTestModuleParamVer01(void)
+	?Append@CStifTFwIfProt@@QAEHABVTDesC16@@@Z @ 11 NONAME ; int CStifTFwIfProt::Append(class TDesC16 const &)
+	?Append@CStifTFwIfProt@@QAEHP6A?AVTPtrC16@@H@ZH0H@Z @ 12 NONAME ; int CStifTFwIfProt::Append(class TPtrC16 (*)(int), int, class TPtrC16 (*)(int), int)
+	?Append@CStifTFwIfProt@@QAEHP6A?AVTPtrC16@@H@ZH@Z @ 13 NONAME ; int CStifTFwIfProt::Append(class TPtrC16 (*)(int), int)
+	?Append@CStifTFwIfProt@@QAEHP6A?AVTPtrC16@@H@ZHABVTDesC16@@@Z @ 14 NONAME ; int CStifTFwIfProt::Append(class TPtrC16 (*)(int), int, class TDesC16 const &)
+	?Append@CStifTFwIfProt@@QAEHP6A?AVTPtrC16@@H@ZHH@Z @ 15 NONAME ; int CStifTFwIfProt::Append(class TPtrC16 (*)(int), int, int)
+	?AppendId@CStifTFwIfProt@@QAEHK@Z @ 16 NONAME ; int CStifTFwIfProt::AppendId(unsigned long)
+	?CallTestClass@CScriptBase@@QAEHABVTDesC16@@@Z @ 17 NONAME ; int CScriptBase::CallTestClass(class TDesC16 const &)
+	?CancelEvent@CTestModuleIf@@QAEHAAVTEventIf@@PAVTRequestStatus@@@Z @ 18 NONAME ; int CTestModuleIf::CancelEvent(class TEventIf &, class TRequestStatus *)
+	?CancelSignal@CScriptBase@@AAEXXZ @ 19 NONAME ; void CScriptBase::CancelSignal(void)
+	?CheckAllowResult@CTestModuleIf@@QAEHH@Z @ 20 NONAME ; int CTestModuleIf::CheckAllowResult(int)
+	?CmdType@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 21 NONAME ; class TPtrC16 CStifTFwIfProt::CmdType(int)
+	?CreateL@CStifTFwIfProt@@QAEXH@Z @ 22 NONAME ; void CStifTFwIfProt::CreateL(int)
+	?CreationResult@CStifLogger@@QAEHXZ @ 23 NONAME ; int CStifLogger::CreationResult(void)
+	?DstDevId@CStifTFwIfProt@@QAEGXZ @ 24 NONAME ; unsigned short CStifTFwIfProt::DstDevId(void)
+	?DstId@CStifTFwIfProt@@QAEKXZ @ 25 NONAME ; unsigned long CStifTFwIfProt::DstId(void)
+	?DstTestId@CStifTFwIfProt@@QAEGXZ @ 26 NONAME ; unsigned short CStifTFwIfProt::DstTestId(void)
+	?EnableSignal@CScriptBase@@AAEXAAVTRequestStatus@@@Z @ 27 NONAME ; void CScriptBase::EnableSignal(class TRequestStatus &)
+	?Event@CTestModuleIf@@QAEHAAVTEventIf@@@Z @ 28 NONAME ; int CTestModuleIf::Event(class TEventIf &)
+	?Event@CTestModuleIf@@QAEXAAVTEventIf@@AAVTRequestStatus@@@Z @ 29 NONAME ; void CTestModuleIf::Event(class TEventIf &, class TRequestStatus &)
+	?EventStatus@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 30 NONAME ; class TPtrC16 CStifTFwIfProt::EventStatus(int)
+	?EventStatusParams@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 31 NONAME ; class TPtrC16 CStifTFwIfProt::EventStatusParams(int)
+	?EventType@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 32 NONAME ; class TPtrC16 CStifTFwIfProt::EventType(int)
+	?GetChar@CStifItemParser@@QAEHABVTDesC16@@AAVTChar@@@Z @ 33 NONAME ; int CStifItemParser::GetChar(class TDesC16 const &, class TChar &)
+	?GetInt@CStifItemParser@@QAEHABVTDesC16@@AAH@Z @ 34 NONAME ; int CStifItemParser::GetInt(class TDesC16 const &, int &)
+	?GetInt@CStifItemParser@@QAEHABVTDesC16@@AAIW4TRadix@@@Z @ 35 NONAME ; int CStifItemParser::GetInt(class TDesC16 const &, unsigned int &, enum TRadix)
+	?GetItemLineL@CStifSectionParser@@QAEPAVCStifItemParser@@ABVTDesC16@@W4TTagToReturnValue@@@Z @ 36 NONAME ; class CStifItemParser * CStifSectionParser::GetItemLineL(class TDesC16 const &, enum TTagToReturnValue)
+	?GetLine@CStifSectionParser@@QAEHABVTDesC16@@AAVTPtrC16@@W4TTagToReturnValue@@@Z @ 37 NONAME ; int CStifSectionParser::GetLine(class TDesC16 const &, class TPtrC16 &, enum TTagToReturnValue)
+	?GetMeasurementOptions@CTestModuleIf@@QAEHAAH@Z @ 38 NONAME ; int CTestModuleIf::GetMeasurementOptions(int &)
+	?GetNextChar@CStifItemParser@@QAEHAAVTChar@@@Z @ 39 NONAME ; int CStifItemParser::GetNextChar(class TChar &)
+	?GetNextChar@CStifItemParser@@QAEHABVTDesC16@@AAVTChar@@@Z @ 40 NONAME ; int CStifItemParser::GetNextChar(class TDesC16 const &, class TChar &)
+	?GetNextInt@CStifItemParser@@QAEHAAH@Z @ 41 NONAME ; int CStifItemParser::GetNextInt(int &)
+	?GetNextInt@CStifItemParser@@QAEHAAIW4TRadix@@@Z @ 42 NONAME ; int CStifItemParser::GetNextInt(unsigned int &, enum TRadix)
+	?GetNextInt@CStifItemParser@@QAEHABVTDesC16@@AAH@Z @ 43 NONAME ; int CStifItemParser::GetNextInt(class TDesC16 const &, int &)
+	?GetNextInt@CStifItemParser@@QAEHABVTDesC16@@AAIW4TRadix@@@Z @ 44 NONAME ; int CStifItemParser::GetNextInt(class TDesC16 const &, unsigned int &, enum TRadix)
+	?GetNextItemLineL@CStifSectionParser@@QAEPAVCStifItemParser@@ABVTDesC16@@W4TTagToReturnValue@@@Z @ 45 NONAME ; class CStifItemParser * CStifSectionParser::GetNextItemLineL(class TDesC16 const &, enum TTagToReturnValue)
+	?GetNextItemLineL@CStifSectionParser@@QAEPAVCStifItemParser@@XZ @ 46 NONAME ; class CStifItemParser * CStifSectionParser::GetNextItemLineL(void)
+	?GetNextLine@CStifSectionParser@@QAEHAAVTPtrC16@@@Z @ 47 NONAME ; int CStifSectionParser::GetNextLine(class TPtrC16 &)
+	?GetNextLine@CStifSectionParser@@QAEHABVTDesC16@@AAVTPtrC16@@W4TTagToReturnValue@@@Z @ 48 NONAME ; int CStifSectionParser::GetNextLine(class TDesC16 const &, class TPtrC16 &, enum TTagToReturnValue)
+	?GetNextString@CStifItemParser@@QAEHAAVTPtrC16@@@Z @ 49 NONAME ; int CStifItemParser::GetNextString(class TPtrC16 &)
+	?GetNextString@CStifItemParser@@QAEHABVTDesC16@@AAVTPtrC16@@@Z @ 50 NONAME ; int CStifItemParser::GetNextString(class TDesC16 const &, class TPtrC16 &)
+	?GetPosition@CStifSectionParser@@QAEHXZ @ 51 NONAME ; int CStifSectionParser::GetPosition(void)
+	?GetStoredState@CTestModuleIf@@QAEHAAHAAV?$TBuf@$0IA@@@@Z @ 52 NONAME ; int CTestModuleIf::GetStoredState(int &, class TBuf<128> &)
+	?GetString@CStifItemParser@@QAEHABVTDesC16@@AAVTPtrC16@@@Z @ 53 NONAME ; int CStifItemParser::GetString(class TDesC16 const &, class TPtrC16 &)
+	?GetTestObject@CScriptBase@@QAEPAV1@ABVTDesC16@@@Z @ 54 NONAME ; class CScriptBase * CScriptBase::GetTestObject(class TDesC16 const &)
+	?Log@CStifLogger@@QAAHHV?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 55 NONAME ; int CStifLogger::Log(int, class TRefByValue<class TDesC16 const >, ...)
+	?Log@CStifLogger@@QAAHHV?$TRefByValue@$$CBVTDesC8@@@@ZZ @ 56 NONAME ; int CStifLogger::Log(int, class TRefByValue<class TDesC8 const >, ...)
+	?Log@CStifLogger@@QAAHV?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 57 NONAME ; int CStifLogger::Log(class TRefByValue<class TDesC16 const >, ...)
+	?Log@CStifLogger@@QAAHV?$TRefByValue@$$CBVTDesC8@@@@ZZ @ 58 NONAME ; int CStifLogger::Log(class TRefByValue<class TDesC8 const >, ...)
+	?Log@CStifLogger@@QAEHABVTDesC16@@@Z @ 59 NONAME ; int CStifLogger::Log(class TDesC16 const &)
+	?Log@CStifLogger@@QAEHABVTDesC8@@@Z @ 60 NONAME ; int CStifLogger::Log(class TDesC8 const &)
+	?Log@CStifLogger@@QAEHHABVTDesC16@@@Z @ 61 NONAME ; int CStifLogger::Log(int, class TDesC16 const &)
+	?Log@CStifLogger@@QAEHHABVTDesC8@@@Z @ 62 NONAME ; int CStifLogger::Log(int, class TDesC8 const &)
+	?MsgType@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 63 NONAME ; class TPtrC16 CStifTFwIfProt::MsgType(int)
+	?NewL@CSTIFTestMeasurement@@SAPAV1@PAVCTestModuleBase@@W4TSTIFMeasurementType@1@ABVTDesC16@@@Z @ 64 NONAME ; class CSTIFTestMeasurement * CSTIFTestMeasurement::NewL(class CTestModuleBase *, enum CSTIFTestMeasurement::TSTIFMeasurementType, class TDesC16 const &)
+	?NewL@CStifItemParser@@SAPAV1@VTPtrC16@@HH@Z @ 65 NONAME ; class CStifItemParser * CStifItemParser::NewL(class TPtrC16, int, int)
+	?NewL@CStifLogger@@KAPAV1@ABVTDesC16@@0AAUTLoggerSettings@@@Z @ 66 NONAME ; class CStifLogger * CStifLogger::NewL(class TDesC16 const &, class TDesC16 const &, struct TLoggerSettings &)
+	?NewL@CStifLogger@@SAPAV1@ABVTDesC16@@0W4TLoggerType@1@W4TOutput@1@HHHHHHHH@Z @ 67 NONAME ; class CStifLogger * CStifLogger::NewL(class TDesC16 const &, class TDesC16 const &, enum CStifLogger::TLoggerType, enum CStifLogger::TOutput, int, int, int, int, int, int, int, int)
+	?NewL@CStifParser@@SAPAV1@ABVTDesC16@@0W4TCommentType@1@@Z @ 68 NONAME ; class CStifParser * CStifParser::NewL(class TDesC16 const &, class TDesC16 const &, enum CStifParser::TCommentType)
+	?NewL@CStifParser@@SAPAV1@ABVTDesC16@@W4TCommentType@1@@Z @ 69 NONAME ; class CStifParser * CStifParser::NewL(class TDesC16 const &, enum CStifParser::TCommentType)
+	?NewL@CStifTFwIfProt@@SAPAV1@XZ @ 70 NONAME ; class CStifTFwIfProt * CStifTFwIfProt::NewL(void)
+	?NewL@CTestModuleIf@@SAPAV1@PAVCTestThreadContainer@@PAVCTestModuleBase@@@Z @ 71 NONAME ; class CTestModuleIf * CTestModuleIf::NewL(class CTestThreadContainer *, class CTestModuleBase *)
+	?NewL@CTestModuleParamVer01@@SAPAV1@XZ @ 72 NONAME ; class CTestModuleParamVer01 * CTestModuleParamVer01::NewL(void)
+	?NewL@MSTIFTestInterference@@SAPAV1@PAVCTestModuleBase@@W4TStifTestInterferenceCategory@1@@Z @ 73 NONAME ; class MSTIFTestInterference * MSTIFTestInterference::NewL(class CTestModuleBase *, enum MSTIFTestInterference::TStifTestInterferenceCategory)
+	?NextSectionL@CStifParser@@QAEPAVCStifSectionParser@@ABVTDesC16@@0H@Z @ 74 NONAME ; class CStifSectionParser * CStifParser::NextSectionL(class TDesC16 const &, class TDesC16 const &, int)
+	?NextSubSectionL@CStifSectionParser@@QAEPAV1@ABVTDesC16@@0H@Z @ 75 NONAME ; class CStifSectionParser * CStifSectionParser::NextSubSectionL(class TDesC16 const &, class TDesC16 const &, int)
+	?OutputType@CStifLogger@@QAE?AW4TOutput@1@XZ @ 76 NONAME ; enum CStifLogger::TOutput CStifLogger::OutputType(void)
+	?ParsingType@CStifItemParser@@QAE?AW4TParsingType@1@XZ @ 77 NONAME ; enum CStifItemParser::TParsingType CStifItemParser::ParsingType(void)
+	?Printf@CTestModuleIf@@QAAXHABVTDesC16@@V?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 78 NONAME ; void CTestModuleIf::Printf(int, class TDesC16 const &, class TRefByValue<class TDesC16 const >, ...)
+	?Reboot@CTestModuleIf@@QAEHH@Z @ 79 NONAME ; int CTestModuleIf::Reboot(int)
+	?Remainder@CStifItemParser@@QAEHAAVTPtrC16@@@Z @ 80 NONAME ; int CStifItemParser::Remainder(class TPtrC16 &)
+	?RemoteReceive@CTestModuleIf@@QAEXAAVTDes16@@AAVTRequestStatus@@@Z @ 81 NONAME ; void CTestModuleIf::RemoteReceive(class TDes16 &, class TRequestStatus &)
+	?RemoteReceiveCancel@CTestModuleIf@@QAEXXZ @ 82 NONAME ; void CTestModuleIf::RemoteReceiveCancel(void)
+	?RemoteSend@CTestModuleIf@@QAEHABVTDesC16@@@Z @ 83 NONAME ; int CTestModuleIf::RemoteSend(class TDesC16 const &)
+	?RemoteType@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 84 NONAME ; class TPtrC16 CStifTFwIfProt::RemoteType(int)
+	?ResetAllowResult@CTestModuleIf@@QAEHXZ @ 85 NONAME ; int CTestModuleIf::ResetAllowResult(void)
+	?RespParam@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 86 NONAME ; class TPtrC16 CStifTFwIfProt::RespParam(int)
+	?ResultCategory@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 87 NONAME ; class TPtrC16 CStifTFwIfProt::ResultCategory(int)
+	?RunInternalL@CScriptBase@@MAEHQBVTStifFunctionInfo@@HAAVCStifItemParser@@@Z @ 88 NONAME ; int CScriptBase::RunInternalL(class TStifFunctionInfo const * const, int, class CStifItemParser &)
+	?RunParams@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 89 NONAME ; class TPtrC16 CStifTFwIfProt::RunParams(int)
+	?RunStatus@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 90 NONAME ; class TPtrC16 CStifTFwIfProt::RunStatus(int)
+	?RunStatusParams@CStifTFwIfProt@@SA?AVTPtrC16@@H@Z @ 91 NONAME ; class TPtrC16 CStifTFwIfProt::RunStatusParams(int)
+	?SaveData@CStifLogger@@QAEHAAVTDesC16@@@Z @ 92 NONAME ; int CStifLogger::SaveData(class TDesC16 &)
+	?SaveData@CStifLogger@@QAEHAAVTDesC8@@@Z @ 93 NONAME ; int CStifLogger::SaveData(class TDesC8 &)
+	?SectionL@CStifParser@@QAEPAVCStifSectionParser@@ABVTDesC16@@0H@Z @ 94 NONAME ; class CStifSectionParser * CStifParser::SectionL(class TDesC16 const &, class TDesC16 const &, int)
+	?SetAllowResult@CTestModuleIf@@QAEHH@Z @ 95 NONAME ; int CTestModuleIf::SetAllowResult(int)
+	?SetBehavior@CTestModuleIf@@QAEHW4TTestBehavior@1@PAX@Z @ 96 NONAME ; int CTestModuleIf::SetBehavior(enum CTestModuleIf::TTestBehavior, void *)
+	?SetCmdType@CStifTFwIfProt@@QAEHW4TCmdType@1@@Z @ 97 NONAME ; int CStifTFwIfProt::SetCmdType(enum CStifTFwIfProt::TCmdType)
+	?SetDstId@CStifTFwIfProt@@QAEHK@Z @ 98 NONAME ; int CStifTFwIfProt::SetDstId(unsigned long)
+	?SetExitReason@CTestModuleIf@@QAEXW4TExitReason@1@H@Z @ 99 NONAME ; void CTestModuleIf::SetExitReason(enum CTestModuleIf::TExitReason, int)
+	?SetL@CStifTFwIfProt@@QAEHABVTDesC16@@@Z @ 100 NONAME ; int CStifTFwIfProt::SetL(class TDesC16 const &)
+	?SetMsgType@CStifTFwIfProt@@QAEHW4TMsgType@1@@Z @ 101 NONAME ; int CStifTFwIfProt::SetMsgType(enum CStifTFwIfProt::TMsgType)
+	?SetParsingType@CStifItemParser@@QAEHW4TParsingType@1@@Z @ 102 NONAME ; int CStifItemParser::SetParsingType(enum CStifItemParser::TParsingType)
+	?SetPosition@CStifSectionParser@@QAEHH@Z @ 103 NONAME ; int CStifSectionParser::SetPosition(int)
+	?SetRespType@CStifTFwIfProt@@QAEHW4TMsgType@1@@Z @ 104 NONAME ; int CStifTFwIfProt::SetRespType(enum CStifTFwIfProt::TMsgType)
+	?SetResult@TTestResult@@QAEXHABVTDesC16@@@Z @ 105 NONAME ; void TTestResult::SetResult(int, class TDesC16 const &)
+	?SetScripter@CScriptBase@@AAEXP6AHPAVCTestScripter@@W4TStifTSCallBackType@@ABVTDesC16@@@Z0@Z @ 106 NONAME ; void CScriptBase::SetScripter(int (*)(class CTestScripter *, enum TStifTSCallBackType, class TDesC16 const &), class CTestScripter *)
+	?SetSrcId@CStifTFwIfProt@@QAEHK@Z @ 107 NONAME ; int CStifTFwIfProt::SetSrcId(unsigned long)
+	?Signal@CScriptBase@@QAEXH@Z @ 108 NONAME ; void CScriptBase::Signal(int)
+	?SrcDevId@CStifTFwIfProt@@QAEGXZ @ 109 NONAME ; unsigned short CStifTFwIfProt::SrcDevId(void)
+	?SrcId@CStifTFwIfProt@@QAEKXZ @ 110 NONAME ; unsigned long CStifTFwIfProt::SrcId(void)
+	?SrcTestId@CStifTFwIfProt@@QAEGXZ @ 111 NONAME ; unsigned short CStifTFwIfProt::SrcTestId(void)
+	?Start@CSTIFTestMeasurement@@QAEHXZ @ 112 NONAME ; int CSTIFTestMeasurement::Start(void)
+	?StartSession@@YAHXZ @ 113 NONAME ; int StartSession(void)
+	?StifMacroError@CTestModuleIf@@QAEHHPBEPBDHHHHHHH@Z @ 114 NONAME ; int CTestModuleIf::StifMacroError(int, unsigned char const *, char const *, int, int, int, int, int, int, int)
+	?Stop@CSTIFTestMeasurement@@QAEHXZ @ 115 NONAME ; int CSTIFTestMeasurement::Stop(void)
+	?StoreState@CTestModuleIf@@QAEHHAAV?$TBuf@$0IA@@@@Z @ 116 NONAME ; int CTestModuleIf::StoreState(int, class TBuf<128> &)
+	?SubSectionL@CStifSectionParser@@QAEPAV1@ABVTDesC16@@0H@Z @ 117 NONAME ; class CStifSectionParser * CStifSectionParser::SubSectionL(class TDesC16 const &, class TDesC16 const &, int)
+	?TestModuleIf@CScriptBase@@QAEAAVCTestModuleIf@@XZ @ 118 NONAME ; class CTestModuleIf & CScriptBase::TestModuleIf(void)
+	?WriteDelimiter@CStifLogger@@QAEHABVTDesC16@@H@Z @ 119 NONAME ; int CStifLogger::WriteDelimiter(class TDesC16 const &, int)
+	?WriteDelimiter@CStifLogger@@QAEHABVTDesC8@@H@Z @ 120 NONAME ; int CStifLogger::WriteDelimiter(class TDesC8 const &, int)
+	?StopExecution@CTestModuleIf@@QAEHW4TStopExecutionType@@H@Z @ 121 NONAME ; int CTestModuleIf::StopExecution(enum TStopExecutionType, int)
+	?GetConstantValue@CScriptBase@@IAEHABVTDesC16@@AAH@Z @ 122 NONAME ; int CScriptBase::GetConstantValue(class TDesC16 const &, int &)
+	?GetConstantValue@CScriptBase@@IAEHABVTDesC16@@AAN@Z @ 123 NONAME ; int CScriptBase::GetConstantValue(class TDesC16 const &, double &)
+	?GetConstantValue@CScriptBase@@IAEHABVTDesC16@@AAVTDes16@@@Z @ 124 NONAME ; int CScriptBase::GetConstantValue(class TDesC16 const &, class TDes16 &)
+	?CorrectFilePathL@TStifUtil@@SAXAAVTDes16@@@Z @ 125 NONAME ; void TStifUtil::CorrectFilePathL(class TDes16 &)
+	?GetTestCaseTitleL@CTestModuleIf@@QAEXAAVTDes16@@@Z @ 126 NONAME ; void CTestModuleIf::GetTestCaseTitleL(class TDes16 &)
+	?STIFVersion@TStifUtil@@SAXAAH00AAVTDes16@@@Z @ 127 NONAME ; void TStifUtil::STIFVersion(int &, int &, int &, class TDes16 &)
+	?GetUiEnvProxy@CTestModuleIf@@QAEPAVCUiEnvProxy@@XZ @ 128 NONAME ; class CUiEnvProxy * CTestModuleIf::GetUiEnvProxy(void)
+	?UITesting@CTestModuleIf@@QAEHXZ @ 129 NONAME ; int CTestModuleIf::UITesting(void)
+	?SendTestModuleVersion@CTestModuleIf@@QAEHVTVersion@@V?$TBuf@$0BAA@@@@Z @ 130 NONAME ; int CTestModuleIf::SendTestModuleVersion(class TVersion, class TBuf<256>)
+	?SendTestModuleVersion@CTestModuleIf@@QAEHAAVTVersion@@ABVTDesC16@@H@Z @ 131 NONAME ; int CTestModuleIf::SendTestModuleVersion(class TVersion &, class TDesC16 const &, int)
+	?SetResultDescription@CScriptBase@@QAEXABVTDesC16@@@Z @ 132 NONAME ; void CScriptBase::SetResultDescription(class TDesC16 const &)
+	?SetLocalValue@CScriptBase@@IAEHABVTDesC16@@0@Z @ 133 NONAME ; int CScriptBase::SetLocalValue(class TDesC16 const &, class TDesC16 const &)
+	?SetLocalValue@CScriptBase@@IAEHABVTDesC16@@H@Z @ 134 NONAME ; int CScriptBase::SetLocalValue(class TDesC16 const &, int)
+	?SetLocalValue@CScriptBase@@IAEHABVTDesC16@@N@Z @ 135 NONAME ; int CScriptBase::SetLocalValue(class TDesC16 const &, double)
+	?GetLocalValue@CScriptBase@@IAEHABVTDesC16@@AAH@Z @ 136 NONAME ; int CScriptBase::GetLocalValue(class TDesC16 const &, int &)
+	?GetLocalValue@CScriptBase@@IAEHABVTDesC16@@AAN@Z @ 137 NONAME ; int CScriptBase::GetLocalValue(class TDesC16 const &, double &)
+	?GetLocalValue@CScriptBase@@IAEHABVTDesC16@@AAVTDes16@@@Z @ 138 NONAME ; int CScriptBase::GetLocalValue(class TDesC16 const &, class TDes16 &)
+	?GetTestCaseArguments@CTestModuleIf@@QBEABVTDesC16@@XZ @ 139 NONAME ; class TDesC16 const & CTestModuleIf::GetTestCaseArguments(void) const
+
--- a/stif/TestInterface/eabi/StifTestInterfaceu.def	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestInterface/eabi/StifTestInterfaceu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -183,4 +183,5 @@
 	_ZN11CScriptBase13SetLocalValueERK7TDesC16S2_ @ 182 NONAME
 	_ZN11CScriptBase13SetLocalValueERK7TDesC16d @ 183 NONAME
 	_ZN11CScriptBase13SetLocalValueERK7TDesC16i @ 184 NONAME
+	_ZNK13CTestModuleIf20GetTestCaseArgumentsEv @ 185 NONAME
 
--- a/stif/TestInterface/src/TestInterface.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestInterface/src/TestInterface.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -418,7 +418,7 @@
     //__UHEAP_MARK;
 
     // Get module name from command line
-	const TInt length = User().CommandLineLength();
+	const TInt length = User::CommandLineLength();
     HBufC* cmdLine = HBufC::New( length );
     
     if ( cmdLine == NULL )
@@ -428,7 +428,7 @@
         }
 
     TPtr moduleName = cmdLine->Des();
-    User().CommandLine( moduleName );
+    User::CommandLine( moduleName );
 
     RDebug::Print(_L("StartSession() Received data [%S]"), &moduleName);
 
--- a/stif/TestInterface/src/TestModuleIf.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestInterface/src/TestModuleIf.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -1403,6 +1403,30 @@
 
     Class: CTestModuleIf
 
+    Method: GetTestCaseArguments
+
+    Description: Returns test case arguments.
+
+    Parameters: none
+
+    Return Values: test case arguments.
+
+    Errors/Exceptions: None
+
+    Status: proposal
+
+-------------------------------------------------------------------------------
+*/
+EXPORT_C const TDesC& CTestModuleIf::GetTestCaseArguments() const
+    {
+    return iTestExecution->GetTestCaseArguments();
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestModuleIf
+
     Method: UITesting
 
     Description: Gets information if it is UI test or not
--- a/stif/TestModuleTemplates/HardCodedTestModuleXXX/Bwins/HARDCODEDTESTMODULEXXXU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
-	?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestModuleTemplates/HardCodedTestModuleXXX/Bwins/HardCodedTestModuleXXXu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+	?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
+	?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
+
--- a/stif/TestModuleTemplates/STIFUnitXXX/Bwins/STIFUNITXXXU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
-	?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestModuleTemplates/STIFUnitXXX/Bwins/STIFUnitXXXu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+	?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
+	?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
+
--- a/stif/TestModuleTemplates/TemplateScriptXXX/Bwins/TEMPLATESCRIPTXXXU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestModuleTemplates/TemplateScriptXXX/Bwins/TemplateScriptXXXu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
+
Binary file stif/TestModuleTemplates/TestModuleTemplates.zip has changed
--- a/stif/TestModuleTemplates/TestModuleXXX/Bwins/TESTMODULEXXXU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
-	?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestModuleTemplates/TestModuleXXX/Bwins/TestModuleXXXu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+	?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * __cdecl LibEntryL(void)
+	?SetRequirements@@YAHAAPAVCTestModuleParam@@AAK@Z @ 2 NONAME ; int __cdecl SetRequirements(class CTestModuleParam * &,unsigned long &)
+
--- a/stif/TestScripter/Bmarm/TESTSCRIPTERU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestScripter/Bmarm/testscripteru.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntryL__Fv @ 1 NONAME R3UNUSED ; LibEntryL(void)
+
--- a/stif/TestScripter/Bwins/TESTSCRIPTERU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCTestScripter@@XZ @ 1 NONAME ; class CTestScripter * LibEntryL(void)
-	?GetConstantValue@CTestScripter@@QAEHABVTDesC16@@AAVTDes16@@@Z @ 2 NONAME ; int CTestScripter::GetConstantValue(class TDesC16 const &, class TDes16 &)
-	?SetResultDescription@CTestScripter@@QAEXABVTDesC16@@@Z @ 3 NONAME ; void CTestScripter::SetResultDescription(class TDesC16 const &)
-	?SetLocalValue@CTestScripter@@QAEHABVTDesC16@@0@Z @ 4 NONAME ; int CTestScripter::SetLocalValue(class TDesC16 const &, class TDesC16 const &)
-	?GetLocalValue@CTestScripter@@QAEHABVTDesC16@@AAVTDes16@@@Z @ 5 NONAME ; int CTestScripter::GetLocalValue(class TDesC16 const &, class TDes16 &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestScripter/Bwins/testscripteru.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,7 @@
+EXPORTS
+	?LibEntryL@@YAPAVCTestScripter@@XZ @ 1 NONAME ; class CTestScripter * LibEntryL(void)
+	?GetConstantValue@CTestScripter@@QAEHABVTDesC16@@AAVTDes16@@@Z @ 2 NONAME ; int CTestScripter::GetConstantValue(class TDesC16 const &, class TDes16 &)
+	?SetResultDescription@CTestScripter@@QAEXABVTDesC16@@@Z @ 3 NONAME ; void CTestScripter::SetResultDescription(class TDesC16 const &)
+	?SetLocalValue@CTestScripter@@QAEHABVTDesC16@@0@Z @ 4 NONAME ; int CTestScripter::SetLocalValue(class TDesC16 const &, class TDesC16 const &)
+	?GetLocalValue@CTestScripter@@QAEHABVTDesC16@@AAVTDes16@@@Z @ 5 NONAME ; int CTestScripter::GetLocalValue(class TDesC16 const &, class TDes16 &)
+
--- a/stif/TestServer/BMARM/STIFTESTSERVERU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-EXPORTS
-	__11RTestServer @ 1 NONAME R3UNUSED ; RTestServer::RTestServer(void)
-	CancelAsyncRequest__14RTestExecutioni @ 2 NONAME R3UNUSED ; RTestExecution::CancelAsyncRequest(int)
-	Close__11RTestModule @ 3 NONAME R3UNUSED ; RTestModule::Close(void)
-	Close__11RTestServer @ 4 NONAME R3UNUSED ; RTestServer::Close(void)
-	Close__14RTestExecution @ 5 NONAME R3UNUSED ; RTestExecution::Close(void)
-	Connect__11RTestServerRCt4TBuf1i256RC7TDesC16 @ 6 NONAME R3UNUSED ; RTestServer::Connect(TBuf<256> const &, TDesC16 const &)
-	EnumerateTestCases__11RTestModuleR7TDesC16Rt8TPckgBuf1ZiR14TRequestStatus @ 7 NONAME ; RTestModule::EnumerateTestCases(TDesC16 &, TPckgBuf<int> &, TRequestStatus &)
-	ErrorNotification__11RTestModuleRt5TPckg1Z18TErrorNotificationR14TRequestStatus @ 8 NONAME R3UNUSED ; RTestModule::ErrorNotification(TPckg<TErrorNotification> &, TRequestStatus &)
-	GetTestCases__11RTestModuleRt15CFixedFlatArray1Z13TTestCaseInfo @ 9 NONAME R3UNUSED ; RTestModule::GetTestCases(CFixedFlatArray<TTestCaseInfo> &)
-	NotifyEvent__14RTestExecutionRt5TPckg1Z8TEventIfR14TRequestStatusi @ 10 NONAME ; RTestExecution::NotifyEvent(TPckg<TEventIf> &, TRequestStatus &, int)
-	NotifyProgress__14RTestExecutionRt5TPckg1Z13TTestProgressR14TRequestStatus @ 11 NONAME R3UNUSED ; RTestExecution::NotifyProgress(TPckg<TTestProgress> &, TRequestStatus &)
-	NotifyRemoteCmd__14RTestExecutionRt5TPckg1Z12TStifCommandRt5TPckg1ZiR14TRequestStatus @ 12 NONAME ; RTestExecution::NotifyRemoteCmd(TPckg<TStifCommand> &, TPckg<int> &, TRequestStatus &)
-	Open__11RTestModuleR11RTestServerRt4TBuf1i256 @ 13 NONAME R3UNUSED ; RTestModule::Open(RTestServer &, TBuf<256> &)
-	Open__14RTestExecutionR11RTestServeriRCt4TBuf1i256 @ 14 NONAME ; RTestExecution::Open(RTestServer &, int, TBuf<256> const &)
-	Pause__14RTestExecution @ 15 NONAME R3UNUSED ; RTestExecution::Pause(void)
-	ReadRemoteCmdInfo__14RTestExecutionR5TDes812TStifCommandi @ 16 NONAME ; RTestExecution::ReadRemoteCmdInfo(TDes8 &, TStifCommand, int)
-	Resume__14RTestExecution @ 17 NONAME R3UNUSED ; RTestExecution::Resume(void)
-	RunTestCase__14RTestExecutionRt5TPckg1Z15TFullTestResultR14TRequestStatus @ 18 NONAME R3UNUSED ; RTestExecution::RunTestCase(TPckg<TFullTestResult> &, TRequestStatus &)
-	StartNewServer__FRCt4TBuf1i256Rt4TBuf1i256 @ 19 NONAME R3UNUSED ; StartNewServer(TBuf<256> const &, TBuf<256> &)
-	StartNewServer__FRCt4TBuf1i256Rt4TBuf1i256iG10RSemaphore @ 20 NONAME ; StartNewServer(TBuf<256> const &, TBuf<256> &, int, RSemaphore)
-	Version__C11RTestServer @ 21 NONAME R3UNUSED ; RTestServer::Version(void) const
-	CancelAsyncRequest__11RTestModulei @ 22 NONAME R3UNUSED ; RTestModule::CancelAsyncRequest(int)
-	GetServerThreadId__11RTestServerR9TThreadId @ 23 NONAME R3UNUSED ; RTestServer::GetServerThreadId(TThreadId &)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestServer/BMARM/StifTestServeru.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,25 @@
+EXPORTS
+	__11RTestServer @ 1 NONAME R3UNUSED ; RTestServer::RTestServer(void)
+	CancelAsyncRequest__14RTestExecutioni @ 2 NONAME R3UNUSED ; RTestExecution::CancelAsyncRequest(int)
+	Close__11RTestModule @ 3 NONAME R3UNUSED ; RTestModule::Close(void)
+	Close__11RTestServer @ 4 NONAME R3UNUSED ; RTestServer::Close(void)
+	Close__14RTestExecution @ 5 NONAME R3UNUSED ; RTestExecution::Close(void)
+	Connect__11RTestServerRCt4TBuf1i256RC7TDesC16 @ 6 NONAME R3UNUSED ; RTestServer::Connect(TBuf<256> const &, TDesC16 const &)
+	EnumerateTestCases__11RTestModuleR7TDesC16Rt8TPckgBuf1ZiR14TRequestStatus @ 7 NONAME ; RTestModule::EnumerateTestCases(TDesC16 &, TPckgBuf<int> &, TRequestStatus &)
+	ErrorNotification__11RTestModuleRt5TPckg1Z18TErrorNotificationR14TRequestStatus @ 8 NONAME R3UNUSED ; RTestModule::ErrorNotification(TPckg<TErrorNotification> &, TRequestStatus &)
+	GetTestCases__11RTestModuleRt15CFixedFlatArray1Z13TTestCaseInfo @ 9 NONAME R3UNUSED ; RTestModule::GetTestCases(CFixedFlatArray<TTestCaseInfo> &)
+	NotifyEvent__14RTestExecutionRt5TPckg1Z8TEventIfR14TRequestStatusi @ 10 NONAME ; RTestExecution::NotifyEvent(TPckg<TEventIf> &, TRequestStatus &, int)
+	NotifyProgress__14RTestExecutionRt5TPckg1Z13TTestProgressR14TRequestStatus @ 11 NONAME R3UNUSED ; RTestExecution::NotifyProgress(TPckg<TTestProgress> &, TRequestStatus &)
+	NotifyRemoteCmd__14RTestExecutionRt5TPckg1Z12TStifCommandRt5TPckg1ZiR14TRequestStatus @ 12 NONAME ; RTestExecution::NotifyRemoteCmd(TPckg<TStifCommand> &, TPckg<int> &, TRequestStatus &)
+	Open__11RTestModuleR11RTestServerRt4TBuf1i256 @ 13 NONAME R3UNUSED ; RTestModule::Open(RTestServer &, TBuf<256> &)
+	Open__14RTestExecutionR11RTestServeriRCt4TBuf1i256 @ 14 NONAME ; RTestExecution::Open(RTestServer &, int, TBuf<256> const &)
+	Pause__14RTestExecution @ 15 NONAME R3UNUSED ; RTestExecution::Pause(void)
+	ReadRemoteCmdInfo__14RTestExecutionR5TDes812TStifCommandi @ 16 NONAME ; RTestExecution::ReadRemoteCmdInfo(TDes8 &, TStifCommand, int)
+	Resume__14RTestExecution @ 17 NONAME R3UNUSED ; RTestExecution::Resume(void)
+	RunTestCase__14RTestExecutionRt5TPckg1Z15TFullTestResultR14TRequestStatus @ 18 NONAME R3UNUSED ; RTestExecution::RunTestCase(TPckg<TFullTestResult> &, TRequestStatus &)
+	StartNewServer__FRCt4TBuf1i256Rt4TBuf1i256 @ 19 NONAME R3UNUSED ; StartNewServer(TBuf<256> const &, TBuf<256> &)
+	StartNewServer__FRCt4TBuf1i256Rt4TBuf1i256iG10RSemaphore @ 20 NONAME ; StartNewServer(TBuf<256> const &, TBuf<256> &, int, RSemaphore)
+	Version__C11RTestServer @ 21 NONAME R3UNUSED ; RTestServer::Version(void) const
+	CancelAsyncRequest__11RTestModulei @ 22 NONAME R3UNUSED ; RTestModule::CancelAsyncRequest(int)
+	GetServerThreadId__11RTestServerR9TThreadId @ 23 NONAME R3UNUSED ; RTestServer::GetServerThreadId(TThreadId &)
+
--- a/stif/TestServer/BWINS/STIFTESTSERVERU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-EXPORTS
-	??0RTestServer@@QAE@XZ @ 1 NONAME ; RTestServer::RTestServer(void)
-	?CancelAsyncRequest@RTestExecution@@QAEHH@Z @ 2 NONAME ; int RTestExecution::CancelAsyncRequest(int)
-	?CancelAsyncRequest@RTestModule@@QAEHH@Z @ 3 NONAME ; int RTestModule::CancelAsyncRequest(int)
-	?Close@RTestExecution@@QAEXXZ @ 4 NONAME ; void RTestExecution::Close(void)
-	?Close@RTestModule@@QAEXXZ @ 5 NONAME ; void RTestModule::Close(void)
-	?Close@RTestServer@@QAEXXZ @ 6 NONAME ; void RTestServer::Close(void)
-	?Connect@RTestServer@@QAEHABV?$TBuf@$0BAA@@@ABVTDesC16@@@Z @ 7 NONAME ; int RTestServer::Connect(class TBuf<256> const &, class TDesC16 const &)
-	?EnumerateTestCases@RTestModule@@QAEXAAVTDesC16@@AAV?$TPckgBuf@H@@AAVTRequestStatus@@@Z @ 8 NONAME ; void RTestModule::EnumerateTestCases(class TDesC16 &, class TPckgBuf<int> &, class TRequestStatus &)
-	?ErrorNotification@RTestModule@@QAEXAAV?$TPckg@VTErrorNotification@@@@AAVTRequestStatus@@@Z @ 9 NONAME ; void RTestModule::ErrorNotification(class TPckg<class TErrorNotification> &, class TRequestStatus &)
-	?GetTestCases@RTestModule@@QAEHAAV?$CFixedFlatArray@VTTestCaseInfo@@@@@Z @ 10 NONAME ; int RTestModule::GetTestCases(class CFixedFlatArray<class TTestCaseInfo> &)
-	?NotifyEvent@RTestExecution@@QAEHAAV?$TPckg@VTEventIf@@@@AAVTRequestStatus@@H@Z @ 11 NONAME ; int RTestExecution::NotifyEvent(class TPckg<class TEventIf> &, class TRequestStatus &, int)
-	?NotifyProgress@RTestExecution@@QAEHAAV?$TPckg@VTTestProgress@@@@AAVTRequestStatus@@@Z @ 12 NONAME ; int RTestExecution::NotifyProgress(class TPckg<class TTestProgress> &, class TRequestStatus &)
-	?NotifyRemoteCmd@RTestExecution@@QAEHAAV?$TPckg@W4TStifCommand@@@@AAV?$TPckg@H@@AAVTRequestStatus@@@Z @ 13 NONAME ; int RTestExecution::NotifyRemoteCmd(class TPckg<enum TStifCommand> &, class TPckg<int> &, class TRequestStatus &)
-	?Open@RTestExecution@@QAEHAAVRTestServer@@HABV?$TBuf@$0BAA@@@@Z @ 14 NONAME ; int RTestExecution::Open(class RTestServer &, int, class TBuf<256> const &)
-	?Open@RTestModule@@QAEHAAVRTestServer@@AAV?$TBuf@$0BAA@@@@Z @ 15 NONAME ; int RTestModule::Open(class RTestServer &, class TBuf<256> &)
-	?Pause@RTestExecution@@QAEHXZ @ 16 NONAME ; int RTestExecution::Pause(void)
-	?ReadRemoteCmdInfo@RTestExecution@@QAEHAAVTDes8@@W4TStifCommand@@H@Z @ 17 NONAME ; int RTestExecution::ReadRemoteCmdInfo(class TDes8 &, enum TStifCommand, int)
-	?Resume@RTestExecution@@QAEHXZ @ 18 NONAME ; int RTestExecution::Resume(void)
-	?RunTestCase@RTestExecution@@QAEXAAV?$TPckg@VTFullTestResult@@@@AAVTRequestStatus@@@Z @ 19 NONAME ; void RTestExecution::RunTestCase(class TPckg<class TFullTestResult> &, class TRequestStatus &)
-	?StartNewServer@@YAHABV?$TBuf@$0BAA@@@AAV1@@Z @ 20 NONAME ; int StartNewServer(class TBuf<256> const &, class TBuf<256> &)
-	?StartNewServer@@YAHABV?$TBuf@$0BAA@@@AAV1@HVRSemaphore@@@Z @ 21 NONAME ; int StartNewServer(class TBuf<256> const &, class TBuf<256> &, int, class RSemaphore)
-	?Version@RTestServer@@QBE?AVTVersion@@XZ @ 22 NONAME ; class TVersion RTestServer::Version(void) const
-	?GetServerThreadId@RTestServer@@QAEHAAVTThreadId@@@Z @ 23 NONAME ; int RTestServer::GetServerThreadId(class TThreadId &)
-	?NotifyCommand@RTestExecution@@QAEHAAV?$TPckg@W4TCommand@@@@AAV?$TBuf8@$0DC@@@AAVTRequestStatus@@H@Z @ 24 NONAME ; int RTestExecution::NotifyCommand(class TPckg<enum TCommand> &, class TBuf8<50> &, class TRequestStatus &, int)
-	?GetUiEnvProxy@CTestThreadContainer@@QAEPAVCUiEnvProxy@@XZ @ 25 NONAME ; class CUiEnvProxy * CTestThreadContainer::GetUiEnvProxy(void)
-	?NewL@CTestThreadContainerRunner@@SAPAV1@VTThreadId@@PAVCActiveScheduler@@@Z @ 26 NONAME ; class CTestThreadContainerRunner * CTestThreadContainerRunner::NewL(class TThreadId, class CActiveScheduler *)
-	?NewL@CTestThreadContainerRunnerFactory@@SAPAV1@VTThreadId@@PAVCActiveScheduler@@PAVCUiEnvProxy@@@Z @ 27 NONAME ; class CTestThreadContainerRunnerFactory * CTestThreadContainerRunnerFactory::NewL(class TThreadId, class CActiveScheduler *, class CUiEnvProxy *)
-	?StartNewServer@@YAHABV?$TBuf@$0BAA@@@AAV1@HVRSemaphore@@HPAVCTestThreadContainerRunnerFactory@@@Z @ 28 NONAME ; int StartNewServer(class TBuf<256> const &, class TBuf<256> &, int, class RSemaphore, int, class CTestThreadContainerRunnerFactory *)
-	?UITesting@CTestThreadContainer@@QAEHXZ @ 29 NONAME ; int CTestThreadContainer::UITesting(void)
-	?NotifyCommand2@RTestExecution@@QAEHAAV?$TPckg@W4TCommand@@@@AAVTDes8@@AAVTRequestStatus@@H@Z @ 30 NONAME ; int RTestExecution::NotifyCommand2(class TPckg<enum TCommand> &, class TDes8 &, class TRequestStatus &, int)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/TestServer/BWINS/StifTestServeru.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,33 @@
+EXPORTS
+	??0RTestServer@@QAE@XZ @ 1 NONAME ; RTestServer::RTestServer(void)
+	?CancelAsyncRequest@RTestExecution@@QAEHH@Z @ 2 NONAME ; int RTestExecution::CancelAsyncRequest(int)
+	?CancelAsyncRequest@RTestModule@@QAEHH@Z @ 3 NONAME ; int RTestModule::CancelAsyncRequest(int)
+	?Close@RTestExecution@@QAEXXZ @ 4 NONAME ; void RTestExecution::Close(void)
+	?Close@RTestModule@@QAEXXZ @ 5 NONAME ; void RTestModule::Close(void)
+	?Close@RTestServer@@QAEXXZ @ 6 NONAME ; void RTestServer::Close(void)
+	?Connect@RTestServer@@QAEHABV?$TBuf@$0BAA@@@ABVTDesC16@@@Z @ 7 NONAME ; int RTestServer::Connect(class TBuf<256> const &, class TDesC16 const &)
+	?EnumerateTestCases@RTestModule@@QAEXAAVTDesC16@@AAV?$TPckgBuf@H@@AAVTRequestStatus@@@Z @ 8 NONAME ; void RTestModule::EnumerateTestCases(class TDesC16 &, class TPckgBuf<int> &, class TRequestStatus &)
+	?ErrorNotification@RTestModule@@QAEXAAV?$TPckg@VTErrorNotification@@@@AAVTRequestStatus@@@Z @ 9 NONAME ; void RTestModule::ErrorNotification(class TPckg<class TErrorNotification> &, class TRequestStatus &)
+	?GetTestCases@RTestModule@@QAEHAAV?$CFixedFlatArray@VTTestCaseInfo@@@@@Z @ 10 NONAME ; int RTestModule::GetTestCases(class CFixedFlatArray<class TTestCaseInfo> &)
+	?NotifyEvent@RTestExecution@@QAEHAAV?$TPckg@VTEventIf@@@@AAVTRequestStatus@@H@Z @ 11 NONAME ; int RTestExecution::NotifyEvent(class TPckg<class TEventIf> &, class TRequestStatus &, int)
+	?NotifyProgress@RTestExecution@@QAEHAAV?$TPckg@VTTestProgress@@@@AAVTRequestStatus@@@Z @ 12 NONAME ; int RTestExecution::NotifyProgress(class TPckg<class TTestProgress> &, class TRequestStatus &)
+	?NotifyRemoteCmd@RTestExecution@@QAEHAAV?$TPckg@W4TStifCommand@@@@AAV?$TPckg@H@@AAVTRequestStatus@@@Z @ 13 NONAME ; int RTestExecution::NotifyRemoteCmd(class TPckg<enum TStifCommand> &, class TPckg<int> &, class TRequestStatus &)
+	?Open@RTestExecution@@QAEHAAVRTestServer@@HABV?$TBuf@$0BAA@@@@Z @ 14 NONAME ; int RTestExecution::Open(class RTestServer &, int, class TBuf<256> const &)
+	?Open@RTestModule@@QAEHAAVRTestServer@@AAV?$TBuf@$0BAA@@@@Z @ 15 NONAME ; int RTestModule::Open(class RTestServer &, class TBuf<256> &)
+	?Pause@RTestExecution@@QAEHXZ @ 16 NONAME ; int RTestExecution::Pause(void)
+	?ReadRemoteCmdInfo@RTestExecution@@QAEHAAVTDes8@@W4TStifCommand@@H@Z @ 17 NONAME ; int RTestExecution::ReadRemoteCmdInfo(class TDes8 &, enum TStifCommand, int)
+	?Resume@RTestExecution@@QAEHXZ @ 18 NONAME ; int RTestExecution::Resume(void)
+	?RunTestCase@RTestExecution@@QAEXAAV?$TPckg@VTFullTestResult@@@@AAVTRequestStatus@@@Z @ 19 NONAME ; void RTestExecution::RunTestCase(class TPckg<class TFullTestResult> &, class TRequestStatus &)
+	?StartNewServer@@YAHABV?$TBuf@$0BAA@@@AAV1@@Z @ 20 NONAME ; int StartNewServer(class TBuf<256> const &, class TBuf<256> &)
+	?StartNewServer@@YAHABV?$TBuf@$0BAA@@@AAV1@HVRSemaphore@@@Z @ 21 NONAME ; int StartNewServer(class TBuf<256> const &, class TBuf<256> &, int, class RSemaphore)
+	?Version@RTestServer@@QBE?AVTVersion@@XZ @ 22 NONAME ; class TVersion RTestServer::Version(void) const
+	?GetServerThreadId@RTestServer@@QAEHAAVTThreadId@@@Z @ 23 NONAME ; int RTestServer::GetServerThreadId(class TThreadId &)
+	?NotifyCommand@RTestExecution@@QAEHAAV?$TPckg@W4TCommand@@@@AAV?$TBuf8@$0DC@@@AAVTRequestStatus@@H@Z @ 24 NONAME ; int RTestExecution::NotifyCommand(class TPckg<enum TCommand> &, class TBuf8<50> &, class TRequestStatus &, int)
+	?GetUiEnvProxy@CTestThreadContainer@@QAEPAVCUiEnvProxy@@XZ @ 25 NONAME ; class CUiEnvProxy * CTestThreadContainer::GetUiEnvProxy(void)
+	?NewL@CTestThreadContainerRunner@@SAPAV1@VTThreadId@@PAVCActiveScheduler@@@Z @ 26 NONAME ; class CTestThreadContainerRunner * CTestThreadContainerRunner::NewL(class TThreadId, class CActiveScheduler *)
+	?NewL@CTestThreadContainerRunnerFactory@@SAPAV1@VTThreadId@@PAVCActiveScheduler@@PAVCUiEnvProxy@@@Z @ 27 NONAME ; class CTestThreadContainerRunnerFactory * CTestThreadContainerRunnerFactory::NewL(class TThreadId, class CActiveScheduler *, class CUiEnvProxy *)
+	?StartNewServer@@YAHABV?$TBuf@$0BAA@@@AAV1@HVRSemaphore@@HPAVCTestThreadContainerRunnerFactory@@@Z @ 28 NONAME ; int StartNewServer(class TBuf<256> const &, class TBuf<256> &, int, class RSemaphore, int, class CTestThreadContainerRunnerFactory *)
+	?UITesting@CTestThreadContainer@@QAEHXZ @ 29 NONAME ; int CTestThreadContainer::UITesting(void)
+	?NotifyCommand2@RTestExecution@@QAEHAAV?$TPckg@W4TCommand@@@@AAVTDes8@@AAVTRequestStatus@@H@Z @ 30 NONAME ; int RTestExecution::NotifyCommand2(class TPckg<enum TCommand> &, class TDes8 &, class TRequestStatus &, int)
+	?RunTestCase@RTestExecution@@QAEXAAV?$TPckg@VTFullTestResult@@@@ABVTDesC16@@AAVTRequestStatus@@@Z @ 31 NONAME ; void RTestExecution::RunTestCase(class TPckg<class TFullTestResult> &, class TDesC16 const &, class TRequestStatus &)
+
--- a/stif/TestServer/eabi/StifTestServeru.def	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestServer/eabi/StifTestServeru.def	Mon Jun 14 11:37:33 2010 +0300
@@ -60,4 +60,5 @@
 	_ZN14RTestExecution14NotifyCommand2ER5TPckgI8TCommandER5TDes8R14TRequestStatusi @ 59 NONAME
 	_ZTI11CCommandDef @ 60 NONAME ; #<TI>#
 	_ZTV11CCommandDef @ 61 NONAME ; #<VT>#
+	_ZN14RTestExecution11RunTestCaseER5TPckgI15TFullTestResultERK7TDesC16R14TRequestStatus @ 62 NONAME
 
--- a/stif/TestServer/inc/TestServer.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestServer/inc/TestServer.h	Mon Jun 14 11:37:33 2010 +0300
@@ -703,7 +703,64 @@
 
     };
 
+// DESCRIPTION
+// CTestCasesList is a class, which contains list of test cases assosiated with
+// specified config file.
+NONSHARABLE_CLASS( CTestCasesList ): public CBase
+    {
+public:
+    /**
+    * NewL is first phase of two-phased constructor.
+    */
+    static CTestCasesList* NewL( const TDesC& aConfigFileName );
+public:
+    /**
+    * Destructor of CTestServer.
+    */
+    ~CTestCasesList();
 
+    /**
+     * Appends test case.
+     */
+    void AppendTestCaseL( const TDesC& aTestCaseTitle );
+    
+    /**
+     * Returns specified test case title.
+     */
+    const TDesC& GetTestCaseTitleL( TInt aIndex ) const;
+    
+    /**
+     * Returns config file name.
+     */
+    const TDesC& GetConfigFileName() const;
+    
+    /**
+     * Returns count of test cases.
+     */
+    TInt Count() const;
+    
+    /**
+     * Resets list of test cases.
+     */
+    void ResetAndDestroy();
+private:
+    /** 
+    * C++ default constructor.
+    */
+    CTestCasesList();
+    
+    /**
+    * By default Symbian OS constructor is private.
+    */
+    void ConstructL( const TDesC& aConfigFileName );
+private:
+    // Config file name
+    HBufC* iConfigFileName;
+    // List of test cases
+    RPointerArray<HBufC> iTestCases;
+    };
+
+        
 // DESCRIPTION
 // CTestModule is a session class.
 // Session for the CTestServer server, to a single client-side session
@@ -844,7 +901,7 @@
         /**
         * Get title of currently running test case
         */ 
-        void GetTestCaseTitleL(TInt aTestCaseNumber, TDes& aTestCaseTitle);
+        void GetTestCaseTitleL(TInt aTestCaseNumber, const TDesC& aConfigFile, TDes& aTestCaseTitle);
 
         /**
          * Get pointer to test server
@@ -901,7 +958,7 @@
 
         TBool iErrorMessageAvailable;            // Error message available?
         
-        RPointerArray<TDesC> iTestCaseTitles;    //Test case titles
+        RPointerArray<CTestCasesList> iTestCaseTitlesMap;    //Test case titles
         
     public:     // Friend classes
         // None
--- a/stif/TestServer/src/TestExecutionThread.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestServer/src/TestExecutionThread.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -272,22 +272,7 @@
         __TRACEI (KInit, (  _L("Loaded test module[%S]"), &moduleName ) );
         }
 
-    // Verify the UID
-    TUid KUidTestModule = TUid::Uid ( 0x101FB3E7 );
-    TUidType requiredUID( KDynamicLibraryUid, KSharedLibraryUid, KUidTestModule );
-
-    TUidType moduleUID = aModule.Type();    
-    if ( moduleUID != requiredUID )
-        {
-        // New instance can't be created
-        RDebug::Print( ( _L("STIF TF: Test module has invalid UID. Aborting loading!") ) );
-        __TRACEI (KError, ( CStifLogger::EError, _L("Test module has invalid UID. Aborting loading!")));
-        tmpBuffer.Format(_L("Module [%S] has invalid UID"), &moduleName);
-        ErrorPrint( 1, tmpBuffer ); 
-        ModuleContainer().OperationErrorResult() = KErrNotSupported;
-        return KErrNotSupported;
-        }
-
+    
     // Get pointer to first exported function
     ModuleContainer().OperationText() = _L("1st EXPORTED function");
     CTestInterfaceFactory libEntry;
@@ -2156,7 +2141,7 @@
 
 -------------------------------------------------------------------------------
 */
-void CTestThreadContainer::IsServerAlive()
+void CTestThreadContainer::IsServerAlive() const
     {
         
     if( iServerThread.ExitType() != EExitPending ) 
@@ -2187,7 +2172,7 @@
 
 -------------------------------------------------------------------------------
 */
-CTestExecution& CTestThreadContainer::TestExecution()
+CTestExecution& CTestThreadContainer::TestExecution() const
     { 
     
     IsServerAlive();
@@ -2199,7 +2184,32 @@
     return *execution;
     
     };
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestThreadContainer
+
+    Method: GetTestCaseArguments
+
+    Description: Get test case arguments
+
+    Parameters: None
     
+    Return Values: test case arguments
+
+    Errors/Exceptions: 
+
+    Status: Proposal
+
+-------------------------------------------------------------------------------
+*/
+const TDesC& CTestThreadContainer::GetTestCaseArguments() const
+    {
+    return TestExecution().GetTestCaseArguments();
+    }
+
+
 /*
 -------------------------------------------------------------------------------
 
--- a/stif/TestServer/src/TestModuleContainer.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestServer/src/TestModuleContainer.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -1747,19 +1747,7 @@
         __TRACE( KInit, (  _L("Loaded test module[%S]"), &dllName ) );
         }
 
-    // Verify the UID
-    TUid KUidTestModule = TUid::Uid ( 0x101FB3E7 );
-    TUidType requiredUID( KDynamicLibraryUid, KSharedLibraryUid, KUidTestModule );
-
-    TUidType moduleUID = testModule.Type();    
-    if ( moduleUID != requiredUID )
-        {
-        // New instance can't be created
-        RDebug::Print( ( _L("STIF TF: Test module has invalid UID. Aborting loading!") ) );
-        __TRACE ( KError, ( CStifLogger::EError, _L("Test module has invalid UID. Aborting loading!" ) ) );
-        testModule.Close();
-        return KErrNotSupported;
-        }
+    
 
     CTestInterfaceFactoryTestModule libEntry = NULL;
     
@@ -1973,7 +1961,10 @@
 */
 void CTestModuleContainer::GetTestCaseTitleL(TDes& aTestCaseTitle)
     {
-    iCTestModule->GetTestCaseTitleL(iOperationIntBuffer, aTestCaseTitle); //currently run test case stored in the iOperationIntBuffer variable 
+    //currently run test case stored in the iOperationIntBuffer variable
+    iCTestModule->GetTestCaseTitleL( iOperationIntBuffer, 
+                                     iCTestExecution->GetConfigFileName(),
+                                    aTestCaseTitle);  
     }
 
 
--- a/stif/TestServer/src/TestServerClient.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestServer/src/TestServerClient.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -120,6 +120,15 @@
     do
         {
         semName.Format(_L("%S%d"), &semaphoreName, x);
+        if (semName.Length() > KMaxKernelName)
+            {
+            // if the cfg file name is larger than maximum length of acceptable length of semaphore .
+            RDebug::Print(_L("Test Module name or Configuration File name is too long."));
+            
+            semName.Close();
+            return KErrBadName;
+            }
+        
         ret = startSemaphore.CreateGlobal(semName, 0);
         RDebug::Print(_L("RTestServer::Connect() Creating global semaphore [%S] with result [%d]"), &semName, ret);
         if(ret != KErrAlreadyExists)
@@ -153,7 +162,7 @@
     // Data to be passed to new process. It will contain module name and synchronization semaphore name separated with space.
     // I.e. it will be: "mymodule startupSemaphore0"
     RBuf data; 
-    ret = data.Create(KMaxName);
+    ret = data.Create(KMaxFileName);
     if(ret != KErrNone)
         {
         RDebug::Print(_L("RTestServer::Connect() Could not create buffer for data to be passed to process [%d]"), ret);
@@ -818,6 +827,36 @@
 
     Class: RTestExecution
 
+    Method: RunTestCase
+
+    Description: Runs a test case
+
+    Parameters: TFullTestResultPckg& aResult  :out: Case result
+                const TDesC& aTestCaseArgs: Test case arguments
+                TRequestStatus& aStatus       :out: Request to be completed
+
+    Return Values: None
+
+    Errors/Exceptions: None
+
+    Status: Approved
+    
+-------------------------------------------------------------------------------
+*/
+EXPORT_C void RTestExecution::RunTestCase( TFullTestResultPckg& aResult,
+                                           const TDesC& aTestCaseArgs,
+                                           TRequestStatus& aStatus 
+                                         )
+    {
+    TIpcArgs args( &aResult, &aTestCaseArgs, TIpcArgs::ENothing );
+    SendReceive( ETestExecutionRunTestCase, args, aStatus );
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: RTestExecution
+
     Method: NotifyProgress
 
     Description: Notify about test case progress, i.e test case prints.
--- a/stif/TestServer/src/Testexecution.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestServer/src/Testexecution.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -191,7 +191,10 @@
     // Delete name buffer
     delete iConfigNameBuffer;
     iConfigNameBuffer = NULL;
-    
+
+    delete iTestCaseArgs;
+    iTestCaseArgs = NULL;
+        
     iStateEvents.ResetAndDestroy();
     iStateEvents.Close();
 
@@ -338,15 +341,51 @@
 
     __TRACE ( KInit, ( _L( "CTestExecution::RunTestCase in" ) ) );
 
+    TInt ret = KErrNone;
+    
     // Store message to be completed when case is finished
     iTestExeMessage = aMessage;
 
     iFullResult.iStartTime.HomeTime();
 
+    delete iTestCaseArgs;
+    iTestCaseArgs = NULL;
+    
+    TInt testCaseArgsLength = iTestExeMessage.GetDesLength( 1 );
+    if ( ( testCaseArgsLength != KErrArgument ) && ( testCaseArgsLength != KErrBadDescriptor ) )
+        {
+        iTestCaseArgs = HBufC::New( testCaseArgsLength );
+        if ( iTestCaseArgs == NULL )
+            {
+            _LIT(KRunError,"Can't allocate memory for test case arguments");
+            __TRACE ( KError, ( CStifLogger::ERed, KRunError() ) );
+            CompleteTestExecution( KErrNone,
+                                   TFullTestResult::ECaseException,
+                                   KErrNoMemory,
+                                   KErrGeneral,
+                                   KRunError );
+            return KErrNone;        
+            }
+            
+        TPtr testCaseArgsPtr( iTestCaseArgs->Des() );
+        TRAP( ret, iTestExeMessage.Read( 1, testCaseArgsPtr ) );
+        if ( ret != KErrNone )
+            {
+            _LIT(KRunError,"Can't read test case arguments");
+            __TRACE ( KError, ( CStifLogger::ERed, KRunError() ) );
+            CompleteTestExecution( KErrNone,
+                                   TFullTestResult::ECaseException,
+                                   ret,
+                                   KErrGeneral,
+                                   KRunError );
+            return KErrNone;
+            }
+        }
+
     // Get a test module, which executes the test case.
     // The test module will be freed either when the test case
     // completes, or the test case is aborted.
-    TInt ret = iModuleSession->GetTestModule( iModuleContainer, iConfig );
+    ret = iModuleSession->GetTestModule( iModuleContainer, iConfig );
     if ( ret != KErrNone || iModuleContainer == NULL )
         {
         _LIT(KRunError,"Can't get test module");
@@ -2117,6 +2156,34 @@
 
     Class: CTestExecution
 
+    Method: GetTestCaseArguments
+
+    Description: Get test case arguments
+
+    Parameters: None
+
+    Return Values: Test case arguments
+
+    Errors/Exceptions: None
+
+    Status: Proposal
+
+-------------------------------------------------------------------------------
+*/
+const TDesC& CTestExecution::GetTestCaseArguments() const
+    {
+    if ( iTestCaseArgs != NULL )
+        {
+        return *iTestCaseArgs;
+        }
+    return KNullDesC;
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestExecution
+
     Method: CancelTestRequest
 
     Description: Cancel test execution request.
--- a/stif/TestServer/src/Testserversession.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestServer/src/Testserversession.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -55,6 +55,234 @@
 
 // ================= MEMBER FUNCTIONS =========================================
 
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestCasesList
+
+    Method: NewL
+
+    Description: Create new test cases list    
+
+    Parameters: const TDesC& aConfigFileName :in:  Config file name
+
+    Return Values: CTestCasesList* Pointer to new test cases list
+
+    Errors/Exceptions: Leaves if memory allocation fails or ConstructL leaves.
+
+    Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+CTestCasesList* CTestCasesList::NewL( const TDesC& aConfigFileName )
+    {    
+    CTestCasesList* self = new(ELeave)CTestCasesList;
+    CleanupStack::PushL( self );
+    self->ConstructL( aConfigFileName );
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestCasesList
+
+    Method: ~CTestCasesList
+
+    Description: Destructor    
+
+    Parameters: 
+
+    Return Values: 
+
+    Errors/Exceptions: 
+
+    Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+CTestCasesList::~CTestCasesList()
+    {
+    delete iConfigFileName;
+    iConfigFileName = NULL;
+    iTestCases.ResetAndDestroy();
+    iTestCases.Close();
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestCasesList
+
+    Method: AppendTestCaseL
+
+    Description: Appends test case.
+
+    Parameters: const TDesC& aTestCaseTitle  in: Test case title
+
+    Return Values: 
+
+    Errors/Exceptions: Leaves if memory allocation fails
+
+    Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+void CTestCasesList::AppendTestCaseL( const TDesC& aTestCaseTitle )
+    {
+    HBufC* testCaseTitle = aTestCaseTitle.AllocL();
+    CleanupStack::PushL( testCaseTitle );
+    iTestCases.AppendL( testCaseTitle );
+    CleanupStack::Pop( testCaseTitle );
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestCasesList
+
+    Method: GetTestCaseTitleL
+
+    Description: Returns specified test case title  
+
+    Parameters: TInt aIndex: in: Requested test case index. 
+
+    Return Values: Test case title.
+
+    Errors/Exceptions: Leaves if test case index is invalid
+
+    Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+const TDesC& CTestCasesList::GetTestCaseTitleL( TInt aIndex ) const
+    {    
+    if ( ( aIndex < 0 ) || ( aIndex >= iTestCases.Count() ) )
+        {
+        User::Leave( KErrNotFound );
+        }
+    return *iTestCases[ aIndex ];
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestCasesList
+
+    Method: GetConfigFileName
+
+    Description: Returns config file name  
+
+    Parameters: 
+
+    Return Values: Config file name.
+
+    Errors/Exceptions: 
+
+    Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+const TDesC& CTestCasesList::GetConfigFileName() const
+    {    
+    return *iConfigFileName;
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestCasesList
+
+    Method: Count
+
+    Description: Returns count of test cases.    
+
+    Parameters: 
+
+    Return Values: Test cases count.
+
+    Errors/Exceptions: 
+
+    Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+TInt CTestCasesList::Count() const
+    {
+    return iTestCases.Count();
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestCasesList
+
+    Method: ResetAndDestroy
+
+    Description: Resets list of test cases.    
+
+    Parameters: 
+
+    Return Values: 
+
+    Errors/Exceptions: 
+
+    Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+void CTestCasesList::ResetAndDestroy()
+    {    
+    iTestCases.ResetAndDestroy();
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestCasesList
+
+    Method: ~CTestCasesList
+
+    Description: Destructor    
+
+    Parameters: 
+
+    Return Values: 
+
+    Errors/Exceptions: 
+
+    Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+CTestCasesList::CTestCasesList()
+    {
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CTestCasesList
+
+    Method: ~CTestCasesList
+
+    Description: Destructor    
+
+    Parameters: 
+
+    Return Values: 
+
+    Errors/Exceptions: 
+
+    Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+void CTestCasesList::ConstructL( const TDesC& aConfigFileName )
+    {
+    iConfigFileName = aConfigFileName.AllocL();
+    }
 
 /*
 -------------------------------------------------------------------------------
@@ -188,8 +416,8 @@
     iIniBuffer = NULL;
 
     // Delete array of test case titles
-    iTestCaseTitles.ResetAndDestroy();
-    iTestCaseTitles.Close();
+    iTestCaseTitlesMap.ResetAndDestroy();
+    iTestCaseTitlesMap.Close();
     }
 
 /*
@@ -690,18 +918,34 @@
         User::Leave( KErrGeneral );
         }
     
+    CTestCasesList* testCasesList = NULL;
+    for ( TInt i = 0; i < iTestCaseTitlesMap.Count(); i++ )
+        {
+        if ( iTestCaseTitlesMap[ i ]->GetConfigFileName() == config )
+            {
+            testCasesList = iTestCaseTitlesMap[ i ];
+            break;
+            }
+        }
+    if ( testCasesList == NULL )
+        {
+        testCasesList = CTestCasesList::NewL( config );
+        CleanupStack::PushL( testCasesList );
+        iTestCaseTitlesMap.AppendL( testCasesList );
+        CleanupStack::Pop( testCasesList );
+        }
+    
     // Store titles (for further use, i.e. when asked for title from the interface via CTestModuleIf->CTestThreadContainer->CTestModuleContainer)
-    iTestCaseTitles.ResetAndDestroy();
+    testCasesList->ResetAndDestroy();
     TInt i;
     for(i = 0; i < testCases->Count(); i++)
         {
         //Handle situation when test cases are enumerated not as 0-based (testscripter, ...)
         if(i == 0 && (*testCases)[i]->iCaseNumber > 0)
             {
-            iTestCaseTitles.Append(NULL);
+            testCasesList->AppendTestCaseL( KNullDesC );
             }
-        HBufC* title = (*testCases)[i]->iTitle.AllocL();
-        iTestCaseTitles.Append(title);
+        testCasesList->AppendTestCaseL( (*testCases)[i]->iTitle );
         }
     
     TPckgBuf<TInt> countPckg( testCases->Count() );
@@ -1380,10 +1624,25 @@
     
 -------------------------------------------------------------------------------
 */
-void CTestModule::GetTestCaseTitleL(TInt aTestCaseNumber, TDes& aTestCaseTitle)
+void CTestModule::GetTestCaseTitleL(TInt aTestCaseNumber, const TDesC& aConfigFile,TDes& aTestCaseTitle)
     {
-    RDebug::Print(_L("Trying to get test case title from module. Index=%d, count=%d"), aTestCaseNumber, iTestCaseTitles.Count());
-    aTestCaseTitle.Copy(*(iTestCaseTitles[aTestCaseNumber]));
+    CTestCasesList* testCasesList = NULL;
+    for ( TInt i = 0; i < iTestCaseTitlesMap.Count(); i++ )
+        {
+        if ( iTestCaseTitlesMap[ i ]->GetConfigFileName() == aConfigFile )
+            {
+            testCasesList = iTestCaseTitlesMap[ i ];
+            break;
+            }
+        }
+    if ( testCasesList == NULL )
+        {
+        User::Leave( KErrNotFound );
+        }
+    
+    RDebug::Print(_L("Trying to get test case title from module. Index=%d, count=%d"), aTestCaseNumber, testCasesList->Count() );
+    
+    aTestCaseTitle.Copy( testCasesList->GetTestCaseTitleL( aTestCaseNumber ) );
     }
 
 
--- a/stif/TestServerStarter/src/TestServerStarter.cpp	Tue May 25 18:01:01 2010 +0300
+++ b/stif/TestServerStarter/src/TestServerStarter.cpp	Mon Jun 14 11:37:33 2010 +0300
@@ -53,7 +53,7 @@
     RDebug::Print(_L("STIF: New process starting"));
 
     // Get module name from command line
-	const TInt length = User().CommandLineLength();
+	const TInt length = User::CommandLineLength();
 
     HBufC* cmdLine = HBufC::New( length );
     
@@ -64,7 +64,7 @@
 
     TPtr moduleName = cmdLine->Des();
 
-	User().CommandLine( moduleName );
+	User::CommandLine( moduleName );
 
     RDebug::Print(_L("STIF: Received data [%S]"), &moduleName);
 
--- a/stif/examples/STIFTestMeasurementStub/Bwins/STIFTESTMEASUREMENTSTUBU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCSTIFTestMeasurementImplementation@@ABVTDesC16@@W4TSTIFMeasurementType@CSTIFTestMeasurement@@@Z @ 1 NONAME ; class CSTIFTestMeasurementImplementation * __cdecl LibEntryL(class TDesC16 const &,enum CSTIFTestMeasurement::TSTIFMeasurementType)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/examples/STIFTestMeasurementStub/Bwins/STIFTestMeasurementStubu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+	?LibEntryL@@YAPAVCSTIFTestMeasurementImplementation@@ABVTDesC16@@W4TSTIFMeasurementType@CSTIFTestMeasurement@@@Z @ 1 NONAME ; class CSTIFTestMeasurementImplementation * __cdecl LibEntryL(class TDesC16 const &,enum CSTIFTestMeasurement::TSTIFMeasurementType)
+
--- a/stif/examples/StifHWResetStub/BWINS/STIFHWRESETSTUBU.DEF	Tue May 25 18:01:01 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCStifHWResetStub@@XZ @ 1 NONAME ; class CStifHWResetStub * __cdecl LibEntryL(void)
-	?NewL@CStifHWResetStub@@SAPAV1@XZ @ 2 NONAME ; public: static class CStifHWResetStub * __cdecl CStifHWResetStub::NewL(void)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stif/examples/StifHWResetStub/BWINS/StifHWResetStubu.def	Mon Jun 14 11:37:33 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+	?LibEntryL@@YAPAVCStifHWResetStub@@XZ @ 1 NONAME ; class CStifHWResetStub * __cdecl LibEntryL(void)
+	?NewL@CStifHWResetStub@@SAPAV1@XZ @ 2 NONAME ; public: static class CStifHWResetStub * __cdecl CStifHWResetStub::NewL(void)
+
--- a/stif/group/ReleaseNote.txt	Tue May 25 18:01:01 2010 +0300
+++ b/stif/group/ReleaseNote.txt	Mon Jun 14 11:37:33 2010 +0300
@@ -1,5 +1,5 @@
 ========================================================================
-RELEASE NOTE FOR STIF - STIF_201020 (7.3.33)
+RELEASE NOTE FOR STIF - STIF_201022 (7.3.34)
 SUPPORTING SERIES 60 3.0 ->
 ========================================================================
 
--- a/stif/inc/TestServerModuleIf.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/inc/TestServerModuleIf.h	Mon Jun 14 11:37:33 2010 +0300
@@ -415,6 +415,11 @@
         */
         TInt CancelCommandRequest();
 
+        /**
+         * Get test case arguments.
+         */
+        const TDesC& GetTestCaseArguments() const;
+
     public: // Functions that are called from test thread
 
         /**
@@ -470,6 +475,7 @@
         */
         TInt TestThreadMutexHandle() { return iTestThreadMutex.Handle(); };
 
+        const TDesC& GetConfigFileName() const { return iConfig; }
     public: // Functions from base classes
         // None
 
@@ -573,6 +579,8 @@
         TInt iCaseNumber;                        // Case to be executed
         TPtr iConfig;                            // Configuration file name
         HBufC* iConfigNameBuffer;                // HBuffer for configuration file;
+        HBufC* iTestCaseArgs;                    // HBuffer for test case arguments
+		
         RMessage2 iTestExeMessage;               // Test execution message
         TTestState iThreadState;                 // Thread state
 
--- a/stif/inc/TestThreadContainer.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/inc/TestThreadContainer.h	Mon Jun 14 11:37:33 2010 +0300
@@ -222,9 +222,15 @@
         virtual void DoNotifyCommand(TCommand aCommand, const TDesC8& aParamsPckg);
 
         /**
+         * Get test case execution arguments
+         */
+        virtual const TDesC& GetTestCaseArguments() const;        
+        
+        
+        /**
         * Obtain title of currently running test case.
         */
-        virtual void GetTestCaseTitleL(TDes& aTestCaseTitle);
+        virtual void GetTestCaseTitleL(TDes& aTestCaseTitle);        
 
         /**
          * Sets thread logger.
@@ -308,7 +314,7 @@
         /**
         * Check that server is alive.
         */ 
-        void IsServerAlive();
+        void IsServerAlive() const;
 
         /**
         * Exception handler
@@ -360,13 +366,17 @@
         /** 
         * C++ default constructor.
         */
-        CTestThreadContainer( CTestModuleContainer* aModuleContainer );
-                              
+        CTestThreadContainer( CTestModuleContainer* aModuleContainer );                              
+
+        /**
+         * Get module container.
+         */
+        CTestModuleContainer& ModuleContainer();        
+
         /**
         * Handles to parent.
         */
-        CTestExecution& TestExecution();
-        CTestModuleContainer& ModuleContainer();
+        CTestExecution& TestExecution() const;
         
     public:     // Data
         
--- a/stif/inc/version.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/inc/version.h	Mon Jun 14 11:37:33 2010 +0300
@@ -20,9 +20,9 @@
 
 #define STIF_MAJOR_VERSION 7
 #define STIF_MINOR_VERSION 3
-#define STIF_BUILD_VERSION 33
+#define STIF_BUILD_VERSION 34
 
-#define STIF_REL_DATE "18th May 2010"
+#define STIF_REL_DATE "1st June 2010"
 
 #define TO_UNICODE(text) _L(text) 
 
Binary file stif/sis/Stif_31.sis has changed
--- a/stif/stif_plat/inc/StifTestModule.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/stif_plat/inc/StifTestModule.h	Mon Jun 14 11:37:33 2010 +0300
@@ -787,6 +787,11 @@
         TInt Command(TCommand aCommand, const TDesC8& aParamsPckg);
 
         /**
+         * Get test case execution arguments
+         */
+        IMPORT_C const TDesC& GetTestCaseArguments() const;        
+
+        /**
         * GetTestCaseTitleL function is used to obtain test case title.
         */
         IMPORT_C void GetTestCaseTitleL(TDes& aTestCaseTitle);
--- a/stif/stif_plat/inc/TestEngineClient.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/stif_plat/inc/TestEngineClient.h	Mon Jun 14 11:37:33 2010 +0300
@@ -376,6 +376,19 @@
                                     TRequestStatus& aStatus );
 
         /**
+        * RunTestCase is asynchronous method and it is completed when the test
+        * case is completed. Result of the test case is returned to 
+        * aTestResult. The aTestResult is TFullTestResultPckg that is a
+        * packaged TFullTestResult.
+        * The aStatus will have the completion result of this function. If the
+        * test case could be run (despite of succesfully or not) the KErrNone 
+        * is returned to aStatus.
+        */
+        IMPORT_C void RunTestCase( TFullTestResultPckg& aTestResult,
+                                   const TDesC& aTestCaseArgs,
+                                   TRequestStatus& aStatus );        
+
+        /**
         * Pause suspends the execution of the test case. The subsession where
         * the test case is run is suspended and thus the test case execution is
         * suspended. Test case execution can be later resumed by calling 
--- a/stif/stif_plat/inc/TestServerClient.h	Tue May 25 18:01:01 2010 +0300
+++ b/stif/stif_plat/inc/TestServerClient.h	Mon Jun 14 11:37:33 2010 +0300
@@ -351,6 +351,16 @@
                                    TRequestStatus& aStatus );
 
         /**
+       * RunTestCase is used to execute the test case previously initialized by
+       * Open method. RunTestCase is asynchronous method and it is completed
+       * when the test case is completed.
+       * The result of the test case is returned to aStatus.
+       */
+       IMPORT_C void RunTestCase( TFullTestResultPckg& aResult,
+                                  const TDesC& aTestCaseArgs,
+                                  TRequestStatus& aStatus );
+
+        /**
         * Pause suspends the execution of the test case. The subsession where
         * the test case is run will be suspended and thus the test case
         * execution is suspended. The test case execution can be later resumed