# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1279214738 -10800
# Node ID 3406c99bc37584958b16ca275c96daba8f23b242
# Parent  8f8df8006c40fe825c2ab905d1f5eea9f38e3753
Revision: 201025
Kit: 2010127

diff -r 8f8df8006c40 -r 3406c99bc375 analyzetool/commandlineengine/install/atool.exe
Binary file analyzetool/commandlineengine/install/atool.exe has changed
diff -r 8f8df8006c40 -r 3406c99bc375 analyzetool/dynamicmemoryhook/inc/customuser.h
--- a/analyzetool/dynamicmemoryhook/inc/customuser.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/analyzetool/dynamicmemoryhook/inc/customuser.h	Thu Jul 15 20:25:38 2010 +0300
@@ -21,7 +21,7 @@
 
 // INCLUDES
 #include <u32std.h>
-
+#include <e32svr.h>
 // CONSTANTS
 const TInt KATVersionLength = 20;
 const TInt KATDefaultLogOption = 0;
diff -r 8f8df8006c40 -r 3406c99bc375 hti/HtiFramework/src/HtiDispatcher.cpp
--- a/hti/HtiFramework/src/HtiDispatcher.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/hti/HtiFramework/src/HtiDispatcher.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -48,6 +48,7 @@
     EHtiHideConsole    = 0x09,
     EHtiInstanceId     = 0x0A,
     EHtiDebugPrint     = 0x0B,
+    EHtiRestartServices= 0x0C,
     EHtiError          = 0xFF
     };
 
@@ -70,6 +71,8 @@
 _LIT( KHtiWatchDogMatchPattern, "HtiWatchDog*" );
 _LIT( KHtiDeviceRebootExeOS,    "HtiDeviceRebootOS.exe" );
 _LIT( KHtiDeviceRebootExeUI,    "HtiDeviceRebootUI.exe" );
+_LIT( KHtiRestartExeName,       "HtiRestart.exe");
+
 _LIT( KParamNormalRfs, "rfsnormal" );
 _LIT( KParamDeepRfs,   "rfsdeep" );
 
@@ -876,6 +879,7 @@
                         User::LeaveIfError(DispatchOutgoingErrorMessage( KErrArgument,
                                       KErrDescrInvalidParameter,
                                       KHtiSystemServiceUid ) );
+                        break;
                         }
                     ShutdownAndRebootDeviceL();
                     }
@@ -894,6 +898,43 @@
                     }
                     break;
 
+                case EHtiRestartServices:
+                    {
+                    HTI_LOG_TEXT("RESTARTSERVISE");
+                    if(aMessage.Length() != 1 && aMessage.Length() != 5)
+                        {
+                        User::LeaveIfError(DispatchOutgoingErrorMessage( KErrArgument,
+                                                    KErrDescrInvalidParameter,
+                                                    KHtiSystemServiceUid ) );
+                        break;
+                        }
+                    
+                    //stop all requests
+                    //cancel just incoming request
+                    //after all outgoing messages sent system will go down
+                    iListener->Cancel();
+
+                    // kill the watchdog, so HTI stays stopped
+                    KillHtiWatchDogL();
+                    
+                    TUint milliseconds = 0;
+                    if(aMessage.Length() == 5)
+                        {
+                        milliseconds = aMessage[1] + ( aMessage[2] << 8 )
+                                + ( aMessage[3] << 16 )
+                                + ( aMessage[4] << 24 );
+                        }
+                    
+                    TBuf<20> buf;
+                    buf.Format(_L("%d"), milliseconds * 1000);
+                    
+                    RProcess htiProcess;
+                    User::LeaveIfError( htiProcess.Create(
+                            KHtiRestartExeName, buf ) );
+                    htiProcess.Resume();
+                    htiProcess.Close();
+                    break;
+                    }
                 case EHtiReset:
                     {
                     HTI_LOG_TEXT( "RESET" );
diff -r 8f8df8006c40 -r 3406c99bc375 hti/HtiFramework/src/HtiFramework.cpp
--- a/hti/HtiFramework/src/HtiFramework.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/hti/HtiFramework/src/HtiFramework.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -56,7 +56,7 @@
 const static TInt KHtiDefaultPriority = 3;
 const static TInt KHtiWatchDogEnabledDefault = 0;
 const static TInt KHtiConsoleEnabledDefault = 0;
-const static TInt KHtiAutoStartEnabledDefault = 1;
+const static TInt KHtiAutoStartEnabledDefault = 0;
 const static TInt KHtiShowErrorDialogsDefault = 1;
 const static TInt KHtiReconnectDelay = 0;
 
diff -r 8f8df8006c40 -r 3406c99bc375 hti/HtiRestart/group/HtiRestart.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hti/HtiRestart/group/HtiRestart.mmp	Thu Jul 15 20:25:38 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* 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:  Build description file for HtiRestart
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+TARGET		  HtiRestart.exe
+TARGETTYPE	  exe
+
+UID             0x1000008d 0x200315B3
+
+VENDORID        0x101FB657
+
+CAPABILITY      ALL -TCB
+
+SOURCEPATH      ../src
+SOURCE		  HtiRestart.cpp
+
+OS_LAYER_SYSTEMINCLUDE
+
+LIBRARY         euser.lib
+LIBRARY         flogger.lib
+
+SMPSAFE
+
+// End of File
\ No newline at end of file
diff -r 8f8df8006c40 -r 3406c99bc375 hti/HtiRestart/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hti/HtiRestart/group/bld.inf	Thu Jul 15 20:25:38 2010 +0300
@@ -0,0 +1,32 @@
+/*
+* 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:  Build information file for HtiRestart
+*
+*/
+
+
+PRJ_PLATFORMS
+
+DEFAULT
+
+PRJ_EXPORTS
+
+PRJ_TESTEXPORTS
+
+PRJ_MMPFILES
+HtiRestart.mmp
+
+PRJ_TESTMMPFILES
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 hti/HtiRestart/src/HtiRestart.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hti/HtiRestart/src/HtiRestart.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -0,0 +1,148 @@
+/*
+* 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:  HtiWatchDog implementation.
+*
+*/
+
+
+// INCLUDE FILES
+#include <e32base.h>
+
+#ifdef __ENABLE_LOGGING__
+
+#include <flogger.h>
+_LIT( KLogFolder, "hti" );
+_LIT( KLogFile,   "htirestart.txt" );
+
+#define HTI_LOG_TEXT(a1) {_LIT(temp, a1); RFileLogger::Write(KLogFolder, KLogFile, EFileLoggingModeAppend, temp);}
+#define HTI_LOG_DES(a1) {RFileLogger::Write(KLogFolder, KLogFile, EFileLoggingModeAppend, a1);}
+#define HTI_LOG_FORMAT(a1,a2) {_LIT(temp, a1); RFileLogger::WriteFormat(KLogFolder, KLogFile, EFileLoggingModeAppend, temp, (a2));}
+
+#else   // !__ENABLE_LOGGING__
+
+#define HTI_LOG_TEXT(a1)
+#define HTI_LOG_DES(a1)
+#define HTI_LOG_FORMAT(a1,a2)
+
+#endif // __ENABLE_LOGGING__
+
+// CONSTANTS
+_LIT( KHtiFrameworkExeName,    "HtiFramework.exe" );
+_LIT( KHtiMainThreadName,      "HtiMain" );
+_LIT( KHtiRestartName,        "HtiRestart" );
+_LIT( KHtiAdminStartParameter, "admin" );
+
+
+// MACROS
+
+// LOCAL CONSTANTS AND MACROS
+
+// MODULE DATA STRUCTURES
+
+// LOCAL FUNCTION PROTOTYPES
+
+// FORWARD DECLARATIONS
+
+// ============================ LOCAL FUNCTIONS ===============================
+
+LOCAL_C void StartHtiProcessL()
+    {
+    RProcess htiProcess;
+    User::LeaveIfError( htiProcess.Create(
+            KHtiFrameworkExeName, KHtiAdminStartParameter ) );
+    htiProcess.Resume();
+    htiProcess.Close();
+    }
+
+
+LOCAL_C TInt StartL()
+    {
+    HTI_LOG_TEXT( "HtiRestart starting..." );
+    TFullName threadName;
+    TFullName matchPattern;
+    matchPattern.Append(_L( "*" ));
+    matchPattern.Append(KHtiMainThreadName);
+    matchPattern.Append(_L( "*" ));
+
+    // Use thread finder to find the HTI main thread
+    TFindThread threadFinder;
+    threadFinder.Find(matchPattern);
+    HTI_LOG_TEXT( "Trying to find HTI main thread" );
+    TInt err = threadFinder.Next(threadName);
+
+    if (err == KErrNone)
+        {
+        HTI_LOG_TEXT( "HTI main thread found, opening it" );
+        RThread thread;
+        err = thread.Open(threadName);
+        if (err)
+            {
+            HTI_LOG_FORMAT( "Could not open HTI main thread, err: %d", err );
+            User::Panic(_L( "HTI open err" ), err);
+            }
+
+        // Logon to HTI main thread and wait for its death
+        HTI_LOG_TEXT( "HTI main thread opened, waiting for its death" );
+        TRequestStatus status;
+        thread.Logon(status);
+        User::WaitForRequest(status);
+        thread.Close();
+
+        HTI_LOG_TEXT( "HTI died");
+        }
+
+    TBuf<0x20> cmd;
+    User::CommandLine(cmd);
+
+    TLex lex(cmd);
+    TInt microseconds = 0;
+    lex.Val(microseconds);
+    HTI_LOG_FORMAT("After %d milliseconds...", microseconds);
+    User::After(microseconds);
+
+    // try to restart HTI
+    HTI_LOG_TEXT( "Trying to restart it" );
+    TRAP( err, StartHtiProcessL() );
+    if (err)
+        {
+        HTI_LOG_FORMAT( "Could not restart HTI, err: %d", err );
+        User::Panic(_L( "HTI start err" ), err);
+        }
+
+    HTI_LOG_TEXT( "HtiRestart shutting down" );
+    return KErrNone;
+    }
+
+GLDEF_C TInt E32Main()
+    {
+    __UHEAP_MARK;
+
+    CTrapCleanup* cleanup = CTrapCleanup::New();
+    CActiveScheduler *scheduler = new(ELeave) CActiveScheduler;
+    CActiveScheduler::Install( scheduler );
+
+    User::RenameThread( KHtiRestartName );
+
+    TRAPD( err, StartL() );
+
+    delete scheduler;
+    delete cleanup;
+
+   __UHEAP_MARKEND;
+
+    return err;
+    }
+
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 hti/HtiServicePlugins/HtiFtpServicePlugin/inc/HtiFtpServicePlugin.h
--- a/hti/HtiServicePlugins/HtiFtpServicePlugin/inc/HtiFtpServicePlugin.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/hti/HtiServicePlugins/HtiFtpServicePlugin/inc/HtiFtpServicePlugin.h	Thu Jul 15 20:25:38 2010 +0300
@@ -28,37 +28,41 @@
 // CONSTANTS
 enum TFtpCommand
     {
-    EFtpSTOR         = 0x02,
-    EFtpSTOR_u       = 0x03,
-    EFtpRETR         = 0x04,
-    EFtpRETR_u       = 0x05,
-    EFtpLIST         = 0x06,
-    EFtpLIST_u       = 0x07,
-    EFtpMKD          = 0x08,
-    EFtpMKD_u        = 0x09,
-    EFtpRMD          = 0x0A,
-    EFtpRMD_u        = 0x0B,
-    EFtpDELE         = 0x0C,
-    EFtpDELE_u       = 0x0D,
-    EFtpCANCEL       = 0x0E,
-    EFtpFILESIZE     = 0x0F,
-    EFtpLISTDIR      = 0x10,
-    EFtpLISTDIR_u    = 0x11,
-    EFtpLISTSIZES    = 0x12,
-    EFtpLISTSIZES_u  = 0x13,
-    EFtpLISTDRIVES   = 0x14,
-    EFtpLISTDRIVES_u = 0x15,
-    EFtpRENAME       = 0x16,
-    EFtpRENAME_u     = 0x17,
-    EFtpCOPY         = 0x18,
-    EFtpCOPY_u       = 0x19,
-    EFtpMOVE         = 0x1A,
-    EFtpMOVE_u       = 0x1B,
-    EFtpSETFORCE     = 0x20,
-    EFtpCHECKSUM     = 0x30,
-    EFtpCHECKSUM_u   = 0x31,
-    EFtpFORMAT       = 0x40,
-    EFtpOK           = 0xF0,
+    EFtpSTOR                = 0x02,
+    EFtpSTOR_u              = 0x03,
+    EFtpRETR                = 0x04,
+    EFtpRETR_u              = 0x05,
+    EFtpLIST                = 0x06,
+    EFtpLIST_u              = 0x07,
+    EFtpMKD                 = 0x08,
+    EFtpMKD_u               = 0x09,
+    EFtpRMD                 = 0x0A,
+    EFtpRMD_u               = 0x0B,
+    EFtpDELE                = 0x0C,
+    EFtpDELE_u              = 0x0D,
+    EFtpCANCEL              = 0x0E,
+    EFtpFILESIZE            = 0x0F,
+    EFtpLISTDIR             = 0x10,
+    EFtpLISTDIR_u           = 0x11,
+    EFtpLISTSIZES           = 0x12,
+    EFtpLISTSIZES_u         = 0x13,
+    EFtpLISTDRIVES          = 0x14,
+    EFtpLISTDRIVES_u        = 0x15,
+    EFtpRENAME              = 0x16,
+    EFtpRENAME_u            = 0x17,
+    EFtpCOPY                = 0x18,
+    EFtpCOPY_u              = 0x19,
+    EFtpMOVE                = 0x1A,
+    EFtpMOVE_u              = 0x1B,
+    EFtpSETFORCE            = 0x20,
+    EFtpCHECKSUM            = 0x30,
+    EFtpCHECKSUM_u          = 0x31,
+    EFtpListDetail          = 0x32,
+    EFtpListDetail_u        = 0x33,
+    EFtpListDirDetail       = 0x34,
+    EFtpListDirDetail_u     = 0x35,
+    EFtpFORMAT              = 0x40,
+    EFtpOK                  = 0xF0,
     };
 
 enum TAlgorithm
@@ -283,6 +287,14 @@
     * @param aSizes if ETrue filesizes are included in the response
     */
     void HandleListL( TBool aUnicodText, TUint aReadingAtt, TBool aSizes );
+    
+    /**
+    * Handle LIST FILES DETAIL command
+    *
+    * @param aUnicodText if ETrue then response in unicode
+    * @param aReadingAtt specifies what entries to read from a dir
+    */
+    void HandleListDetailL( TBool aUnicodText, TUint aReadingAtt);
 
     /**
     * Extracts and validate file name to iFileName
diff -r 8f8df8006c40 -r 3406c99bc375 hti/HtiServicePlugins/HtiFtpServicePlugin/src/HtiFtpServicePlugin.cpp
--- a/hti/HtiServicePlugins/HtiFtpServicePlugin/src/HtiFtpServicePlugin.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/hti/HtiServicePlugins/HtiFtpServicePlugin/src/HtiFtpServicePlugin.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -370,6 +370,17 @@
                     }
                 }
                 break;
+            case EFtpListDetail:
+            case EFtpListDetail_u:
+                {
+                if ( GetDirectoryL( aMessage.Mid( 1 ),
+                                   unicode ) )
+                    {
+                    HandleListDetailL( unicode,
+                        KEntryAttHidden| KEntryAttSystem|KEntryAttNormal);
+                    }
+                }
+                break;
             case EFtpLISTDIR:
             case EFtpLISTDIR_u:
                 {
@@ -383,6 +394,18 @@
                     }
                 }
                 break;
+            case EFtpListDirDetail:
+            case EFtpListDirDetail_u:
+                {
+                if ( GetDirectoryL( aMessage.Mid( 1 ),
+                                   unicode ) )
+                    {
+                    HandleListDetailL( unicode,
+                            KEntryAttMatchExclusive|KEntryAttHidden|
+                            KEntryAttSystem|KEntryAttDir);
+                    }
+                }
+                break;
             case EFtpMKD:
             case EFtpMKD_u:
                 {
@@ -990,6 +1013,82 @@
     HTI_LOG_FUNC_OUT("HandleListL");
     }
 
+void CHtiFtpServicePlugin::HandleListDetailL( TBool aUnicodText, TUint aReadingAtt)
+    {
+    HTI_LOG_FUNC_IN("HandleListDetailL");
+    CDir* dir;
+    TInt err = iFs.GetDir( iFileName, aReadingAtt, ESortNone, dir );
+    if ( err != KErrNone )
+        {
+        User::LeaveIfError( SendErrorMsg( err, KErrDescrFailedGetDir ) );
+        return;
+        }
+
+    CleanupStack::PushL( dir );
+    //build list
+    delete iSendBuffer;
+    iSendBuffer = NULL;
+    TInt bufferLen = dir->Count()*KMaxFileName;
+    if ( aUnicodText )
+        {
+        bufferLen *= 2;
+        }
+    // 1 bytes for name length, 4 bytes for file size, 
+    // 6 bytes for date time, 3 bytes for attributes(hide, readonly and system)
+    bufferLen += (1 + 4 + 6 + 3) * dir->Count();
+
+    iSendBuffer = HBufC8::NewL( bufferLen );
+    TInt dirNameLen = 0;
+    for ( TInt i = 0; i < dir->Count(); ++i)
+        {
+        dirNameLen = (*dir)[i].iName.Length();
+        iSendBuffer->Des().Append( dirNameLen );
+        if ( aUnicodText )
+            {
+            iSendBuffer->Des().Append( (TUint8*)((*dir)[i].iName.Ptr()),
+                                       dirNameLen*2 );
+            }
+        else
+            {
+            iSendBuffer->Des().Append( (*dir)[i].iName );
+            }
+        TInt year = (*dir)[i].iModified.DateTime().Year();
+        iSendBuffer->Des().Append((TUint8*)(&year), 2 );
+        iSendBuffer->Des().Append( (*dir)[i].iModified.DateTime().Month()+1);
+        iSendBuffer->Des().Append( (*dir)[i].iModified.DateTime().Day()+1);
+        iSendBuffer->Des().Append( (*dir)[i].iModified.DateTime().Hour());
+        iSendBuffer->Des().Append( (*dir)[i].iModified.DateTime().Minute());
+        iSendBuffer->Des().Append( (*dir)[i].iModified.DateTime().Second());
+        iSendBuffer->Des().Append( (*dir)[i].IsHidden());
+        iSendBuffer->Des().Append( (*dir)[i].IsReadOnly());
+        iSendBuffer->Des().Append( (*dir)[i].IsSystem());
+        if((*dir)[i].IsDir() == EFalse)
+            {
+            TInt size = (*dir)[i].iSize;
+            iSendBuffer->Des().Append( (TUint8*)(&size), 4 );
+            }
+        }
+
+    err = iDispatcher->DispatchOutgoingMessage(iSendBuffer,
+                        KFtpServiceUid,
+                        EFalse,
+                        EHtiPriorityControl);
+
+    if (  err != KErrNone )
+        {
+        //wait for a memory
+        iState = EListBusy;
+        iDispatcher->AddMemoryObserver( this );
+        }
+    else
+        {
+        iSendBuffer = NULL;
+        }
+
+    CleanupStack::PopAndDestroy();//dir
+    HTI_LOG_FUNC_OUT("HandleListDetailL");
+    }
+
 void CHtiFtpServicePlugin::HandleDataMessageL( const TDesC8& aMessage )
     {
     switch ( iState )
diff -r 8f8df8006c40 -r 3406c99bc375 hti/group/bld.inf
--- a/hti/group/bld.inf	Mon Jun 21 17:25:56 2010 +0300
+++ b/hti/group/bld.inf	Thu Jul 15 20:25:38 2010 +0300
@@ -53,5 +53,7 @@
 // Hti Watchdog
 #include "../HtiWatchDog/group/bld.inf"
 
+// Hti Restart
+#include "../HtiRestart/group/bld.inf"
 
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 hti/hti_plat/hti_api/inc/HtiVersion.h
--- a/hti/hti_plat/hti_api/inc/HtiVersion.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/hti/hti_plat/hti_api/inc/HtiVersion.h	Thu Jul 15 20:25:38 2010 +0300
@@ -25,13 +25,13 @@
 // CONSTANTS
 
 const TUint8 KHtiVersionMajor = 2;
-const TUint8 KHtiVersionMinor = 24;
+const TUint8 KHtiVersionMinor = 25;
 const TUint8 KHtiVersionBuild = 0;
 
 const TUint16 KHtiVersionYear  = 2010;
-const TUint8  KHtiVersionMonth = 5;
-const TUint8  KHtiVersionWeek  = 21;
-const TUint8  KHtiVersionDay   = 28;
+const TUint8  KHtiVersionMonth = 6;
+const TUint8  KHtiVersionWeek  = 23;
+const TUint8  KHtiVersionDay   = 11;
 
 //  MACROS
 
diff -r 8f8df8006c40 -r 3406c99bc375 hti/rom/htios.iby
--- a/hti/rom/htios.iby	Mon Jun 21 17:25:56 2010 +0300
+++ b/hti/rom/htios.iby	Thu Jul 15 20:25:38 2010 +0300
@@ -57,6 +57,9 @@
  // HTI Watchdog
 file=ABI_DIR\BUILD_DIR\HtiWatchDog.exe              SHARED_LIB_DIR\HtiWatchDog.exe
 
+ // HTI Restart
+file=ABI_DIR\BUILD_DIR\HtiRestart.exe               SHARED_LIB_DIR\HtiRestart.exe
+
 
 #endif // __HTIOS_IBY__
 
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/Driver/Kernel/Include/MemSpyDriverHeap.h
--- a/memspy/Driver/Kernel/Include/MemSpyDriverHeap.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/Driver/Kernel/Include/MemSpyDriverHeap.h	Thu Jul 15 20:25:38 2010 +0300
@@ -228,6 +228,7 @@
     /**
      * Used when opening the kernel heap
      */
+#ifndef __SYMBIAN_KERNEL_HYBRID_HEAP__
     class RHeapKExtended : public RHeapK
         {
     public:
@@ -243,7 +244,7 @@
         inline void ResetFailed() { iFailed = EFalse; }
         inline void ResetFailAllocCount() { iFailAllocCount = 0; }
         };
-
+#endif
 private:
     RHeapK* iKernelHeap;
     DChunk* iChunk;
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/Driver/Kernel/Source/MemSpyDriverHeap.cpp
--- a/memspy/Driver/Kernel/Source/MemSpyDriverHeap.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/Driver/Kernel/Source/MemSpyDriverHeap.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -511,8 +511,10 @@
 
 void RMemSpyDriverRHeapKernelInPlace::FailNext()
     {
+#ifndef __SYMBIAN_KERNEL_HYBRID_HEAP__
     RMemSpyDriverRHeapKernelInPlace::RHeapKExtended* heap = reinterpret_cast< RMemSpyDriverRHeapKernelInPlace::RHeapKExtended* >( iKernelHeap );
     heap->FailNext();
+#endif
     }
 
 
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanHeapBase.cpp
--- a/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanHeapBase.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanHeapBase.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -967,7 +967,12 @@
     TRACE_KH( Kern::Printf("DMemSpyDriverLogChanHeapBase::OpenKernelHeap(CP) - open err: %d", r ) );
     if  ( r == KErrNone )
         {
+#ifdef __SYMBIAN_KERNEL_HYBRID_HEAP__
+		// RAllocator::Size() not exported on hybrid heap
+		const TInt heapSize = heap->DebugFunction(RAllocator::EGetSize);
+#else
         const TInt heapSize = heap->Size();
+#endif
         TRACE_KH( Kern::Printf("DMemSpyDriverLogChanHeapBase::OpenKernelHeap(CP) - heapSize: %d, heap: 0x%08x, chunkBase: 0x%08x", heapSize, heap, chunk->Base() ) );
 
         // Make a new chunk that we can copy the kernel heap into. We cannot lock the system the entire time
@@ -1010,7 +1015,7 @@
                 TRACE_KH( Kern::Printf("DMemSpyDriverLogChanHeapBase::OpenKernelHeap(CP) - heapCopyChunk->iSize: 0x%08x, heapCopyChunk->iBase: 0x%08x, heapCopyChunkAddress: 0x%08x, physicalAddress: 0x%08x", heapCopyChunk->iSize, heapCopyChunk->iBase, heapCopyChunkAddress, physicalAddress));
 
                 NKern::LockSystem();
-                const TUint32 copyLength = Min( heap->Size(), heapSize );
+                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() ));
                 memcpy( (TUint8*) heapCopyChunkAddress, heap, copyLength );
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanStack.cpp
--- a/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanStack.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanStack.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -186,6 +186,10 @@
                 stackSize = threadAdaption.GetSupervisorStackSize( *thread );
                 stackBase = threadAdaption.GetSupervisorStackBase( *thread );
                 }
+            //We have a stack so setting it as available
+            if(stackSize!=0 &&  stackBase!=0)
+                stackAvailable=ETrue;
+            
             TRACE( Kern::Printf("DMemSpyDriverLogChanStack::GetStackData() - stackAvailable: %d", stackAvailable ));
             //           
             if  ( stackAvailable )
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/Driver/User/Include/RBuildQueryableHeap.h
--- a/memspy/Driver/User/Include/RBuildQueryableHeap.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/Driver/User/Include/RBuildQueryableHeap.h	Thu Jul 15 20:25:38 2010 +0300
@@ -30,13 +30,6 @@
 public: // API
     TBool IsDebugEUser() const;
     TInt CellHeaderSize( TMemSpyDriverCellType aType ) const;
-
-public: // Exposure of RHeap protected data members
-    inline TInt MinCellSize() const
-        {
-        return iMinCell;
-        }
-
     };
 
 
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/Driver/group/MemSpyDriver.mmp
--- a/memspy/Driver/group/MemSpyDriver.mmp	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/Driver/group/MemSpyDriver.mmp	Thu Jul 15 20:25:38 2010 +0300
@@ -83,5 +83,4 @@
     MACRO       MCL_DOBJECTIX_DUPLICATION
 #endif
 
-
 #include <kernel/kern_ext.mmh>
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/Engine/Source/Helpers/MemSpyEngineHelperStack.cpp
--- a/memspy/Engine/Source/Helpers/MemSpyEngineHelperStack.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/Engine/Source/Helpers/MemSpyEngineHelperStack.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -250,22 +250,36 @@
 
         if  ( r == KErrNone )
             {
-            while ( r == KErrNone )
-                {
-                iEngine.Sink().OutputBinaryDataL( KStackDataPrefix, pData.Ptr(), (const TUint8*) info.iUserStackBase, pData.Length() );
-                //
-                if  ( remaining > 0 )
+            if ( aType == EMemSpyDriverDomainUser ) {
+                while ( r == KErrNone )
                     {
-                    info.iUserStackBase += pData.Length();
-                    r = iEngine.Driver().GetStackDataNext( aThread.Id(), pData, remaining, aType, aEntireStack );
+                    iEngine.Sink().OutputBinaryDataL( KStackDataPrefix, pData.Ptr(), (const TUint8*) info.iUserStackBase, pData.Length() );
+                    //
+                    if  ( remaining > 0 )
+                        {
+                        info.iUserStackBase += pData.Length();
+                        r = iEngine.Driver().GetStackDataNext( aThread.Id(), pData, remaining, aType, aEntireStack );
+                        }
+                    else
+                        {
+                        break;
+                        }
                     }
-                else
-                    {
-                    break;
+            }
+            else if ( aType == EMemSpyDriverDomainKernel ) {
+                while ( r == KErrNone ) {
+                
+                    iEngine.Sink().OutputBinaryDataL( KStackDataPrefix, pData.Ptr(), (const TUint8*) info.iSupervisorStackBase, pData.Length() );
+                    //
+                    if  ( remaining > 0 ) {
+                        info.iSupervisorStackBase += pData.Length();
+                        r = iEngine.Driver().GetStackDataNext( aThread.Id(), pData, remaining, aType, aEntireStack );
                     }
-                }
+                    else {
+                         break;
+                    }
+               }
             }
-
         }
     CleanupStack::PopAndDestroy( data );
 
@@ -276,6 +290,7 @@
     iEngine.Sink().OutputLineFormattedL( KMemSpyMarkerStackData, &KMemSpySinkTagClose, (TUint) aThread.Id() );
     iEngine.Sink().DataStreamEndL();
     }
+}    
 
 
 EXPORT_C void CMemSpyEngineHelperStack::OutputStackInfoForDeviceL()
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/group/ReleaseNotes_MemSpy.txt
--- a/memspy/group/ReleaseNotes_MemSpy.txt	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/group/ReleaseNotes_MemSpy.txt	Thu Jul 15 20:25:38 2010 +0300
@@ -1,7 +1,7 @@
 ===============================================================================
 
-RELEASE NOTES - MEMSPY v1.2.0
-RELEASED 27th October 2009 
+RELEASE NOTES - MEMSPY v1.2.1
+RELEASED 15th June 2010 
 
 SUPPORTS S60 5.0+
 
@@ -28,17 +28,10 @@
 
 ===============================================================================
 
-What's New in v1.2.0
+What's New in v1.2.1
 ====================
-- Feature: Tracking modes introduced for simplify System Wide Memory Tracking
-  settings.
-- Feature: System Wide Memory Tracking categories can now be selected.
-- Feature: Heap data captured during System Wide Memory Tracking can be
-  filtered by thread name.
-- Feature: Shared heaps can now be detected with S60 UI and trace output.
-- Feature: Batch files for running MemSpy functions can now be executed from
-  command line.
-- Change: Command line interface documented in User's Guide.
+- Fix: Stack dumps fixed.
+
 
 ===============================================================================
 
@@ -100,6 +93,17 @@
 
 Version History:
 ================
+Version 1.2.0 - 27th October 2009
+------------------------------
+- Feature: Tracking modes introduced for simplify System Wide Memory Tracking
+  settings.
+- Feature: System Wide Memory Tracking categories can now be selected.
+- Feature: Heap data captured during System Wide Memory Tracking can be
+  filtered by thread name.
+- Feature: Shared heaps can now be detected with S60 UI and trace output.
+- Feature: Batch files for running MemSpy functions can now be executed from
+  command line.
+- Change: Command line interface documented in User's Guide.
 
 Version 1.1.0 - 22nd July 2009
 ------------------------------
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/memspy_plat/memspy_api/include/memspy/driver/shared/MemSpyDriverObjectsShared.h
--- a/memspy/memspy_plat/memspy_api/include/memspy/driver/shared/MemSpyDriverObjectsShared.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/memspy_plat/memspy_api/include/memspy/driver/shared/MemSpyDriverObjectsShared.h	Thu Jul 15 20:25:38 2010 +0300
@@ -19,10 +19,7 @@
 #define MEMSPYDRIVEROBJECTSSHARED_H
 
 // System includes
-#include <e32cmn.h>
-#include <e32ldr.h>
-#include <e32ldr_private.h>
-#include <e32property.h>
+#include <u32std.h>
 
 // User includes
 #include <memspy/driver/memspydriverenumerationsshared.h>
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/memspy_plat/memspy_api/include/memspy/driver/shared/MemSpyDriverObjectsSharedRHeap.h
--- a/memspy/memspy_plat/memspy_api/include/memspy/driver/shared/MemSpyDriverObjectsSharedRHeap.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/memspy_plat/memspy_api/include/memspy/driver/shared/MemSpyDriverObjectsSharedRHeap.h	Thu Jul 15 20:25:38 2010 +0300
@@ -19,9 +19,7 @@
 #define MEMSPYDRIVEROBJECTSSHAREDRHEAP_H
 
 // System includes
-#include <e32cmn.h>
-#include <e32ldr.h>
-#include <e32ldr_private.h>
+#include <u32std.h>
 #ifndef __KERNEL_MODE__
 #include <e32debug.h>
 #endif
@@ -93,7 +91,12 @@
 	TInt iAlign;
 	TInt iMinCell;
 	TInt iPageSize;
+#ifdef __SYMBIAN_KERNEL_HYBRID_HEAP__
+	struct SCell { TInt len; SCell* next };
+    SCell iFree;
+#else
     RHeap::SCell iFree;
+#endif
 	TInt iNestingLevel;
 	TInt iAllocCount;
     RAllocator::TAllocFail iFailType;
diff -r 8f8df8006c40 -r 3406c99bc375 memspy/memspy_plat/memspy_api/include/memspy/engine/Helpers/MemSpyEngineHelperCodeSegment.h
--- a/memspy/memspy_plat/memspy_api/include/memspy/engine/Helpers/MemSpyEngineHelperCodeSegment.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/memspy/memspy_plat/memspy_api/include/memspy/engine/Helpers/MemSpyEngineHelperCodeSegment.h	Thu Jul 15 20:25:38 2010 +0300
@@ -20,8 +20,7 @@
 
 // System includes
 #include <e32base.h>
-#include <e32ldr.h>
-#include <e32ldr_private.h>
+#include <e32svr.h>
 #include <badesca.h>
 
 // User includes
@@ -144,4 +143,4 @@
 
 
 
-#endif
\ No newline at end of file
+#endif
diff -r 8f8df8006c40 -r 3406c99bc375 stif/ATSInterface/inc/ATSInterface.h
--- a/stif/ATSInterface/inc/ATSInterface.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/ATSInterface/inc/ATSInterface.h	Thu Jul 15 20:25:38 2010 +0300
@@ -188,5 +188,5 @@
 
 
 #endif // ATS_INTERFACE_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/ATSInterface/inc/ATSInterfaceRunner.h
--- a/stif/ATSInterface/inc/ATSInterfaceRunner.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/ATSInterface/inc/ATSInterfaceRunner.h	Thu Jul 15 20:25:38 2010 +0300
@@ -253,5 +253,5 @@
     };
 
 #endif // ATS_INTERFACE_RUNNER_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/ATSInterface/src/ATSInterface.cpp
--- a/stif/ATSInterface/src/ATSInterface.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/ATSInterface/src/ATSInterface.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1106,6 +1106,4 @@
     return err;
     }
 
-//  End of File
-
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/ATSInterface/src/ATSInterfaceRunner.cpp
--- a/stif/ATSInterface/src/ATSInterfaceRunner.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/ATSInterface/src/ATSInterfaceRunner.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -565,6 +565,4 @@
 // ================= OTHER EXPORTED FUNCTIONS ================================= 
 // None
 
-//  End of File
-
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/ATSLogger/src/atslogger.cpp
--- a/stif/ATSLogger/src/atslogger.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/ATSLogger/src/atslogger.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1113,5 +1113,4 @@
 		}
 	}
 
-
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/ConsoleUI/inc/CallBack.h
--- a/stif/ConsoleUI/inc/CallBack.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/ConsoleUI/inc/CallBack.h	Thu Jul 15 20:25:38 2010 +0300
@@ -207,5 +207,5 @@
     };
 
 #endif      // CALLBACK_H  
-            
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/ConsoleUI/inc/ConsoleMenus.h
--- a/stif/ConsoleUI/inc/ConsoleMenus.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/ConsoleUI/inc/ConsoleMenus.h	Thu Jul 15 20:25:38 2010 +0300
@@ -1246,6 +1246,7 @@
 _LIT( KSetLoad,         "Load test set" );
 
 _LIT( KSetShow,         "Show started test sets" );
+_LIT( KSetUnload,       "Unload test set" );
 _LIT( KSetRemove,       "Remove test set" );
 _LIT( KSetCaseAdd,      "Add test case to test set" );
 _LIT( KSetCaseRemove,   "Remove test case from test set" );
@@ -1281,6 +1282,7 @@
             ESetStartPar,
             //ESetStartRep,
  
+            ESetUnload,
             ESetRemove,
             ESetSave,
             ESetCaseAdd,
diff -r 8f8df8006c40 -r 3406c99bc375 stif/ConsoleUI/src/Consolemenus.cpp
--- a/stif/ConsoleUI/src/Consolemenus.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/ConsoleUI/src/Consolemenus.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -3875,6 +3875,10 @@
             {
             return KErrNoMemory;
             }
+        if( aArray.Append( KSetUnload ) != KErrNone )
+            {
+            return KErrNoMemory;
+            }                        
         if( aArray.Append( KSetRemove ) != KErrNone )
             {
             return KErrNoMemory;
@@ -4026,11 +4030,19 @@
                                         this, 
                                         _L("Started test sets menu"));
                 return iSubMenu;
+            case ESetUnload:
+                ret = iMain->UIStore().UnloadTestSet( iTestSetName );
+                if( ret != KErrNone )
+                    {
+                    User::InfoPrint( _L("Test set unload failed") );
+                    }
+                iTestSetCreated = EFalse;                  
+                break;
             case ESetRemove: 
                 ret = iMain->UIStore().RemoveTestSet( iTestSetName );
                 if( ret != KErrNone )
                     {
-                    User::InfoPrint( _L("Test set creation failed") );
+                    User::InfoPrint( _L("Test set remove failed") );
                     }
                 iTestSetCreated = EFalse;  
                 break;
@@ -4257,7 +4269,12 @@
     {
 
    TInt ret = iMain->UIStore().GetTestSetsList( aArray );
-  
+
+	if ( ret != KErrNone )
+		{
+		return ret;
+		}
+
    iFileList.ResetAndDestroy();
    TRAPD( err,
 	//Assign aArray to iFileList, it is used in LoadTestSet
@@ -4380,8 +4397,6 @@
                 {           
                 if(iPosOnScreen < iFileList.Count())
                     {
-                    const TDesC& aSetName = iFileList.operator [](iPosOnScreen)->Des();
-                
                     ret = iMain->UIStore().LoadTestSet( iFileList.operator [](iPosOnScreen)->Des() );
                     if (ret == KErrNone)
                         {
@@ -5681,4 +5696,5 @@
         }
     iTestCaseMenu = aTestCaseMenu;
     }
-// End of file
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/DemoModule/src/DemoModule.cpp
--- a/stif/DemoModule/src/DemoModule.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/DemoModule/src/DemoModule.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -591,5 +591,4 @@
 
     }
 
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Logger/inc/DataLogger.h
--- a/stif/Logger/inc/DataLogger.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Logger/inc/DataLogger.h	Thu Jul 15 20:25:38 2010 +0300
@@ -122,4 +122,4 @@
 
 #endif      // DATALOGGER_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Logger/src/FileOutput.cpp
--- a/stif/Logger/src/FileOutput.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Logger/src/FileOutput.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1211,4 +1211,4 @@
 // ================= OTHER EXPORTED FUNCTIONS =================================
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Logger/src/HtmlLogger.cpp
--- a/stif/Logger/src/HtmlLogger.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Logger/src/HtmlLogger.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -567,4 +567,4 @@
 // ================= OTHER EXPORTED FUNCTIONS =================================
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Logger/src/LoggerOverFlow.cpp
--- a/stif/Logger/src/LoggerOverFlow.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Logger/src/LoggerOverFlow.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -293,4 +293,4 @@
 // ================= OTHER EXPORTED FUNCTIONS =================================
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Logger/src/NullOutput.cpp
--- a/stif/Logger/src/NullOutput.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Logger/src/NullOutput.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -229,4 +229,4 @@
 // ================= OTHER EXPORTED FUNCTIONS =================================
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Logger/src/Output.cpp
--- a/stif/Logger/src/Output.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Logger/src/Output.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -240,4 +240,4 @@
 // ================= OTHER EXPORTED FUNCTIONS =================================
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Logger/src/RDebugOutput.cpp
--- a/stif/Logger/src/RDebugOutput.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Logger/src/RDebugOutput.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -681,4 +681,4 @@
 // ================= OTHER EXPORTED FUNCTIONS =================================
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Parser/inc/ParserTracing.h
--- a/stif/Parser/inc/ParserTracing.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Parser/inc/ParserTracing.h	Thu Jul 15 20:25:38 2010 +0300
@@ -43,5 +43,5 @@
 #endif
 
 #endif // STIFPARSERTRACING_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Parser/inc/cstackdeprecated.h
--- a/stif/Parser/inc/cstackdeprecated.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Parser/inc/cstackdeprecated.h	Thu Jul 15 20:25:38 2010 +0300
@@ -52,3 +52,5 @@
 #pragma warning ( default : 4127 ) // conditional expression is constant
 
 #endif // __CSTACK_HDEPRECATED__
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Parser/inc/cstackdeprecated.inl
--- a/stif/Parser/inc/cstackdeprecated.inl	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Parser/inc/cstackdeprecated.inl	Thu Jul 15 20:25:38 2010 +0300
@@ -103,3 +103,5 @@
 	
 
 #endif // __CSTACKDEPRECATED_INL__
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Parser/src/StifItemParser.cpp
--- a/stif/Parser/src/StifItemParser.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Parser/src/StifItemParser.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1244,4 +1244,4 @@
 
 // ================= OTHER EXPORTED FUNCTIONS =================================
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Parser/src/StifParser.cpp
--- a/stif/Parser/src/StifParser.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Parser/src/StifParser.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -888,4 +888,4 @@
 
     }
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/Parser/src/StifSectionParser.cpp
--- a/stif/Parser/src/StifSectionParser.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/Parser/src/StifSectionParser.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1104,4 +1104,4 @@
 
 // ================= OTHER EXPORTED FUNCTIONS =================================
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/SUEvent/inc/SUEvent.h
--- a/stif/SUEvent/inc/SUEvent.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/SUEvent/inc/SUEvent.h	Thu Jul 15 20:25:38 2010 +0300
@@ -314,4 +314,4 @@
 
 #endif      // SUEVENT_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/SUEvent/src/SUEvent.cpp
--- a/stif/SUEvent/src/SUEvent.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/SUEvent/src/SUEvent.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -361,6 +361,4 @@
 
     }
 
-
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/SUEvent/src/SUEventCases.cpp
--- a/stif/SUEvent/src/SUEventCases.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/SUEvent/src/SUEventCases.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -309,4 +309,5 @@
 
     }
 */
-//  End of File
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifKernelTestClassBase/src/StifKernelTestClassBase.cpp
--- a/stif/StifKernelTestClassBase/src/StifKernelTestClassBase.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifKernelTestClassBase/src/StifKernelTestClassBase.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -291,5 +291,4 @@
     
     }
 
-    
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/Bwins/STIFTFWIFU.DEF
--- a/stif/StifTFwIf/Bwins/STIFTFWIFU.DEF	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/Bwins/STIFTFWIFU.DEF	Thu Jul 15 20:25:38 2010 +0300
@@ -60,4 +60,5 @@
 	?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 &)
+	?UnloadTestSet@CUIStore@@QAEHABVTDesC16@@@Z @ 62 NONAME ; int CUIStore::UnloadTestSet(class TDesC16 const &)
 
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/eabi/StifTFwIfu.def
--- a/stif/StifTFwIf/eabi/StifTFwIfu.def	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/eabi/StifTFwIfu.def	Thu Jul 15 20:25:38 2010 +0300
@@ -99,4 +99,5 @@
 	_ZN8CUIStore12ReadFiltersLER13RPointerArrayI7TDesC16E @ 98 NONAME
 	_ZN8CUIStore15GetTestSetsListER9RRefArrayI7TDesC16E @ 99 NONAME
 	_ZN8CUIStore12SaveTestSet2ER6TDes16 @ 100 NONAME
+	_ZN8CUIStore13UnloadTestSetERK7TDesC16 @ 101 NONAME
 
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/inc/UIEngineError.h
--- a/stif/StifTFwIf/inc/UIEngineError.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/inc/UIEngineError.h	Thu Jul 15 20:25:38 2010 +0300
@@ -135,5 +135,5 @@
     };
 
 #endif // UI_ENGINE_ERROR_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/inc/UIEngineEvent.h
--- a/stif/StifTFwIf/inc/UIEngineEvent.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/inc/UIEngineEvent.h	Thu Jul 15 20:25:38 2010 +0300
@@ -174,5 +174,5 @@
 
 
 #endif // STIF_TFW_IF_EVENT_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/inc/UIEnginePrinter.h
--- a/stif/StifTFwIf/inc/UIEnginePrinter.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/inc/UIEnginePrinter.h	Thu Jul 15 20:25:38 2010 +0300
@@ -143,5 +143,5 @@
 
 
 #endif // STIF_TFW_IF_PRINTER_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/inc/UIEngineRemote.h
--- a/stif/StifTFwIf/inc/UIEngineRemote.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/inc/UIEngineRemote.h	Thu Jul 15 20:25:38 2010 +0300
@@ -161,5 +161,5 @@
 
 
 #endif // STIF_TFW_IF_REMOTE_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/inc/UIEngineRunner.h
--- a/stif/StifTFwIf/inc/UIEngineRunner.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/inc/UIEngineRunner.h	Thu Jul 15 20:25:38 2010 +0300
@@ -146,5 +146,5 @@
 
 
 #endif // STIF_TFW_IF_RUNNER_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/inc/UIStorePopup.h
--- a/stif/StifTFwIf/inc/UIStorePopup.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/inc/UIStorePopup.h	Thu Jul 15 20:25:38 2010 +0300
@@ -178,5 +178,5 @@
 
 
 #endif // STIF_TFW_IF_REMOTE_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/StifTFwIf.cpp
--- a/stif/StifTFwIf/src/StifTFwIf.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/StifTFwIf.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1842,4 +1842,4 @@
     iMasterArray.Reset();
     }
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/UIEngine.cpp
--- a/stif/StifTFwIf/src/UIEngine.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/UIEngine.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1307,4 +1307,4 @@
     
 // ================= OTHER EXPORTED FUNCTIONS ================================= 
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/UIEngineContainer.cpp
--- a/stif/StifTFwIf/src/UIEngineContainer.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/UIEngineContainer.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -609,4 +609,4 @@
 
 // ================= OTHER EXPORTED FUNCTIONS ================================= 
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/UIEngineError.cpp
--- a/stif/StifTFwIf/src/UIEngineError.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/UIEngineError.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -272,4 +272,4 @@
 // ================= OTHER EXPORTED FUNCTIONS ================================= 
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/UIEngineEvent.cpp
--- a/stif/StifTFwIf/src/UIEngineEvent.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/UIEngineEvent.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -478,4 +478,4 @@
 // ================= OTHER EXPORTED FUNCTIONS ================================= 
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/UIEnginePrinter.cpp
--- a/stif/StifTFwIf/src/UIEnginePrinter.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/UIEnginePrinter.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -287,4 +287,4 @@
 // ================= OTHER EXPORTED FUNCTIONS ================================= 
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/UIEngineRemote.cpp
--- a/stif/StifTFwIf/src/UIEngineRemote.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/UIEngineRemote.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -415,4 +415,4 @@
 // ================= OTHER EXPORTED FUNCTIONS ================================= 
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/UIEngineRunner.cpp
--- a/stif/StifTFwIf/src/UIEngineRunner.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/UIEngineRunner.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -285,4 +285,4 @@
 // ================= OTHER EXPORTED FUNCTIONS ================================= 
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/UIStore.cpp
--- a/stif/StifTFwIf/src/UIStore.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/UIStore.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1031,7 +1031,53 @@
 */ 
 EXPORT_C TInt CUIStore::RemoveTestSet( const TDesC& aSetName )
     {
-    
+    TInt err = UnloadTestSet( aSetName );
+    if ( err != KErrNone )
+        {
+        return err;
+        }
+    
+    TFileName setfile;
+    setfile.Append(KUIStoreDefaultDir);
+    setfile.Append(aSetName);
+    RFs fs;
+    err = fs.Connect();
+    if( err != KErrNone )
+        {
+        fs.Close();
+        return err;
+        }
+    err = fs.Delete( setfile );
+    if ( err != KErrNone )
+        {
+        fs.Close();
+        return err;    
+        }
+    
+    return KErrNone;   
+    }
+
+/*
+-------------------------------------------------------------------------------
+
+    Class: CUIStore
+
+    Method: UnloadTestSet
+
+    Description: Unloads active test set.
+
+    Parameters: TDesC& aSetName: in: test set name (Max length is KMaxName)
+    
+    Return Values: Symbian OS error code
+
+    Errors/Exceptions: None
+
+    Status: Draft
+
+-------------------------------------------------------------------------------
+*/ 
+EXPORT_C TInt CUIStore::UnloadTestSet( const TDesC& aSetName )
+    {    
     TPtrC setName;
     TFileName tmp;
     TInt ret = ParseTestSetName( aSetName, setName, tmp );
@@ -1070,25 +1116,8 @@
         }
     
     delete setInfo;
-    TFileName setfile;
-    setfile.Append(KUIStoreDefaultDir);
-    setfile.Append(aSetName);
-    RFs fs;
-    TInt err=fs.Connect();
-    if(err!=KErrNone)
-    {
-    fs.Close();
-    return err;
-    }
-    err=fs.Delete(setfile);
-    if(err!=KErrNone)
-    {
-    fs.Close();
-    return err;    
-    }
-    
-    return KErrNone;
-    
+    
+    return KErrNone;    
     }
 
 /*
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/UIStoreContainer.cpp
--- a/stif/StifTFwIf/src/UIStoreContainer.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/UIStoreContainer.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -902,5 +902,5 @@
     CleanupStack::PopAndDestroy( tmp );
     
     }
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/StifTFwIf/src/UIStorePopup.cpp
--- a/stif/StifTFwIf/src/UIStorePopup.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/StifTFwIf/src/UIStorePopup.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -307,4 +307,4 @@
 // ================= OTHER EXPORTED FUNCTIONS ================================= 
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestCombiner/inc/StifPythonFunComb.h
--- a/stif/TestCombiner/inc/StifPythonFunComb.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestCombiner/inc/StifPythonFunComb.h	Thu Jul 15 20:25:38 2010 +0300
@@ -43,4 +43,4 @@
 
 #endif        // STIFPYTHONFUNCOMB_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestCombiner/inc/TestCase.h
--- a/stif/TestCombiner/inc/TestCase.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestCombiner/inc/TestCase.h	Thu Jul 15 20:25:38 2010 +0300
@@ -274,7 +274,6 @@
         CTCTestCase( CTestCombiner* testCombiner,
                      TInt aExpectedResult,
                      TFullTestResult::TCaseExecutionResult aCategory,
-                     const TDesC& aTestCaseArguments,
                      CTCTestModule* aModule ); //--PYTHON--
 
         /**
@@ -598,5 +597,5 @@
     };
     
 #endif        // TESTCASE_H  
-                
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestCombiner/inc/TestCaseNotify.h
--- a/stif/TestCombiner/inc/TestCaseNotify.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestCombiner/inc/TestCaseNotify.h	Thu Jul 15 20:25:38 2010 +0300
@@ -526,6 +526,5 @@
     };
 
 #endif // TEST_CASE_NOTIFY_H
-     
-                
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestCombiner/inc/TestCombinerEvent.h
--- a/stif/TestCombiner/inc/TestCombinerEvent.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestCombiner/inc/TestCombinerEvent.h	Thu Jul 15 20:25:38 2010 +0300
@@ -132,5 +132,5 @@
     };
 
 #endif      // TESTCOMBINEREVENT_H
-            
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestCombiner/inc/TestCombinerUtils.h
--- a/stif/TestCombiner/inc/TestCombinerUtils.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestCombiner/inc/TestCombinerUtils.h	Thu Jul 15 20:25:38 2010 +0300
@@ -245,5 +245,5 @@
     };
     
 #endif        // TESTCOMBINERUTILS_H
-                
-// End of File
\ No newline at end of file
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestCombiner/src/StifPythonFunComb.cpp
--- a/stif/TestCombiner/src/StifPythonFunComb.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestCombiner/src/StifPythonFunComb.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -71,4 +71,4 @@
 //
 // ============================ MEMBER FUNCTIONS ===============================
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestCombiner/src/TestCase.cpp
--- a/stif/TestCombiner/src/TestCase.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestCombiner/src/TestCase.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -336,7 +336,6 @@
 CTCTestCase::CTCTestCase( CTestCombiner* testCombiner,
                           TInt aExpectedResult,
                           TFullTestResult::TCaseExecutionResult aCategory,
-                          const TDesC& aTestCaseArguments,
                           CTCTestModule* aModule ): //--PYTHON
     CTestCase( testCombiner, aExpectedResult, aCategory, ECaseLocal, aModule ), //--PYTHON
     iResultPckg( iResult )
@@ -406,7 +405,6 @@
     CTCTestCase* self = new (ELeave) CTCTestCase( testCombiner,
                                                    aExpectedResult,
                                                    aCategory,
-                                                   aTestCaseArguments,
                                                    aModule ); //--PYTHON
      
     CleanupStack::PushL( self );
@@ -1206,4 +1204,4 @@
 
     }
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestCombiner/src/TestCaseNotify.cpp
--- a/stif/TestCombiner/src/TestCaseNotify.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestCombiner/src/TestCaseNotify.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1492,7 +1492,7 @@
     {
     __TRACE(KMessage, (_L("CTestEventNotifier::StartL (combiner)")));
 
-    TInt res = iTestCase->TestExecution().NotifyCommand2(iCommandPckg, iParamsPckg, iStatus, KErrNone);
+    iTestCase->TestExecution().NotifyCommand2(iCommandPckg, iParamsPckg, iStatus, KErrNone);
     SetActive();
     }
 
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestCombiner/src/TestCombiner.cpp
--- a/stif/TestCombiner/src/TestCombiner.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestCombiner/src/TestCombiner.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -6616,6 +6616,4 @@
     return CTestCombiner::NewL();
     }
 
-
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestCombiner/src/TestCombinerUtils.cpp
--- a/stif/TestCombiner/src/TestCombinerUtils.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestCombiner/src/TestCombinerUtils.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -992,4 +992,4 @@
 // ================= OTHER EXPORTED FUNCTIONS =================================
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/inc/SettingServer.h
--- a/stif/TestEngine/inc/SettingServer.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/inc/SettingServer.h	Thu Jul 15 20:25:38 2010 +0300
@@ -301,5 +301,5 @@
     };
 
 #endif // SETTING_SERVER_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/inc/StifPythonFunEng.h
--- a/stif/TestEngine/inc/StifPythonFunEng.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/inc/StifPythonFunEng.h	Thu Jul 15 20:25:38 2010 +0300
@@ -43,4 +43,4 @@
 
 #endif        // STIFPYTHONFUNENG_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/inc/TestEngineCommon.h
--- a/stif/TestEngine/inc/TestEngineCommon.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/inc/TestEngineCommon.h	Thu Jul 15 20:25:38 2010 +0300
@@ -56,4 +56,4 @@
 
 #endif // TEST_ENGINE_COMMON_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/inc/TestEngineEvent.h
--- a/stif/TestEngine/inc/TestEngineEvent.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/inc/TestEngineEvent.h	Thu Jul 15 20:25:38 2010 +0300
@@ -142,4 +142,4 @@
 
 #endif      // TESTENGINEEVENT_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/src/STIFTestFrameworkSettings.cpp
--- a/stif/TestEngine/src/STIFTestFrameworkSettings.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/src/STIFTestFrameworkSettings.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -669,4 +669,4 @@
 // ================= OTHER EXPORTED FUNCTIONS =================================
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/src/SettingServer.cpp
--- a/stif/TestEngine/src/SettingServer.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/src/SettingServer.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -568,4 +568,4 @@
 
     }
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/src/SettingServerSession.cpp
--- a/stif/TestEngine/src/SettingServerSession.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/src/SettingServerSession.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -947,4 +947,4 @@
     return KErrNone;
     }
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/src/StifPythonFunEng.cpp
--- a/stif/TestEngine/src/StifPythonFunEng.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/src/StifPythonFunEng.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -70,4 +70,4 @@
 //
 // ============================ MEMBER FUNCTIONS ===============================
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/src/TestCaseController.cpp
--- a/stif/TestEngine/src/TestCaseController.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/src/TestCaseController.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -2784,7 +2784,7 @@
     {
     __TRACE(KVerbose, (_L("CTestEventNotifier::StartL")));
 
-    TInt res = iTestExecution.NotifyCommand2(iCommandPckg, iParamsPckg, iStatus, KErrNone);
+    iTestExecution.NotifyCommand2(iCommandPckg, iParamsPckg, iStatus, KErrNone);
     SetActive();
     }
 
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/src/TestEngine.cpp
--- a/stif/TestEngine/src/TestEngine.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/src/TestEngine.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -755,6 +755,15 @@
 */
 void CTestEngine::ConstructL( CTestEngineServer* aServer )
     {
+    // Log version info
+    TInt majorV;
+    TInt minorV;
+    TInt buildV;
+    TBuf<30> relDate;
+    TStifUtil::STIFVersion(majorV, minorV, buildV, relDate);
+    RDebug::Print(_L( "STIF startup... version %d.%d.%d (%S)"), majorV, minorV, buildV, &relDate);
+
+
     // Second-phase construct base class
     //CSession2::CreateL();
 
@@ -769,6 +778,7 @@
     // Initialize the object container from Server
     iContainer = iTestEngineServer->NewContainerL();
 
+    __TRACE(KInit, (_L( "STIF startup... version %d.%d.%d (%S)"), majorV, minorV, buildV, &relDate));
     __TRACE( KInit, ( _L( "CTestEngine::ConstructL: Test Engine Created" ) ) );
 
    
@@ -6201,5 +6211,4 @@
 
     }
 
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/src/TestModuleController.cpp
--- a/stif/TestEngine/src/TestModuleController.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/src/TestModuleController.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -3104,4 +3104,4 @@
 
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestEngine/src/TestReport.cpp
--- a/stif/TestEngine/src/TestReport.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestEngine/src/TestReport.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -125,6 +125,8 @@
 _LIT(KXMLTotalTagEnd,            "</Total>");
 _LIT(KXMLVersionTag,             "<Version>");
 _LIT(KXMLVersionTagEnd,          "</Version>");
+_LIT(KXMLSTIFVersionTag,         "<STIFVersion>");
+_LIT(KXMLSTIFVersionTagEnd,      "</STIFVersion>");
 
 // LOCAL CONSTANTS AND MACROS
 // None
@@ -614,6 +616,21 @@
         WriteLineL( _L( "%S" ), &date );
         WriteLineL( _L( "%S" ), &clock );
         }
+
+    // Add STIF version info
+    TInt majorV;
+    TInt minorV;
+    TInt buildV;
+    TBuf<30> relDate;
+    TStifUtil::STIFVersion(majorV, minorV, buildV, relDate);
+    if(iXML)
+        {
+        WriteLineL(_L("%S%d.%d.%d (%S)%S"), &KXMLSTIFVersionTag, majorV, minorV, buildV, &relDate, &KXMLSTIFVersionTagEnd);
+        }
+    else
+        {
+        WriteLineL(_L("v.%d.%d.%d (%S)"), majorV, minorV, buildV, &relDate);
+        }
     
     if ( iReportMode & ETestReportSummary )
         {
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestInterface/src/TestInterface.cpp
--- a/stif/TestInterface/src/TestInterface.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestInterface/src/TestInterface.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -616,4 +616,5 @@
 	aBuildV = STIF_BUILD_VERSION;
 	aRelDate = TO_UNICODE(STIF_REL_DATE);
 	}
-//  End of File
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestInterface/src/TestModuleIf.cpp
--- a/stif/TestInterface/src/TestModuleIf.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestInterface/src/TestModuleIf.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1743,4 +1743,4 @@
 
     }
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestInterference/src/StifTestInterference.cpp
--- a/stif/TestInterference/src/StifTestInterference.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestInterference/src/StifTestInterference.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1996,4 +1996,4 @@
 // ========================== OTHER EXPORTED FUNCTIONS =========================
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestModuleTemplates/HardCodedTestModuleXXX/src/HardCodedTestModuleXXX.cpp
--- a/stif/TestModuleTemplates/HardCodedTestModuleXXX/src/HardCodedTestModuleXXX.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestModuleTemplates/HardCodedTestModuleXXX/src/HardCodedTestModuleXXX.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -438,5 +438,4 @@
 
     }
 
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestModuleTemplates/HardCodedTestModuleXXX/src/HardCodedTestModuleXXXCases.cpp
--- a/stif/TestModuleTemplates/HardCodedTestModuleXXX/src/HardCodedTestModuleXXXCases.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestModuleTemplates/HardCodedTestModuleXXX/src/HardCodedTestModuleXXXCases.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -268,3 +268,5 @@
     }
 */
 //  [End of File] - do not remove
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestModuleTemplates/STIFUnitXXX/src/STIFUnitXXX.cpp
--- a/stif/TestModuleTemplates/STIFUnitXXX/src/STIFUnitXXX.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestModuleTemplates/STIFUnitXXX/src/STIFUnitXXX.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -121,4 +121,4 @@
 #undef STIFUNIT_OOMTESTFINALIZEL
 #endif
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestModuleTemplates/STIFUnitXXX/src/STIFUnitXXXCases.cpp
--- a/stif/TestModuleTemplates/STIFUnitXXX/src/STIFUnitXXXCases.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestModuleTemplates/STIFUnitXXX/src/STIFUnitXXXCases.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -86,3 +86,5 @@
 /**
  * END OF TEST CASES SECTION
  */
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestModuleTemplates/TemplateKernelScriptXXX/src/TemplateKernelScriptXXX.cpp
--- a/stif/TestModuleTemplates/TemplateKernelScriptXXX/src/TemplateKernelScriptXXX.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestModuleTemplates/TemplateKernelScriptXXX/src/TemplateKernelScriptXXX.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -79,5 +79,4 @@
 
     }
 
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestModuleTemplates/TemplateKernelScriptXXX/src/TemplateKernelScriptXXXBlocks.cpp
--- a/stif/TestModuleTemplates/TemplateKernelScriptXXX/src/TemplateKernelScriptXXXBlocks.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestModuleTemplates/TemplateKernelScriptXXX/src/TemplateKernelScriptXXXBlocks.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -143,4 +143,4 @@
 // ========================== OTHER EXPORTED FUNCTIONS =========================
 // None
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestModuleTemplates/TemplateScriptXXX/src/TemplateScriptXXX.cpp
--- a/stif/TestModuleTemplates/TemplateScriptXXX/src/TemplateScriptXXX.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestModuleTemplates/TemplateScriptXXX/src/TemplateScriptXXX.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -195,5 +195,4 @@
 
     }
 
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestModuleTemplates/TemplateScriptXXX/src/TemplateScriptXXXBlocks.cpp
--- a/stif/TestModuleTemplates/TemplateScriptXXX/src/TemplateScriptXXXBlocks.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestModuleTemplates/TemplateScriptXXX/src/TemplateScriptXXXBlocks.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -160,3 +160,5 @@
 // None
 
 //  [End of File] - Do not remove
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestModuleTemplates/TestModuleTemplates.zip
Binary file stif/TestModuleTemplates/TestModuleTemplates.zip has changed
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestModuleTemplates/TestModuleXXX/src/TestModuleXXX.cpp
--- a/stif/TestModuleTemplates/TestModuleXXX/src/TestModuleXXX.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestModuleTemplates/TestModuleXXX/src/TestModuleXXX.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -442,5 +442,4 @@
 
     }
 
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestScripter/src/TestScripter.cpp
--- a/stif/TestScripter/src/TestScripter.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestScripter/src/TestScripter.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -3875,7 +3875,7 @@
         User::Leave( KErrArgument ); // Error in parsing => Leave    	
     	}
     // Convert idle time from milli to micro seconds
-   	idle = time * 1000.0;
+   	idle = static_cast<TInt>( time * 1000.0);
 
     if( idle < 0 )
     	{
@@ -3901,7 +3901,7 @@
     	}
     
     // Convert active time from milli to micro seconds
-   	active = time * 1000.0;
+   	active = static_cast<TInt>( time * 1000.0 );
    	
     if( active < 0 )
     	{
@@ -5166,5 +5166,4 @@
     
     }
 
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestScripter/src/TestScripterInternal.cpp
--- a/stif/TestScripter/src/TestScripterInternal.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestScripter/src/TestScripterInternal.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -387,4 +387,4 @@
     return ret;
     }
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestServer/inc/PrintQueue.h
--- a/stif/TestServer/inc/PrintQueue.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestServer/inc/PrintQueue.h	Thu Jul 15 20:25:38 2010 +0300
@@ -188,4 +188,4 @@
 
 #endif  // PRINTQUEUE_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestServer/inc/TestServer.h
--- a/stif/TestServer/inc/TestServer.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestServer/inc/TestServer.h	Thu Jul 15 20:25:38 2010 +0300
@@ -1681,5 +1681,5 @@
     };
 
 #endif // TEST_SERVER_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestServer/inc/TestServerCommon.h
--- a/stif/TestServer/inc/TestServerCommon.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestServer/inc/TestServerCommon.h	Thu Jul 15 20:25:38 2010 +0300
@@ -51,4 +51,4 @@
 
 #endif // TEST_SERVER_COMMON_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestServer/inc/TestServerEvent.h
--- a/stif/TestServer/inc/TestServerEvent.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestServer/inc/TestServerEvent.h	Thu Jul 15 20:25:38 2010 +0300
@@ -172,5 +172,5 @@
     };
 
 #endif      // TESTSERVEREVENT_H
-            
-// End of File
\ No newline at end of file
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestServer/src/TestExecutionThread.cpp
--- a/stif/TestServer/src/TestExecutionThread.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestServer/src/TestExecutionThread.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -2889,4 +2889,4 @@
 	return iModuleContainer->GetTestModule()->GetTestServer()->GetUiEnvProxy();
 	}
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestServer/src/TestServer.cpp
--- a/stif/TestServer/src/TestServer.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestServer/src/TestServer.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -973,5 +973,4 @@
 
     }
 
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestServer/src/TestServerEvent.cpp
--- a/stif/TestServer/src/TestServerEvent.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestServer/src/TestServerEvent.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -405,4 +405,4 @@
     
     } 
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestServer/src/TestThreadContainerRunner.cpp
--- a/stif/TestServer/src/TestThreadContainerRunner.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestServer/src/TestThreadContainerRunner.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -531,6 +531,8 @@
 		    delete iTestThreadContainer;
 			}
 			break;
+		case ENone:
+			break;
 		}
 		
 	iCurrentOperation = ENone;
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestServer/src/Testexecution.cpp
--- a/stif/TestServer/src/Testexecution.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestServer/src/Testexecution.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -4818,4 +4818,4 @@
 
 	}
 
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TestServer/src/Testserversession.cpp
--- a/stif/TestServer/src/Testserversession.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TestServer/src/Testserversession.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -1670,6 +1670,4 @@
     return iTestServer;
     }
 
-
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TouchConsoleUI/inc/CallBack.h
--- a/stif/TouchConsoleUI/inc/CallBack.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TouchConsoleUI/inc/CallBack.h	Thu Jul 15 20:25:38 2010 +0300
@@ -207,5 +207,5 @@
     };
 
 #endif      // CALLBACK_H  
-            
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TouchConsoleUI/inc/ConsoleMenus.h
--- a/stif/TouchConsoleUI/inc/ConsoleMenus.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TouchConsoleUI/inc/ConsoleMenus.h	Thu Jul 15 20:25:38 2010 +0300
@@ -1237,6 +1237,7 @@
 _LIT( KSetLoad,         "Load test set" );
 
 _LIT( KSetShow,         "Show started test sets" );
+_LIT( KSetUnload,       "Unload test set" );
 _LIT( KSetRemove,       "Remove test set" );
 _LIT( KSetCaseAdd,      "Add test case to test set" );
 _LIT( KSetCaseRemove,   "Remove test case from test set" );
@@ -1271,7 +1272,8 @@
             ESetStartSeq,
             ESetStartPar,
             //ESetStartRep,
- 
+
+            ESetUnload, 
             ESetRemove,
             ESetSave,
             ESetCaseAdd,
diff -r 8f8df8006c40 -r 3406c99bc375 stif/TouchConsoleUI/src/Consolemenus.cpp
--- a/stif/TouchConsoleUI/src/Consolemenus.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/TouchConsoleUI/src/Consolemenus.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -3884,6 +3884,10 @@
             {
             return KErrNoMemory;
             }
+        if( aArray.Append( KSetUnload ) != KErrNone )
+            {
+            return KErrNoMemory;
+            }                        			
         if( aArray.Append( KSetRemove ) != KErrNone )
             {
             return KErrNoMemory;
@@ -4034,11 +4038,19 @@
                                         this, 
                                         _L("Started test sets menu"));
                 return iSubMenu;
+            case ESetUnload:
+                ret = iMain->UIStore().UnloadTestSet( iTestSetName );
+                if( ret != KErrNone )
+                    {
+                    User::InfoPrint( _L("Test set unload failed") );
+                    }
+                iTestSetCreated = EFalse;                  
+                break;
             case ESetRemove: 
                 ret = iMain->UIStore().RemoveTestSet( iTestSetName );
                 if( ret != KErrNone )
                     {
-                    User::InfoPrint( _L("Test set creation failed") );
+                    User::InfoPrint( _L("Test set remove failed") );
                     }
                 iTestSetCreated = EFalse;  
                 break;
@@ -5680,4 +5692,5 @@
         }
     iTestCaseMenu = aTestCaseMenu;
     }
-// End of file
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/examples/STIFTestMeasurementStub/inc/STIFTestMeasurementStub.h
--- a/stif/examples/STIFTestMeasurementStub/inc/STIFTestMeasurementStub.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/examples/STIFTestMeasurementStub/inc/STIFTestMeasurementStub.h	Thu Jul 15 20:25:38 2010 +0300
@@ -153,4 +153,4 @@
 
 #endif      // STIFTESTMEASUREMENTSTUB_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/examples/STIFTestMeasurementStub/src/STIFTestMeasurementStub.cpp
--- a/stif/examples/STIFTestMeasurementStub/src/STIFTestMeasurementStub.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/examples/STIFTestMeasurementStub/src/STIFTestMeasurementStub.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -179,5 +179,4 @@
 
     }
 
-
-//  End of File
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/examples/StifHWResetStub/inc/StifHWResetStub.h
--- a/stif/examples/StifHWResetStub/inc/StifHWResetStub.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/examples/StifHWResetStub/inc/StifHWResetStub.h	Thu Jul 15 20:25:38 2010 +0300
@@ -127,4 +127,4 @@
 
 #endif // STIFHWRESETSTUB_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/examples/StifHWResetStub/src/StifHWResetStub.cpp
--- a/stif/examples/StifHWResetStub/src/StifHWResetStub.cpp	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/examples/StifHWResetStub/src/StifHWResetStub.cpp	Thu Jul 15 20:25:38 2010 +0300
@@ -322,5 +322,4 @@
 
     }
 
-
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/group/ReleaseNote.txt
--- a/stif/group/ReleaseNote.txt	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/group/ReleaseNote.txt	Thu Jul 15 20:25:38 2010 +0300
@@ -1,5 +1,5 @@
 ========================================================================
-RELEASE NOTE FOR STIF - STIF_201022 (7.3.34)
+RELEASE NOTE FOR STIF - STIF_201024 (7.3.35)
 SUPPORTING SERIES 60 3.0 ->
 ========================================================================
 
diff -r 8f8df8006c40 -r 3406c99bc375 stif/inc/StifKernelTestClass.h
--- a/stif/inc/StifKernelTestClass.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/inc/StifKernelTestClass.h	Thu Jul 15 20:25:38 2010 +0300
@@ -108,4 +108,4 @@
 
 #endif      // STIFKERNELTESTCLASS_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/inc/StifKernelTestClass.inl
--- a/stif/inc/StifKernelTestClass.inl	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/inc/StifKernelTestClass.inl	Thu Jul 15 20:25:38 2010 +0300
@@ -75,5 +75,5 @@
     }
 
 #endif      // STIFKERNELTESTCLASS_INL
-            
-// End of File
\ No newline at end of file
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/inc/StifPython.h
--- a/stif/inc/StifPython.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/inc/StifPython.h	Thu Jul 15 20:25:38 2010 +0300
@@ -45,4 +45,4 @@
 
 #endif        // STIFPYTHON_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/inc/TestModuleInfo.h
--- a/stif/inc/TestModuleInfo.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/inc/TestModuleInfo.h	Thu Jul 15 20:25:38 2010 +0300
@@ -289,4 +289,4 @@
 
 #endif      // TESTMODULEINFO_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/inc/TestThreadContainer.h
--- a/stif/inc/TestThreadContainer.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/inc/TestThreadContainer.h	Thu Jul 15 20:25:38 2010 +0300
@@ -443,5 +443,5 @@
     };
 
 #endif // TEST_THREAD_CONTAINER_H
-    
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/inc/version.h
--- a/stif/inc/version.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/inc/version.h	Thu Jul 15 20:25:38 2010 +0300
@@ -20,10 +20,12 @@
 
 #define STIF_MAJOR_VERSION 7
 #define STIF_MINOR_VERSION 3
-#define STIF_BUILD_VERSION 34
+#define STIF_BUILD_VERSION 35
 
-#define STIF_REL_DATE "1st June 2010"
+#define STIF_REL_DATE "15th June 2010"
 
 #define TO_UNICODE(text) _L(text) 
 
 #endif /*VERSION_H_*/
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/sis/Stif_31.sis
Binary file stif/sis/Stif_31.sis has changed
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/NormalHardcodedAssert.h
--- a/stif/stif_plat/inc/NormalHardcodedAssert.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/NormalHardcodedAssert.h	Thu Jul 15 20:25:38 2010 +0300
@@ -242,3 +242,5 @@
 	}
 
 #endif
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/StifItemParser.h
--- a/stif/stif_plat/inc/StifItemParser.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/StifItemParser.h	Thu Jul 15 20:25:38 2010 +0300
@@ -287,4 +287,4 @@
 
 #endif      // STIF_ITEM_PARSER_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/StifKernelTestClassBase.h
--- a/stif/stif_plat/inc/StifKernelTestClassBase.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/StifKernelTestClassBase.h	Thu Jul 15 20:25:38 2010 +0300
@@ -145,5 +145,5 @@
     };
 
 #endif      // STIFKERNELTESTCLASSBASE_H
-            
-// End of File
\ No newline at end of file
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/StifSectionParser.h
--- a/stif/stif_plat/inc/StifSectionParser.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/StifSectionParser.h	Thu Jul 15 20:25:38 2010 +0300
@@ -283,4 +283,4 @@
 
 #endif      // STIF_SECTION_PARSER_H
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/StifTFwIf.h
--- a/stif/stif_plat/inc/StifTFwIf.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/StifTFwIf.h	Thu Jul 15 20:25:38 2010 +0300
@@ -276,4 +276,4 @@
 
 #endif      // STIF_TFW_IF_H 
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/StifTestEventInterface.h
--- a/stif/stif_plat/inc/StifTestEventInterface.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/StifTestEventInterface.h	Thu Jul 15 20:25:38 2010 +0300
@@ -180,5 +180,5 @@
 typedef TPckg<TEventIf> TEventIfPckg;
  
 #endif      // TESTEVENTINTERFACE_H
-            
-// End of File
\ No newline at end of file
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/StifUnitMacros.h
--- a/stif/stif_plat/inc/StifUnitMacros.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/StifUnitMacros.h	Thu Jul 15 20:25:38 2010 +0300
@@ -213,3 +213,5 @@
 #include <StifUnitUtils.inl>
 
 #endif
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/StifUnitUtils.inl
--- a/stif/stif_plat/inc/StifUnitUtils.inl	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/StifUnitUtils.inl	Thu Jul 15 20:25:38 2010 +0300
@@ -91,8 +91,5 @@
 		}
 	return ETrue;
 	}
-	
 
-
-
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/TestEngineClient.inl
--- a/stif/stif_plat/inc/TestEngineClient.inl	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/TestEngineClient.inl	Thu Jul 15 20:25:38 2010 +0300
@@ -300,4 +300,4 @@
 
 #endif      // TEST_ENGINE_CLIENT_INL
 
-// End of File
\ No newline at end of file
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/TestServerClient.h
--- a/stif/stif_plat/inc/TestServerClient.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/TestServerClient.h	Thu Jul 15 20:25:38 2010 +0300
@@ -470,6 +470,5 @@
     
 
 #endif // TEST_SERVER_CLIENT_H
-    
-            
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/TestThreadContainerRunnerFactory.h
--- a/stif/stif_plat/inc/TestThreadContainerRunnerFactory.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/TestThreadContainerRunnerFactory.h	Thu Jul 15 20:25:38 2010 +0300
@@ -144,3 +144,5 @@
 
 
 #endif /*TESTTHREADCONTAINERRUNNERFACTORY_H_*/
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/TestclassAssert.h
--- a/stif/stif_plat/inc/TestclassAssert.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/TestclassAssert.h	Thu Jul 15 20:25:38 2010 +0300
@@ -227,3 +227,5 @@
 	}
 
 #endif
+
+// End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/UIEngineContainer.h
--- a/stif/stif_plat/inc/UIEngineContainer.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/UIEngineContainer.h	Thu Jul 15 20:25:38 2010 +0300
@@ -239,5 +239,5 @@
 
 
 #endif      // STIF_TFW_IF_CONTAINER_H 
-            
+
 // End of File
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/UIStore.h
--- a/stif/stif_plat/inc/UIStore.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/UIStore.h	Thu Jul 15 20:25:38 2010 +0300
@@ -268,6 +268,14 @@
         IMPORT_C TInt LoadTestSet( const TDesC& aSetName );
 
         /**
+        * Unload active test set.
+        *
+        * Returns Symbian OS error code.
+        */
+        IMPORT_C TInt UnloadTestSet( const TDesC& aSetName );
+        
+        
+        /**
         * Load saved test cases.
         *
         * Returns Symbian OS error code.
diff -r 8f8df8006c40 -r 3406c99bc375 stif/stif_plat/inc/atslogger.h
--- a/stif/stif_plat/inc/atslogger.h	Mon Jun 21 17:25:56 2010 +0300
+++ b/stif/stif_plat/inc/atslogger.h	Thu Jul 15 20:25:38 2010 +0300
@@ -577,3 +577,5 @@
 };
 
 #endif// End of File
+
+// End of File